diff --git a/css/_side_toolbar_container.scss b/css/_side_toolbar_container.scss
index 53163ea95..b841ffe64 100644
--- a/css/_side_toolbar_container.scss
+++ b/css/_side_toolbar_container.scss
@@ -4,8 +4,6 @@
 #sideToolbarContainer {
     position: absolute;
     top: 0;
-    //magic 10px for toolbar height. TODO: fix it
-    bottom: 10px;
     left: $defaultToolbarSize;
     width: 0;
     background-color: rgba(0,0,0,0.8);
@@ -24,7 +22,7 @@
     /**
      * Form elements and blocks.
      */
-    input, label, select, a,
+    input, select, a,
     .sideToolbarBlock, .input-control, .button-control {
         display: inline-block;
         margin-top: 15px;
@@ -46,11 +44,20 @@
      * Specify styling of elements inside a block.
      */
     .sideToolbarBlock {
-        input, label, button, a, select {
+        input, button, a, select {
             margin-top: 5px;
             margin-left: 0;
             width: 100%;
         }
+        input[type='checkbox'] {
+            width: auto !important;
+            display: inline;
+            > label {
+                margin-top: 5px;
+                width: 80%;
+            }
+        }
+
     }
 
     /**
diff --git a/index.html b/index.html
index c91ab1e31..732036c33 100644
--- a/index.html
+++ b/index.html
@@ -30,15 +30,15 @@
             <a class="poweredby" href="http://jitsi.org" target="_new" ><span data-i18n="poweredby"></span> jitsi.org</a>
 
             <div id="enter_room_container">
-                    <div id="enter_room_form" >
-                        <div id="domain_name"></div>
-                        <div id="enter_room">
-                            <input id="enter_room_field" type="text" autofocus/>
-                            <div class="icon-reload" id="reload_roomname"></div>
-                            <input id="enter_room_button" type="button" data-i18n="[value]welcomepage.go" value="GO" />
+                <div id="enter_room_form" >
+                    <div id="domain_name"></div>
+                    <div id="enter_room">
+                        <input id="enter_room_field" type="text" autofocus/>
+                        <div class="icon-reload" id="reload_roomname"></div>
+                        <input id="enter_room_button" type="button" data-i18n="[value]welcomepage.go" value="GO" />
 
-                        </div>
                     </div>
+                </div>
             </div>
             <div id="brand_header"></div>
             <input type='checkbox' name='checkbox' id="disable_welcome"/>
@@ -202,23 +202,19 @@
                             <div id="moderatorOptionsTitle" class="subTitle hide" data-i18n="settings.moderator"></div>
                             <div id="startMutedOptions" class="hide">
                                 <div class="sideToolbarBlock first">
-                                    <aui-label for="startAudioMuted">
-                                        <p data-i18n="settings.startAudioMuted"></p>
-                                    </aui-label>
-                                    <aui-toggle id="startAudioMuted" label="Audio muted"></aui-toggle>
+                                    <input type="checkbox" id="startAudioMuted">
+                                    <label class="startMutedLabel" for="startAudioMuted" data-i18n="settings.startAudioMuted"></label>
                                 </div>
                                 <div class="sideToolbarBlock">
-                                    <aui-label for="startVideoMuted" >
-                                        <p data-i18n="settings.startVideoMuted"></p>
-                                    </aui-label>
-                                    <aui-toggle id="startVideoMuted" label="Video muted"></aui-toggle>
+                                    <input type="checkbox" id="startVideoMuted">
+                                    <label class="startMutedLabel" for="startVideoMuted" data-i18n="settings.startVideoMuted"></label>
                                 </div>
                             </div>
-                            <div id="followMeOptions" class="sideToolbarBlock hide">
-                                <aui-label for="followMeCheckBox">
-                                    <p data-i18n="settings.followMe"></p>
-                                </aui-label>
-                                <aui-toggle id="followMeCheckBox" label="Follow Me"></aui-toggle>
+                            <div id="followMeOptions" class="hide">
+                                <div class="sideToolbarBlock">
+                                    <input type="checkbox" id="followMeCheckBox">
+                                    <label class="followMeLabel" for="followMeCheckBox" data-i18n="settings.followMe"></label>
+                                </div>
                             </div>
                         </div>
                     </form>