diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -609,12 +609,12 @@ div.panel.panel-default div.panel-headin
     color: #4e6100;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group {
+#content div.panel div.form div.form-group {
     border-bottom: 1px solid #DDD;
     clear: both;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group > label {
+#content div.panel div.form div.form-group > label {
     color: #393939;
     font-weight: 700;
 }
@@ -789,7 +789,7 @@ div.panel.panel-default div.panel-headin
     position: relative;
 }
 
-#content div.panel div#summary-panel-body.form div.form-horizontal div.form-group > div {
+#content div.panel div#summary-panel-body.form div.form-group > div {
     margin: 0 0 10px 150px;
 }
 
@@ -1073,21 +1073,16 @@ a.metatag[data-tag="license"]:hover {
 #quick_login .links .logout {
 }
 
-#quick_login div.form div.form-horizontal {
-    padding-top: 2px;
-    padding-left: 10px;
-}
-
-#quick_login div.form div.form-horizontal div.form-group {
+#quick_login div.form div.form-group {
     padding: 5px;
 }
 
-#quick_login div.form div.form-horizontal div.form-group > label {
+#quick_login div.form div.form-group > label {
     color: #fff;
     padding-bottom: 3px;
 }
 
-#quick_login div.form div.form-horizontal div.form-group > div input {
+#quick_login div.form div.form-group > div input {
     width: 236px;
     background: #FFF;
     border-top: 1px solid #b3b3b3;
@@ -1100,7 +1095,7 @@ a.metatag[data-tag="license"]:hover {
     padding: 5px 7px 4px;
 }
 
-#quick_login div.form div.form-horizontal div.buttons {
+#quick_login div.form div.buttons {
     clear: both;
     overflow: hidden;
     text-align: right;
@@ -1139,7 +1134,7 @@ a.metatag[data-tag="license"]:hover {
     background-color: inherit !important;
 }
 
-#register div.form div.form-horizontal div.form-group > label {
+#register div.form div.form-group > label {
     width: 135px;
     float: left;
     text-align: right;
@@ -1147,11 +1142,11 @@ a.metatag[data-tag="license"]:hover {
     padding: 5px 0 0 5px;
 }
 
-#register div.form div.form-horizontal div.form-group > div input {
+#register div.form div.form-group > div input {
     width: 300px;
 }
 
-#register div.form div.form-horizontal div.buttons {
+#register div.form div.buttons {
     border-top: 1px solid #DDD;
     margin: 0;
     padding: 10px 0 0 145px;
@@ -2342,9 +2337,9 @@ nav.navbar #quick .select2-container .se
 
 
 /* formencode htmlfill adds 'error' to failing input fields */
-#content div.panel div.form div.form-horizontal div.form-group > div input.error,
-#login div.form div.form-horizontal div.form-group > div input.error,
-#register div.form div.form-horizontal div.form-group > div input.error {
+#content div.panel div.form div.form-group > div input.error,
+#login div.form div.form-group > div input.error,
+#register div.form div.form-group > div input.error {
     background: #FBE3E4;
     border-top: 1px solid #e1b2b3;
     border-left: 1px solid #e1b2b3;
@@ -2353,9 +2348,9 @@ nav.navbar #quick .select2-container .se
 }
 
 /* formencode htmlfill injects 'error-message' */
-#content div.panel div.form div.form-horizontal div.form-group span.error-message,
-#login div.form div.form-horizontal div.form-group span.error-message,
-#register div.form div.form-horizontal div.form-group span.error-message {
+#content div.panel div.form div.form-group span.error-message,
+#login div.form div.form-group span.error-message,
+#register div.form div.form-group span.error-message {
     display: inline-block;
     color: red;
     margin: 4px 0 0;
@@ -2366,38 +2361,38 @@ nav.navbar #quick .select2-container .se
     margin: 0;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group > div {
+#content div.panel div.form div.form-group > div {
     margin: 0 0 10px 200px;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group > div a:hover,
-#content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu:hover,
+#content div.panel div.form div.form-group > div a:hover,
+#content div.panel div.form div.form-group > div a.ui-selectmenu:hover,
 #content div.panel div.action a:hover {
     color: #000;
     text-decoration: none;
 }
 
