diff --git a/modoboa/core/templates/core/user_preferences.html b/modoboa/core/templates/core/user_preferences.html
index f8b85378a..3eed9d53c 100644
--- a/modoboa/core/templates/core/user_preferences.html
+++ b/modoboa/core/templates/core/user_preferences.html
@@ -5,5 +5,5 @@
       id="uprefs_form">{% csrf_token %}
   {% include "common/parameters.html" %}
   <hr>
-  <button type="submit" class="btn btn-primary col-lg-offset-7 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Save' %}</button>
+  <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Save' %}</button>
 </form>
diff --git a/modoboa/core/templates/core/user_profile.html b/modoboa/core/templates/core/user_profile.html
index 8fce9921a..dcf0f473f 100644
--- a/modoboa/core/templates/core/user_profile.html
+++ b/modoboa/core/templates/core/user_profile.html
@@ -5,6 +5,6 @@
       id="uprefs_form">{% csrf_token %}
   {% render_form form %}
   <div class="form-actions">
-    <button type="submit" class="btn btn-primary col-lg-offset-7 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
+    <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
   </div>
 </form>
diff --git a/modoboa/extensions/admin/static/admin/css/settings.css b/modoboa/extensions/admin/static/admin/css/settings.css
index 3a226bcce..24fc269b9 100644
--- a/modoboa/extensions/admin/static/admin/css/settings.css
+++ b/modoboa/extensions/admin/static/admin/css/settings.css
@@ -2,7 +2,6 @@
 #settings_content .form-horizontal .control-label {
     margin-left: 20px;
     text-align: left;
-    width: 200px;
 }
 
 #settings_content > .form-horizontal .controls {
diff --git a/modoboa/extensions/admin/templates/admin/forward.html b/modoboa/extensions/admin/templates/admin/forward.html
index 6047c7d9c..dae315d71 100644
--- a/modoboa/extensions/admin/templates/admin/forward.html
+++ b/modoboa/extensions/admin/templates/admin/forward.html
@@ -5,6 +5,6 @@
       id="uprefs_form">{% csrf_token %}
   {% render_form form %}
   <div class="form-actions">
-    <button type="submit" class="btn btn-primary col-lg-offset-7 col-md-offset-8 col-sm-offset-7 col-lg-1 col-md-1 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
+    <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-8 col-sm-offset-7 col-lg-1 col-md-1 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
   </div>
 </form>
diff --git a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
index 85c232aba..ff477da2a 100644
--- a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
+++ b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
@@ -6,6 +6,6 @@
       id="uprefs_form">{% csrf_token %}
   {% render_form form %}
   <div class="form-actions">
-    <button type="submit" class="btn btn-primary col-lg-offset-7 col-md-offset-8 col-sm-offset-7 col-lg-1 col-md-1 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
+    <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-8 col-sm-offset-7 col-lg-1 col-md-1 col-sm-2" id="update" name="update">{% trans 'Update' %}</button>
   </div>
 </form>
diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html
index 73e1e006a..353bedfa0 100644
--- a/modoboa/extensions/webmail/templates/webmail/compose.html
+++ b/modoboa/extensions/webmail/templates/webmail/compose.html
@@ -1,6 +1,6 @@
 {% load i18n lib_tags %}{% load url from future %}
 <form class="form-horizontal" method="POST" action="{{ posturl }}" id="composemail">{% csrf_token %}
-  <div id="compose-container">
+  <div id="compose-container" class="col-lg-12">
     <div id="mailheader" class="well">
       {% render_field form.to %}
       <div class="options">
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index a74d62f0d..aacfe779b 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -19,11 +19,11 @@
   </head>
   <body>
     <div class="container">
-      <div id="box" class="col-lg-9 col-lg-offset-2">
+      <div id="box" class="col-lg-9 col-lg-offset-1">
       <div id="logo" class="row">
           <ul class="thumbnails">
               <li>
-                  <div class="col-lg-offset-3 col-lg-5">
+                  <div class="col-lg-offset-4 col-lg-5 col-md-offset-4 col-md-5 col-sm-offset-4 col-sm-5">
                       <a href="#" class="thumbnail">
                           <img src="{% get_modoboa_logo %}" />
                       </a>
@@ -38,7 +38,7 @@
         {% render_field form.password %}
         <input type="hidden" name="next" value="{{ next }}" />
         <div class="form-group">
-            <div class="control-label col-lg-3 col-md-4 col-sm-4 ">
+            <div class="control-label col-lg-4 col-md-4 col-sm-4 ">
             </div>
             <div class="col-lg-5 col-md-5 col-sm-5">
             <div class="checkbox">