diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 93b936591..8e56bbc8b 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -153,7 +153,9 @@
 	}
 
 	.language-buttons {
+		flex-grow: 1;
 		margin-top: 5px;
+		text-align: right;
 	}
 
 	.language-button {
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index 195bf029f..e32b429ea 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -114,7 +114,6 @@ dialog > footer {
   text-align: right; // right align buttons
   border-top: 1px solid #ddd;
   border-radius: 0 0 6px 6px;
-  .clearfix(); // clear it in case folks use .pull-* classes on buttons
 
   // Properly space out buttons
   .btn + .btn {
diff --git a/snappymail/v/0.0.0/app/templates/Index.html b/snappymail/v/0.0.0/app/templates/Index.html
index c3edcf976..2aafa5648 100644
--- a/snappymail/v/0.0.0/app/templates/Index.html
+++ b/snappymail/v/0.0.0/app/templates/Index.html
@@ -32,8 +32,8 @@
 	<div id="rl-content" hidden="">
 		<div id="rl-left"></div>
 		<div id="rl-right"></div>
-		<div id="rl-popups"></div>
 	</div>
+	<div id="rl-popups"></div>
 	{{BaseTemplates}}
 	<script nonce="" type="text/javascript">{{BaseAppBootScript}}{{BaseLanguage}}</script>
 </body>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index 52ab7356c..0c86eb655 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -34,15 +34,7 @@
 			data-bind="command: submitCommand"
 			data-i18n="LOGIN/BUTTON_SIGN_IN"></button>
 	</div>
-	<div class="controls clearfix" style="margin-bottom: 10px">
-		<div class="pull-right language-buttons">
-			<a href="#" tabindex="-1" class="language-button fontastic"
-				data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, css: { 'icon-spinner' : langRequest }"
-				data-i18n="[title]POPUPS_LANGUAGES/TITLE_LANGUAGES">
-				🌍
-			</a>
-		</div>
-
+	<div style="display: flex">
 		<div class="signMeLabel" data-bind="visible: signMeVisibility, component: {
 			name: 'CheckboxSimple',
 			params: {
@@ -50,6 +42,12 @@
 				value: signMe
 			}
 		}"></div>
-
+		<div class="language-buttons">
+			<a href="#" tabindex="-1" class="language-button fontastic"
+				data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, css: { 'icon-spinner' : langRequest }"
+				data-i18n="[title]POPUPS_LANGUAGES/TITLE_LANGUAGES">
+				🌍
+			</a>
+		</div>
 	</div>
 </form>
diff --git a/vendors/bootstrap/less/mixins.less b/vendors/bootstrap/less/mixins.less
index 840c47dc8..6fa1e53de 100644
--- a/vendors/bootstrap/less/mixins.less
+++ b/vendors/bootstrap/less/mixins.less
@@ -6,21 +6,6 @@
 // UTILITY MIXINS
 // --------------------------------------------------
 
-// Clearfix
-// --------
-// For clearing floats like a boss h5bp.com/q
-.clearfix {
-  &::before,
-  &::after {
-    display: table;
-    content: "";
-    // Fixes Opera/contenteditable bug:
-    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
-    line-height: 0;
-    clear: both;
-  }
-}
-
 // Webkit-style focus
 // ------------------
 .tab-focus() {