-#content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu-focus,
+#content div.panel div.form div.form-group > div a.ui-selectmenu-focus,
 #content div.panel div.action a.ui-selectmenu-focus {
     border: 1px solid #666;
 }
 
-div.form div.form-horizontal div.form-group div.button input,
-#content div.panel div.form div.form-horizontal div.buttons input,
-div.form div.form-horizontal div.buttons input,
+div.form div.form-group div.button input,
+#content div.panel div.form div.buttons input,
+div.form div.buttons input,
 #content div.panel div.action div.button input {
     font-size: 11px;
     font-weight: 700;
     margin: 0;
 }
 
-div.form div.form-horizontal div.form-group div.highlight,
-#content div.panel div.form div.form-horizontal div.buttons div.highlight {
+div.form div.form-group div.highlight,
+#content div.panel div.form div.buttons div.highlight {
     display: inline;
 }
 
-#content div.panel div.form div.form-horizontal div.buttons,
-div.form div.form-horizontal div.buttons {
+#content div.panel div.form div.buttons,
+div.form div.buttons {
     margin: 10px 10px 0 200px;
     padding: 0;
 }
@@ -2421,7 +2416,7 @@ div.form div.form-horizontal div.buttons
     padding: 0;
 }
 
-#register div.form div.form-horizontal div.form-group span.error-message {
+#register div.form div.form-group span.error-message {
     height: 1%;
     display: block;
     color: red;
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
@@ -25,7 +25,6 @@
 
     ## enabled auth plugins
     <h1>${_('Authentication Plugins')}</h1>
-    <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label>
             <div>
@@ -48,12 +47,10 @@
                 </ul>
             </div>
         </div>
-    </div>
 
     %for cnt, module in enumerate(c.enabled_plugin_names):
         <% pluginName = c.plugin_shortnames[module] %>
         <h1>${_('Plugin')}: ${pluginName}</h1>
-        <div class="form-horizontal">
         ## autoform generation, based on plugin definition from it's settings
         %for setting in c.plugin_settings[module]:
             <% fullsetting = "auth_%s_%s" % (pluginName, setting["name"]) %>
@@ -98,15 +95,12 @@
             </div>
             %endif
         %endfor
-        </div>
     %endfor
-        <div class="form-horizontal">
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     ${h.end_form()}
     </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
@@ -23,8 +23,6 @@
 
     ${h.form(url('defaults_update', id='defaults'))}
     <div class="form panel-body settings">
-        <div class="form-horizontal">
-
             <div class="form-group">
                 <label class="control-label" for="default_repo_type">${_('Type')}:</label>
                 <div>
@@ -69,7 +67,6 @@
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 
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
@@ -52,7 +52,6 @@
 <div>
     ${h.form(url('my_account_api_keys'), method='post')}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('New API key')}</label>
             </div>
@@ -74,7 +73,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </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
@@ -35,7 +35,6 @@
 <div>
     ${h.form(url('my_account_emails'), method='post')}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
                 <div>
@@ -48,7 +47,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </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,7 +4,6 @@
 
 ${h.form(url('my_account_password'), method='post')}
 <div class="form">
-  <div class="form-horizontal">
     <div class="form-group">
         <label class="control-label" for="current_password">${_('Current password')}:</label>
         <div>
@@ -32,7 +31,6 @@
             ${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
@@ -1,6 +1,5 @@
 ${h.form(url('my_account'), method='post')}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('Gravatar')}:</label>
                 <div class="gravatar_box clearfix">
@@ -49,6 +48,5 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
 ${h.end_form()}
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
@@ -1,6 +1,5 @@
 ${h.form(url('admin_permissions'), method='post')}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="anonymous">${_('Anonymous access')}:</label>
                 <div class="form-inline">
@@ -96,6 +95,5 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
 ${h.end_form()}
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
@@ -21,7 +21,6 @@
 
 ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 <div>
