diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html
--- a/kallithea/templates/admin/auth/auth_settings.html
+++ b/kallithea/templates/admin/auth/auth_settings.html
@@ -36,8 +36,10 @@
                %for plugin_path in c.available_plugins:
                     <li>
                       <div style="padding:3px 0px 3px 0px">
-                          <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}">
-                          ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}</span>${plugin_path}
+                        <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}">
+                            ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}
+                        </span>
+                        ${plugin_path}
                       </div>
                     </li>
                %endfor
@@ -97,8 +99,10 @@
         </div>
     %endfor
         <div class="form-horizontal">
-            <div class="buttons">
-                ${h.submit('save',_('Save'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html
--- a/kallithea/templates/admin/defaults/defaults.html
+++ b/kallithea/templates/admin/defaults/defaults.html
@@ -78,8 +78,10 @@
                 </div>
             </div>
 
-            <div class="buttons">
-            ${h.submit('save',_('Save'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html
--- a/kallithea/templates/admin/gists/show.html
+++ b/kallithea/templates/admin/gists/show.html
@@ -48,7 +48,7 @@
                          %else:
                           ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))}
                          %endif
-                       </div>
+                        </div>
 
                        %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.authuser.user_id:
                         <div style="float:right">
diff --git a/kallithea/templates/admin/my_account/my_account_api_keys.html b/kallithea/templates/admin/my_account/my_account_api_keys.html
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html
+++ b/kallithea/templates/admin/my_account/my_account_api_keys.html
@@ -56,7 +56,7 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <div class="label">
                     <label for="description">${_('New API key')}:</label>
                 </div>
@@ -64,10 +64,12 @@
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
-             </div>
-            <div class="buttons">
-              ${h.submit('save',_('Add'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            </div>
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Add'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/my_account/my_account_emails.html b/kallithea/templates/admin/my_account/my_account_emails.html
--- a/kallithea/templates/admin/my_account/my_account_emails.html
+++ b/kallithea/templates/admin/my_account/my_account_emails.html
@@ -45,9 +45,11 @@
                     ${h.text('new_email', class_='medium')}
                 </div>
              </div>
-            <div class="buttons">
-              ${h.submit('save',_('Add'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Add'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/my_account/my_account_password.html b/kallithea/templates/admin/my_account/my_account_password.html
--- a/kallithea/templates/admin/my_account/my_account_password.html
+++ b/kallithea/templates/admin/my_account/my_account_password.html
@@ -4,39 +4,41 @@
 
 ${h.form(url('my_account_password'), method='post')}
 <div class="form">
-    <div class="form-horizontal">
-     <div class="form-group">
+  <div class="form-horizontal">
+    <div class="form-group">
         <div class="label">
             <label class="control-label" for="current_password">${_('Current password')}:</label>
         </div>
         <div class="input">
             ${h.password('current_password',class_='medium')}
         </div>
-     </div>
+    </div>
 
-     <div class="form-group">
+    <div class="form-group">
         <div class="label">
             <label class="control-label" for="new_password">${_('New password')}:</label>
         </div>
         <div class="input">
             ${h.password('new_password',class_='medium')}
         </div>
-     </div>
+    </div>
 
-     <div class="form-group">
+    <div class="form-group">
         <div class="label">
             <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label>
         </div>
         <div class="input">
             ${h.password('new_password_confirmation',class_='medium')}
         </div>
-     </div>
+    </div>
 
+    <div class="form-group">
         <div class="buttons">
-          ${h.submit('save',_('Save'),class_="btn btn-default")}
-          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            ${h.submit('save',_('Save'),class_="btn btn-default")}
+            ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
     </div>
+  </div>
 </div>
 ${h.end_form()}
 
diff --git a/kallithea/templates/admin/my_account/my_account_profile.html b/kallithea/templates/admin/my_account/my_account_profile.html
--- a/kallithea/templates/admin/my_account/my_account_profile.html
+++ b/kallithea/templates/admin/my_account/my_account_profile.html
@@ -54,9 +54,11 @@ ${h.form(url('my_account'), method='post
                 </div>
              </div>
 
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/permissions/permissions_globals.html b/kallithea/templates/admin/permissions/permissions_globals.html
--- a/kallithea/templates/admin/permissions/permissions_globals.html
+++ b/kallithea/templates/admin/permissions/permissions_globals.html
@@ -108,9 +108,11 @@ ${h.form(url('admin_permissions'), metho
                     ${h.select('default_extern_activate','',c.extern_activate_choices)}
                 </div>
              </div>
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/permissions/permissions_ips.html b/kallithea/templates/admin/permissions/permissions_ips.html
--- a/kallithea/templates/admin/permissions/permissions_ips.html
+++ b/kallithea/templates/admin/permissions/permissions_ips.html
@@ -34,9 +34,11 @@ ${h.form(url('edit_user_ips_update', id=
                     ${h.text('new_ip', class_='medium')}
                 </div>
              </div>
-            <div class="buttons">
-              ${h.submit('save',_('Add'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Add'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_add.html
@@ -65,8 +65,10 @@
                 </div>
             </div>
 
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
@@ -1,6 +1,6 @@
 ${h.form(url('edit_repo_group_perms', group_name=c.repo_group.group_name))}
 <div class="form">
-   <div class="fields">
+    <div class="fields">
         <div class="field">
             <table id="permissions_manage" class="noborder">
                 <tr>
@@ -111,10 +111,10 @@ ${h.form(url('edit_repo_group_perms', gr
             </table>
         </div>
         <div class="buttons">
-          ${h.submit('save',_('Save'),class_="btn btn-default")}
-          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            ${h.submit('save',_('Save'),class_="btn btn-default")}
+            ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
-   </div>
+    </div>
 </div>
 ${h.end_form()}
 
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
@@ -29,6 +29,7 @@ ${h.form(url('update_repos_group',group_
                 ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
             </div>
         </div>
+
         <div class="form-group">
             <div class="label label-checkbox">
                 <label class="control-label" for="enable_locking">${_('Enable locking')}:</label>
@@ -38,9 +39,12 @@ ${h.form(url('update_repos_group',group_
                 <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span>
             </div>
         </div>
-        <div class="buttons">
-          ${h.submit('save',_('Save'),class_="btn btn-default")}
-          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+
+        <div class="form-group">
+            <div class="buttons">
+                ${h.submit('save',_('Save'),class_="btn btn-default")}
+                ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            </div>
         </div>
     </div>
 </div>
@@ -49,8 +53,10 @@ ${h.end_form()}
 ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))}
 <div class="form">
     <div class="form-horizontal">
-        <div class="buttons">
-            ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn btn-danger",onclick="return confirm('"+_('Confirm to delete this group')+"');")}
+        <div class="form-group">
+            <div class="buttons">
+                ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn btn-danger",onclick="return confirm('"+_('Confirm to delete this group')+"');")}
+            </div>
         </div>
     </div>
 </div>
diff --git a/kallithea/templates/admin/repos/repo_add_base.html b/kallithea/templates/admin/repos/repo_add_base.html
--- a/kallithea/templates/admin/repos/repo_add_base.html
+++ b/kallithea/templates/admin/repos/repo_add_base.html
@@ -77,8 +77,10 @@ ${h.form(url('repos'))}
                 <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
             </div>
         </div>
-        <div class="buttons">
-          ${h.submit('add',_('Add'),class_="btn btn-default")}
+        <div class="form-group">
+            <div class="buttons">
+                ${h.submit('add',_('Add'),class_="btn btn-default")}
+            </div>
         </div>
     </div>
 </div>
diff --git a/kallithea/templates/admin/repos/repo_edit_fields.html b/kallithea/templates/admin/repos/repo_edit_fields.html
--- a/kallithea/templates/admin/repos/repo_edit_fields.html
+++ b/kallithea/templates/admin/repos/repo_edit_fields.html
@@ -54,9 +54,11 @@
                 </div>
              </div>
 
-            <div class="buttons">
-              ${h.submit('save',_('Add'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Add'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/repos/repo_edit_permissions.html b/kallithea/templates/admin/repos/repo_edit_permissions.html
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html
+++ b/kallithea/templates/admin/repos/repo_edit_permissions.html
@@ -97,9 +97,9 @@ ${h.form(url('edit_repo_perms_update', r
                 </tr>
             </table>
         </div>
-        <div class="buttons">
-          ${h.submit('save',_('Save'),class_="btn btn-default")}
-          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+        <div class="form-group">
+            ${h.submit('save',_('Save'),class_="btn btn-default")}
+            ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
    </div>
 </div>
diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html
--- a/kallithea/templates/admin/repos/repo_edit_settings.html
+++ b/kallithea/templates/admin/repos/repo_edit_settings.html
@@ -123,9 +123,11 @@ ${h.form(url('update_repo', repo_name=c.
                  </div>
               %endfor
             %endif
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/settings/settings_email.html b/kallithea/templates/admin/settings/settings_email.html
--- a/kallithea/templates/admin/settings/settings_email.html
+++ b/kallithea/templates/admin/settings/settings_email.html
@@ -11,8 +11,10 @@ ${h.form(url('admin_settings_email'), me
                 </div>
             </div>
 
-            <div class="buttons">
-            ${h.submit('send',_('Send'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('send',_('Send'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/settings/settings_global.html b/kallithea/templates/admin/settings/settings_global.html
--- a/kallithea/templates/admin/settings/settings_global.html
+++ b/kallithea/templates/admin/settings/settings_global.html
@@ -57,9 +57,11 @@ ${h.form(url('admin_settings_global'), m
                 </div>
             </div>
 
-            <div class="buttons">
-                ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
-                ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
            </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/settings/settings_hooks.html b/kallithea/templates/admin/settings/settings_hooks.html
--- a/kallithea/templates/admin/settings/settings_hooks.html
+++ b/kallithea/templates/admin/settings/settings_hooks.html
@@ -49,8 +49,10 @@ ${h.form(url('admin_settings_hooks'), me
             ${h.text('new_hook_ui_value',size=60)}
         </div>
       </div>
-      <div class="buttons" style="margin-left:280px">
-         ${h.submit('save',_('Save'),class_="btn btn-default")}
+      <div class="form-group">
+          <div class="buttons" style="margin-left:280px">
+               ${h.submit('save',_('Save'),class_="btn btn-default")}
+          </div>
       </div>
     </div>
 </div>
diff --git a/kallithea/templates/admin/settings/settings_mapping.html b/kallithea/templates/admin/settings/settings_mapping.html
--- a/kallithea/templates/admin/settings/settings_mapping.html
+++ b/kallithea/templates/admin/settings/settings_mapping.html
@@ -31,8 +31,10 @@ ${h.form(url('admin_settings_mapping'), 
                 </div>
             </div>
 
-            <div class="buttons">
-            ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/settings/settings_search.html b/kallithea/templates/admin/settings/settings_search.html
--- a/kallithea/templates/admin/settings/settings_search.html
+++ b/kallithea/templates/admin/settings/settings_search.html
@@ -16,8 +16,10 @@ ${h.form(url('admin_settings_search'), m
                 </div>
             </div>
 
-            <div class="buttons">
-            ${h.submit('reindex',_('Reindex'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('reindex',_('Reindex'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/settings/settings_vcs.html b/kallithea/templates/admin/settings/settings_vcs.html
--- a/kallithea/templates/admin/settings/settings_vcs.html
+++ b/kallithea/templates/admin/settings/settings_vcs.html
@@ -63,9 +63,11 @@ ${h.form(url('admin_settings'), method='
             ## form still requires this but we cannot internally change it anyway
             ${h.hidden('paths_root_path',size=30,readonly="readonly")}
             %endif
-            <div class="buttons">
-                ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
-                ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
            </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/settings/settings_visual.html b/kallithea/templates/admin/settings/settings_visual.html
--- a/kallithea/templates/admin/settings/settings_visual.html
+++ b/kallithea/templates/admin/settings/settings_visual.html
@@ -73,7 +73,7 @@ ${h.form(url('admin_settings_visual'), m
                 </div>
             </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <div class="label label-checkbox">
                     <label>${_('Icons')}:</label>
                 </div>
@@ -88,9 +88,9 @@ ${h.form(url('admin_settings_visual'), m
                     </div>
                     <span class="help-block">${_('Show public/private icons next to repository names.')}</span>
                  </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <div class="label label-checkbox">
                     <label>${_('Meta Tagging')}:</label>
                 </div>
@@ -113,12 +113,14 @@ ${h.form(url('admin_settings_visual'), m
                     </div>
                     <span class="help-block">${_('Parses meta tags from the repository description field and turns them into colored tags.')}</span>
                  </div>
-             </div>
+            </div>
 
-             <div class="buttons">
-                 ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
-                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
-             </div>
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
+            </div>
 
         </div>
     </div>
diff --git a/kallithea/templates/admin/user_groups/user_group_add.html b/kallithea/templates/admin/user_groups/user_group_add.html
--- a/kallithea/templates/admin/user_groups/user_group_add.html
+++ b/kallithea/templates/admin/user_groups/user_group_add.html
@@ -53,8 +53,10 @@
                 </div>
              </div>
 
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html
+++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html
@@ -93,7 +93,7 @@ ${h.form(url('edit_user_group_perms_upda
                 <tr class="new_members last_new_member" id="add_perm_input"></tr>
                 <tr>
                     <td colspan="6">
-                        <span id="add_perm" style="cursor: pointer;">
+                        <span id="add_perm" class="btn">
                             <i class="icon-plus"></i> ${_('Add new')}
                         </span>
                     </td>
@@ -101,8 +101,8 @@ ${h.form(url('edit_user_group_perms_upda
             </table>
         </div>
         <div class="buttons">
-          ${h.submit('save',_('Save'),class_="btn btn-default")}
-          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            ${h.submit('save',_('Save'),class_="btn btn-default")}
+            ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
    </div>
 </div>
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_settings.html b/kallithea/templates/admin/user_groups/user_group_edit_settings.html
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html
+++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html
@@ -56,8 +56,10 @@ ${h.form(url('update_users_group', id=c.
                     </div>
 
                 </div>
-                <div class="buttons">
-                  ${h.submit('Save',_('Save'),class_="btn btn-default")}
+                <div class="form-group">
+                    <div class="buttons">
+                        ${h.submit('Save',_('Save'),class_="btn btn-default")}
+                    </div>
                 </div>
             </div>
     </div>
diff --git a/kallithea/templates/admin/users/user_add.html b/kallithea/templates/admin/users/user_add.html
--- a/kallithea/templates/admin/users/user_add.html
+++ b/kallithea/templates/admin/users/user_add.html
@@ -92,8 +92,11 @@
 
             ${h.hidden('extern_type', c.default_extern_type)}
             ${h.hidden('extern_name', c.default_extern_name)}
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
+
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/users/user_edit_api_keys.html b/kallithea/templates/admin/users/user_edit_api_keys.html
--- a/kallithea/templates/admin/users/user_edit_api_keys.html
+++ b/kallithea/templates/admin/users/user_edit_api_keys.html
@@ -56,7 +56,7 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="description">${_('New API key')}:</label>
                 </div>
@@ -64,10 +64,13 @@
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
-             </div>
-            <div class="buttons">
-              ${h.submit('save',_('Add'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            </div>
+
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Add'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html
--- a/kallithea/templates/admin/users/user_edit_emails.html
+++ b/kallithea/templates/admin/users/user_edit_emails.html
@@ -45,9 +45,11 @@
                     ${h.text('new_email', class_='medium')}
                 </div>
              </div>
-            <div class="buttons">
-              ${h.submit('save',_('Add'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Add'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/users/user_edit_ips.html b/kallithea/templates/admin/users/user_edit_ips.html
--- a/kallithea/templates/admin/users/user_edit_ips.html
+++ b/kallithea/templates/admin/users/user_edit_ips.html
@@ -45,9 +45,11 @@
                     ${h.text('new_ip', class_='medium')}
                 </div>
              </div>
-            <div class="buttons">
-              ${h.submit('save',_('Add'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Add'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/admin/users/user_edit_profile.html b/kallithea/templates/admin/users/user_edit_profile.html
--- a/kallithea/templates/admin/users/user_edit_profile.html
+++ b/kallithea/templates/admin/users/user_edit_profile.html
@@ -109,9 +109,11 @@ ${h.form(url('update_user', id=c.user.us
                 </div>
              </div>
 
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
 </div>
diff --git a/kallithea/templates/base/default_perms_box.html b/kallithea/templates/base/default_perms_box.html
--- a/kallithea/templates/base/default_perms_box.html
+++ b/kallithea/templates/base/default_perms_box.html
@@ -9,7 +9,7 @@ ${h.form(form_url)}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label>
                 </div>
@@ -20,10 +20,10 @@ ${h.form(form_url)}
                                 % h.link_to('default permissions', url('admin_permissions')))}
                     </span>
                 </div>
-             </div>
+            </div>
 
-             <div id="inherit_overlay">
-             <div class="form-group">
+            <div id="inherit_overlay">
+            <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
@@ -33,9 +33,9 @@ ${h.form(form_url)}
                     ${h.literal(_('Select this option to allow repository creation for this user'))}
                     </span>
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="create_user_group_perm">${_('Create user groups')}:</label>
                 </div>
@@ -45,9 +45,9 @@ ${h.form(form_url)}
                         ${h.literal(_('Select this option to allow user group creation for this user'))}
                     </span>
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="fork_repo_perm">${_('Fork repositories')}:</label>
                 </div>
@@ -57,12 +57,15 @@ ${h.form(form_url)}
                         ${h.literal(_('Select this option to allow repository forking for this user'))}
                     </span>
                 </div>
-             </div>
+            </div>
 
             </div>
-            <div class="buttons">
-              ${h.submit('save',_('Save'),class_="btn btn-default")}
-              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('save',_('Save'),class_="btn btn-default")}
+                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/forks/fork.html b/kallithea/templates/forks/fork.html
--- a/kallithea/templates/forks/fork.html
+++ b/kallithea/templates/forks/fork.html
@@ -72,6 +72,7 @@ ${self.repo_context_bar('createfork')}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
+
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="private">${_('Copy permissions')}:</label>
@@ -81,6 +82,7 @@ ${self.repo_context_bar('createfork')}
                     <span class="help-block">${_('Copy permissions from forked repository')}</span>
                 </div>
             </div>
+
             %if c.can_update:
             <div class="form-group">
                 <div class="label label-checkbox">
@@ -92,8 +94,11 @@ ${self.repo_context_bar('createfork')}
                 </div>
             </div>
             %endif
-            <div class="buttons">
-                ${h.submit('',_('Fork this Repository'),class_="btn btn-default")}
+
+            <div class="form-group">
+                <div class="buttons">
+                    ${h.submit('',_('Fork this Repository'),class_="btn btn-default")}
+                </div>
             </div>
         </div>
     </div>
diff --git a/kallithea/templates/password_reset_confirmation.html b/kallithea/templates/password_reset_confirmation.html
--- a/kallithea/templates/password_reset_confirmation.html
+++ b/kallithea/templates/password_reset_confirmation.html
@@ -25,35 +25,38 @@
         <div class="form">
             <!-- fields -->
             <div class="form-horizontal">
-                 <div class="form-group">
+                <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="token">${_('Code you received in the email')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('token', class_='focus')}
                     </div>
-                 </div>
+                </div>
 
-                 <div class="form-group">
+                <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="password">${_('New Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password',class_='focus')}
                     </div>
-                 </div>
+                </div>
 
-                 <div class="form-group">
+                <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password_confirm',class_='focus')}
                     </div>
-                 </div>
-                <div class="buttons">
-                    <div class="nohighlight">
-                      ${h.submit('send',_('Confirm'),class_="btn btn-default")}
+                </div>
+
+                <div class="form-group">
+                    <div class="buttons">
+                        <div class="nohighlight">
+                            ${h.submit('send',_('Confirm'),class_="btn btn-default")}
+                        </div>
                     </div>
                 </div>
             </div>