@@ -35,6 +34,5 @@
                     ${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_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
@@ -24,7 +24,6 @@
     </div>
     ${h.form(url('repos_groups'))}
     <div class="form panel-body settings">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="group_name">${_('Group name')}:</label>
                 <div>
@@ -59,7 +58,6 @@
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </div>
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
@@ -1,7 +1,6 @@
 ## -*- coding: utf-8 -*-
 ${h.form(url('update_repos_group',group_name=c.repo_group.group_name))}
 <div class="form">
-    <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="group_name">${_('Group name')}:</label>
             <div>
@@ -37,19 +36,16 @@
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
-    </div>
 </div>
 ${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="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>
 ${h.end_form()}
 
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
@@ -2,7 +2,6 @@
 
 ${h.form(url('repos'))}
 <div class="form">
-    <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="repo_name">${_('Name')}:</label>
             <div>
@@ -65,7 +64,6 @@
                 ${h.submit('add',_('Add'),class_="btn btn-default")}
             </div>
         </div>
-    </div>
 </div>
 <script>
     $(document).ready(function(){
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
@@ -27,7 +27,6 @@
     %endif
     ${h.form(url('create_repo_fields', repo_name=c.repo_name))}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_field_key">${_('New field key')}:</label>
                 <div>
@@ -55,7 +54,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 %else:
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
@@ -1,6 +1,5 @@
 ${h.form(url('edit_repo_perms_update', repo_name=c.repo_name))}
 <div class="form">
-    <div class="form-horizontal">
         <div class="form-group">
             ${h.hidden('repo_private')}
             <table id="permissions_manage" class="table table-condensed">
@@ -85,7 +84,6 @@
             ${h.submit('save',_('Save'),class_="btn btn-default")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
-    </div>
 </div>
 ${h.end_form()}
 
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
@@ -1,6 +1,5 @@
 ${h.form(url('update_repo', repo_name=c.repo_info.repo_name))}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Name')}:</label>
                 <div>
@@ -106,7 +105,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 
diff --git a/kallithea/templates/admin/repos/repo_edit_statistics.html b/kallithea/templates/admin/repos/repo_edit_statistics.html
--- a/kallithea/templates/admin/repos/repo_edit_statistics.html
+++ b/kallithea/templates/admin/repos/repo_edit_statistics.html
@@ -1,6 +1,5 @@
 ${h.form(url('edit_repo_statistics_update', repo_name=c.repo_info.repo_name))}
 <div class="form">
-    <div class="form-horizontal">
       <div class="form-group text-muted">
         <ul class="list-unstyled">
             <li>${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}</li>
@@ -10,6 +9,5 @@
       <div class="form-group">
         ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-default btn-sm",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")}
       </div>
-   </div>
 </div>
 ${h.end_form()}
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
@@ -1,7 +1,5 @@
 ${h.form(url('admin_settings_email'), method='post')}
     <div class="form">
-
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="test_email">${_('Send test email to')}:</label>
                 <div>
@@ -14,6 +12,5 @@
                     ${h.submit('send',_('Send'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
 ${h.end_form()}
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
@@ -1,8 +1,5 @@
 ${h.form(url('admin_settings_global'), method='post')}
     <div class="form">
-
-        <div class="form-horizontal">
-
              <div class="form-group">
                 <label class="control-label" for="title">${_('Site branding')}:</label>
                 <div>
@@ -53,6 +50,5 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
            </div>
-        </div>
     </div>
 ${h.end_form()}
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
@@ -1,5 +1,4 @@
 <div class="form">
-    <div class="form-horizontal">
       <div class="form-group">
       <h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4>
       % for hook in c.hooks:
@@ -11,13 +10,11 @@
       % endfor
       <span class="help-block">${_('Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications.')}</span>
       </div>
-    </div>
 </div>
 
 % if c.visual.allow_custom_hooks_settings:
 ${h.form(url('admin_settings_hooks'), method='post')}
 <div class="form">
-    <div class="form-horizontal">
         <div class="form-group form-inline" id="${'id%s' % hook.ui_id }">
         <h4>${_('Custom Hooks')}</h4>
         %for hook in c.custom_hooks:
@@ -49,7 +46,6 @@
                 ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
-    </div>
 </div>
 ${h.end_form()}
 % endif
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
@@ -1,6 +1,5 @@
 ${h.form(url('admin_settings_mapping'), method='post')}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="destroy">${_('Rescan options')}:</label>
                 <div>
@@ -42,6 +41,5 @@
                     ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
 ${h.end_form()}
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
@@ -1,7 +1,5 @@
 ${h.form(url('admin_settings_search'), method='post')}
     <div class="form">
-
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('Index build option')}:</label>
                 <div>
@@ -20,6 +18,5 @@
                     ${h.submit('reindex',_('Reindex'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
 ${h.end_form()}
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
@@ -1,6 +1,5 @@
 ${h.form(url('admin_settings'), method='post')}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('Hooks')}:</label>
                 <div>
@@ -79,7 +78,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
            </div>
-        </div>
     </div>
     ${h.end_form()}
 
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
@@ -1,8 +1,5 @@
 ${h.form(url('admin_settings_visual'), method='post')}
     <div class="form">
-
-        <div class="form-horizontal">
-
             <div class="form-group">
                 <label class="control-label">${_('General')}:</label>
                 <div>
@@ -119,7 +116,5 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-
-        </div>
     </div>
 ${h.end_form()}
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
@@ -23,7 +23,6 @@
     </div>
     ${h.form(url('users_groups'))}
     <div class="form panel-body settings">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                 <div>
@@ -49,7 +48,6 @@
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </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
@@ -1,6 +1,5 @@
 ${h.form(url('update_users_group', id=c.user_group.users_group_id), id='edit_users_group')}
     <div class="form">
-            <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                     <div>
@@ -47,7 +46,6 @@
                         ${h.submit('Save',_('Save'),class_="btn btn-default")}
                     </div>
                 </div>
-            </div>
     </div>
 ${h.end_form()}
 <script type="text/javascript">
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
@@ -23,7 +23,6 @@
     </div>
     ${h.form(url('new_user'))}
     <div class="form panel-body settings">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
                 <div>
@@ -81,7 +80,6 @@
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </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
@@ -52,7 +52,6 @@
 <div>
     ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('New API key')}</label>
             </div>
@@ -74,7 +73,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </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
@@ -35,7 +35,6 @@
 <div>
     ${h.form(url('edit_user_emails_update', id=c.user.user_id))}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
                 <div>
@@ -48,7 +47,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </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
@@ -33,7 +33,6 @@
 <div>
     ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 <div>
@@ -46,7 +45,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </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
@@ -1,6 +1,5 @@
 ${h.form(url('update_user', id=c.user.user_id))}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('Gravatar')}:</label>
                 <div class="gravatar_box clearfix">
@@ -91,6 +90,5 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
 ${h.end_form()}
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
@@ -7,7 +7,6 @@
 <%def name="default_perms_box(form_url)">
 ${h.form(form_url)}
     <div class="form">
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label>
                 <div>
@@ -58,7 +57,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
 ${h.end_form()}
 
diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html
--- a/kallithea/templates/files/files_add.html
+++ b/kallithea/templates/files/files_add.html
@@ -34,7 +34,7 @@
     </div>
     <div class="panel-body" id="edit">
         <div id="files_data">
-            ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal form-inline")}
+            ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-inline")}
             <h3 class="files_location">
               ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)} /
               <span id="filename_container" class="file reviewer_ac">
diff --git a/kallithea/templates/files/files_delete.html b/kallithea/templates/files/files_delete.html
--- a/kallithea/templates/files/files_delete.html
+++ b/kallithea/templates/files/files_delete.html
@@ -25,7 +25,7 @@
     </div>
     <div class="panel-body" id="edit">
         <div id="files_data">
-            ${h.form(h.url.current(),method='post',class_="form-horizontal")}
+            ${h.form(h.url.current(),method='post')}
             <h3 class="files_location">
                 ${_('Delete file')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)}
             </h3>
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
@@ -21,8 +21,6 @@
     </div>
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
     <div class="form panel-body settings">
-        <div class="form-horizontal">
-
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Fork name')}:</label>
                 <div>
@@ -87,7 +85,6 @@
                     ${h.submit('fork-submit',_('Fork this Repository'),class_="btn btn-default")}
                 </div>
             </div>
-        </div>
     </div>
     ${h.end_form()}
 </div>
diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html
--- a/kallithea/templates/login.html
+++ b/kallithea/templates/login.html
@@ -19,7 +19,6 @@
         <div class="form">
             <i class="icon-lock"></i>
 
-            <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="username">${_('Username')}:</label>
                     <div class="col-sm-7">
@@ -42,7 +41,6 @@
                         </div>
                     </div>
                 </div>
-            </div>
 
             <div class="links">
                 ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
diff --git a/kallithea/templates/password_reset.html b/kallithea/templates/password_reset.html
--- a/kallithea/templates/password_reset.html
+++ b/kallithea/templates/password_reset.html
@@ -17,8 +17,6 @@
     <div class="panel-body">
         ${h.form(url('password_reset'))}
         <div class="form">
-            <div class="form-horizontal">
-
                 <div class="form-group">
                     <label class="control-label" for="email">${_('Email Address')}:</label>
                     <div>
@@ -45,7 +43,6 @@
                 <div class="alert alert-info">
                     ${_('A password reset link will be sent to the specified email address if it is registered in the system.')}
                 </div>
-            </div>
         </div>
         ${h.end_form()}
         %if c.captcha_active:
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
@@ -22,7 +22,6 @@
         ${h.hidden('email')}
         ${h.hidden('timestamp')}
         <div class="form">
-            <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="token">${_('Code you received in the email')}:</label>
                     <div>
@@ -51,7 +50,6 @@
                         </div>
                     </div>
                 </div>
-            </div>
         </div>
         ${h.end_form()}
     </div>
diff --git a/kallithea/templates/pullrequests/pullrequest.html b/kallithea/templates/pullrequests/pullrequest.html
--- a/kallithea/templates/pullrequests/pullrequest.html
+++ b/kallithea/templates/pullrequests/pullrequest.html
@@ -22,8 +22,6 @@
     ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
     <div class="form panel-body">
         <div class="settings clearfix">
-          <div class="form-horizontal">
-
             <div class="form-group">
                 <label class="control-label" for="pullrequest_title">${_('Title')}:</label>
                 <div>
@@ -80,8 +78,6 @@
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
-
-          </div>
         </div>
 
         <div>
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html
+++ b/kallithea/templates/pullrequests/pullrequest_show.html
@@ -32,7 +32,7 @@
           %endif
         </h3>
       </div>
-      <div id="pr-summary" class="form-horizontal">
+      <div id="pr-summary">
 
         <div class="pr-not-edit form-group">
             <label>${_('Description')}:</label>
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -18,7 +18,6 @@
     <div class="panel-body">
         ${h.form(url('register'))}
         <div class="form">
-            <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="username">${_('Username')}:</label>
                     <div>
@@ -81,7 +80,6 @@
                         %endif
                     </div>
                 </div>
-            </div>
         </div>
         ${h.end_form()}
         %if c.captcha_active:
diff --git a/kallithea/templates/search/search.html b/kallithea/templates/search/search.html
--- a/kallithea/templates/search/search.html
+++ b/kallithea/templates/search/search.html
@@ -43,7 +43,6 @@
         ${h.form(h.url('search'),method='get')}
     %endif
 
-        <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="q">${_('Search term')}:</label>
                 <div>
@@ -73,7 +72,6 @@
                 ## <label>${_('Status')}:</label>
                 <div>${c.runtime}</div>
             </div>
-        </div>
         ${h.end_form()}
     </div>
     <div class="panel-body">
diff --git a/kallithea/templates/summary/summary.html b/kallithea/templates/summary/summary.html
--- a/kallithea/templates/summary/summary.html
+++ b/kallithea/templates/summary/summary.html
@@ -57,7 +57,7 @@
         ${self.breadcrumbs()}
     </div>
     <div id="summary-panel-body" class="form panel-body">
-        <div id="summary" class="form-horizontal pull-left">
+        <div id="summary" class="pull-left">
             <div class="form-group form-inline">
                 <label>${_('Clone URL')}:</label>
                 <div id="clone-url">