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
@@ -27,13 +27,13 @@
     ## 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 class="input">${h.text("auth_plugins", class_='large')}
-           <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
-               <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
-               <ul>
-               %for plugin_path in c.available_plugins:
+        <div class="form-group">
+            <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label>
+            <div class="input">${h.text("auth_plugins", class_='large')}
+            <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
+                <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
+                <ul>
+                %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 ''}">
@@ -42,10 +42,10 @@
                         ${plugin_path}
                       </div>
                     </li>
-               %endfor
-               </ul>
-           </div>
-       </div>
+                %endfor
+                </ul>
+            </div>
+        </div>
     </div>
 
     %for cnt, module in enumerate(c.enabled_plugins):
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
@@ -43,7 +43,6 @@
                 </div>
             </div>
 
-
             <div class="form-group">
                 <label class="control-label" for="default_repo_enable_statistics">${_('Enable statistics')}:</label>
                 <div class="checkboxes">
diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html
--- a/kallithea/templates/admin/gists/index.html
+++ b/kallithea/templates/admin/gists/index.html
@@ -65,7 +65,7 @@
 
         <div class="notification-paginator">
           <div class="pagination-wh pagination-left">
-          ${c.gists_pager.pager('$link_previous ~2~ $link_next', **request.GET.mixed())}
+            ${c.gists_pager.pager('$link_previous ~2~ $link_next', **request.GET.mixed())}
           </div>
         </div>
     %else:
diff --git a/kallithea/templates/admin/my_account/my_account.html b/kallithea/templates/admin/my_account/my_account.html
--- a/kallithea/templates/admin/my_account/my_account.html
+++ b/kallithea/templates/admin/my_account/my_account.html
@@ -22,21 +22,21 @@
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
-          <li>
-           <div class="gravatar_box" style="height: 26px">
-               ${h.gravatar_div(c.user.email, div_style="float: left")}
-               <div class="truncate" style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left; width: 100px">
-                <strong>${c.user.username}</strong>
-               </div>
-           </div>
-          </li>
-          <li class="${'active' if c.active=='profile' else ''}"><a href="${h.url('my_account')}">${_('Profile')}</a></li>
-          <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('my_account_emails')}">${_('Email Addresses')}</a></li>
-          <li class="${'active' if c.active=='password' else ''}"><a href="${h.url('my_account_password')}">${_('Password')}</a></li>
-          <li class="${'active' if c.active=='api_keys' else ''}"><a href="${h.url('my_account_api_keys')}">${_('API Keys')}</a></li>
-          <li class="${'active' if c.active=='repos' else ''}"><a href="${h.url('my_account_repos')}">${_('Owned Repositories')}</a></li>
-          <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched Repositories')}</a></li>
-          <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('Show Permissions')}</a></li>
+            <li>
+              <div class="gravatar_box" style="height: 26px">
+                ${h.gravatar_div(c.user.email, div_style="float: left")}
+                <div class="truncate" style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left; width: 100px">
+                    <strong>${c.user.username}</strong>
+                </div>
+              </div>
+            </li>
+            <li class="${'active' if c.active=='profile' else ''}"><a href="${h.url('my_account')}">${_('Profile')}</a></li>
+            <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('my_account_emails')}">${_('Email Addresses')}</a></li>
+            <li class="${'active' if c.active=='password' else ''}"><a href="${h.url('my_account_password')}">${_('Password')}</a></li>
+            <li class="${'active' if c.active=='api_keys' else ''}"><a href="${h.url('my_account_api_keys')}">${_('API Keys')}</a></li>
+            <li class="${'active' if c.active=='repos' else ''}"><a href="${h.url('my_account_repos')}">${_('Owned Repositories')}</a></li>
+            <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched Repositories')}</a></li>
+            <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('Show Permissions')}</a></li>
         </ul>
     </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
@@ -37,12 +37,12 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
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,50 +1,50 @@
 ${h.form(url('my_account'), method='post')}
     <div class="form">
 
-         <div class="form-group">
-           <div class="gravatar_box">
+        <div class="form-group">
+            <div class="gravatar_box">
                 ${h.gravatar_div(c.user.email)}
                 <p>
-                %if c.visual.use_gravatar:
-                <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
-                <br/>${_('Using')} ${c.user.email}
-                %else:
-                <strong>${_('Avatars are disabled')}</strong>
-                <br/>${c.user.email or _('Missing email, please update your user email address.')}
-                    [${_('Current IP')}: ${c.ip_addr}]
-                %endif
-               </p>
-           </div>
-         </div>
+                    %if c.visual.use_gravatar:
+                        <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
+                        <br/>${_('Using')} ${c.user.email}
+                    %else:
+                        <strong>${_('Avatars are disabled')}</strong>
+                        <br/>${c.user.email or _('Missing email, please update your user email address.')}
+                        [${_('Current IP')}: ${c.ip_addr}]
+                    %endif
+                </p>
+            </div>
+        </div>
 
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
                 <div class="input">
-                  ${h.text('username',class_='medium', readonly=c.readonly('username'))}
+                    ${h.text('username',class_='medium', readonly=c.readonly('username'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="name">${_('First Name')}:</label>
                 <div class="input">
                     ${h.text('firstname',class_="medium", readonly=c.readonly('firstname'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 <div class="input">
                     ${h.text('lastname',class_="medium", readonly=c.readonly('lastname'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
                 <div class="input">
                     ${h.text('email',class_="medium", readonly=c.readonly('email'))}
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <div class="buttons">
diff --git a/kallithea/templates/admin/notifications/notifications.html b/kallithea/templates/admin/notifications/notifications.html
--- a/kallithea/templates/admin/notifications/notifications.html
+++ b/kallithea/templates/admin/notifications/notifications.html
@@ -20,19 +20,19 @@
         ${self.breadcrumbs()}
     </div>
 
-      <div style="padding:14px 18px;text-align: right;float:left">
-      <span id='all' class="btn btn-default btn-sm"><a href="${h.url.current()}">${_('All')}</a></span>
-      <span id='comment' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
-      <span id='pull_request' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>
-      </div>
-      %if c.notifications:
-      <div style="padding:14px 18px;text-align: right;float:right">
-      <span id='mark_all_read' class="btn btn-default btn-sm">${_('Mark All Read')}</span>
-      </div>
-      %endif
-  <div id='notification_data'>
-    <%include file='notifications_data.html'/>
-  </div>
+    <div style="padding:14px 18px;text-align: right;float:left">
+            <span id='all' class="btn btn-default btn-sm"><a href="${h.url.current()}">${_('All')}</a></span>
+            <span id='comment' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
+            <span id='pull_request' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>
+    </div>
+    %if c.notifications:
+        <div style="padding:14px 18px;text-align: right;float:right">
+            <span id='mark_all_read' class="btn btn-default btn-sm">${_('Mark All Read')}</span>
+        </div>
+    %endif
+    <div id='notification_data'>
+        <%include file='notifications_data.html'/>
+    </div>
 </div>
 <script type="text/javascript">
 var url_delete = "${url('notification_delete', notification_id='__NOTIFICATION_ID__')}";
diff --git a/kallithea/templates/admin/notifications/notifications_data.html b/kallithea/templates/admin/notifications/notifications_data.html
--- a/kallithea/templates/admin/notifications/notifications_data.html
+++ b/kallithea/templates/admin/notifications/notifications_data.html
@@ -4,8 +4,7 @@
 unread = lambda n:{False:'unread'}.get(n)
 %>
 
-
-<div class="notification-list  notification-table">
+<div class="notification-list notification-table">
 %for notification in c.notifications:
   <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}">
     <div class="notification-header">
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
@@ -47,14 +47,14 @@ ${h.form(url('admin_permissions'), metho
                     <span class="help-block">${_('Permissions for the Default user on new user groups.')}</span>
                 </div>
             </div>
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="default_repo_create">${_('Top level repository creation')}:</label>
                 <div class="select">
                     ${h.select('default_repo_create','',c.repo_create_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to create repositories at the top level.')}</span>
                     <span class="help-block">${_('Note: This will also give all users API access to create repositories everywhere. That might change in future versions.')}</span>
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <label class="control-label" for="create_on_write">${_('Repository creation with group write access')}:</label>
                 <div class="select">
@@ -62,32 +62,32 @@ ${h.form(url('admin_permissions'), metho
                     <span class="help-block">${_('With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing.')}</span>
                 </div>
             </div>
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="default_user_group_create">${_('User group creation')}:</label>
                 <div class="select">
                     ${h.select('default_user_group_create','',c.user_group_create_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to create user groups.')}</span>
                 </div>
-             </div>
-             <div class="form-group">
+            </div>
+            <div class="form-group">
                 <label class="control-label" for="default_fork">${_('Repository forking')}:</label>
                 <div class="select">
                     ${h.select('default_fork','',c.fork_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to fork repositories.')}</span>
                 </div>
-             </div>
-             <div class="form-group">
+            </div>
+            <div class="form-group">
                 <label class="control-label" for="default_register">${_('Registration')}:</label>
                 <div class="select">
                     ${h.select('default_register','',c.register_choices)}
                 </div>
-             </div>
-             <div class="form-group">
+            </div>
+            <div class="form-group">
                 <label class="control-label" for="default_extern_activate">${_('External auth account activation')}:</label>
                 <div class="select">
                     ${h.select('default_extern_activate','',c.extern_activate_choices)}
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
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
@@ -25,13 +25,13 @@ ${h.form(url('edit_user_ips_update', id=
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 <div class="input">
                     ${h.hidden('default_user', 'True')}
                     ${h.text('new_ip', class_='medium')}
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
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
@@ -28,12 +28,12 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="group_name">${_('Group name')}:</label>
                 <div class="input">
                     ${h.text('group_name',class_='small')}
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <label class="control-label" for="group_description">${_('Description')}:</label>
@@ -43,10 +43,10 @@
             </div>
 
             <div class="form-group">
-                 <label class="control-label" for="group_parent_id">${_('Group parent')}:</label>
-                 <div class="input">
-                     ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
-                 </div>
+                <label class="control-label" for="group_parent_id">${_('Group parent')}:</label>
+                <div class="input">
+                    ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
+                </div>
             </div>
 
             <div id="copy_perms" class="field">
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
@@ -27,11 +27,11 @@ ${h.form(url('repos'))}
             </div>
         </div>
         <div class="form-group">
-             <label class="control-label" for="repo_group">${_('Repository group')}:</label>
-             <div class="input">
-                 ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
-                 <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
-             </div>
+            <label class="control-label" for="repo_group">${_('Repository group')}:</label>
+            <div class="input">
+                ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
+                <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
+            </div>
         </div>
         <div id="copy_perms" class="field">
             <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label>
diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html
--- a/kallithea/templates/admin/repos/repo_creating.html
+++ b/kallithea/templates/admin/repos/repo_creating.html
@@ -24,19 +24,19 @@
     </div>
 
     <div style="display:table; padding: 10px 0px; font-size: 14px;font-weight: bold;margin-right: auto;margin-left: auto">
-        ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
+                ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
     </div>
 
     <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto">
-        <div class="progress progress-striped active">
-          <div class="progress-bar progress-bar" role="progressbar"
-               aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
-          </div>
-        </div>
+            <div class="progress progress-striped active">
+                <div class="progress-bar progress-bar" role="progressbar"
+                    aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
+                </div>
+            </div>
     </div>
     <div id="progress_error" style="display: none;">
         <div style="font-weight: bold; color:#aa1111">
-        ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}
+                ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}
         </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
@@ -28,25 +28,26 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="new_field_key">${_('New field key')}:</label>
                 <div class="input">
                     ${h.text('new_field_key', class_='small')}
                 </div>
-             </div>
-             <div class="form-group">
+            </div>
+
+            <div class="form-group">
                 <label class="control-label" for="new_field_label">${_('New field label')}:</label>
                 <div class="input">
                     ${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="new_field_desc">${_('New field description')}:</label>
                 <div class="input">
                     ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))}
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <div class="buttons">
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,6 @@
 ${h.form(url('edit_repo_perms_update', repo_name=c.repo_name))}
 <div class="form">
-   <div class="form-horizontal">
+    <div class="form-horizontal">
         <div class="form-group">
             ${h.hidden('repo_private')}
             <table id="permissions_manage" class="noborder">
@@ -101,7 +101,7 @@ ${h.form(url('edit_repo_perms_update', r
             ${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/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
@@ -19,37 +19,37 @@ ${h.form(url('admin_settings_hooks'), me
 <div class="form">
     <div class="form-horizontal">
 
-      % for hook in c.custom_hooks:
-      <div class="field"  id="${'id%s' % hook.ui_id }">
-        <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label>
-        <div class="input" style="margin-left:280px">
-            ${h.hidden('hook_ui_key',hook.ui_key)}
-            ${h.hidden('hook_ui_value',hook.ui_value)}
-            ${h.text('hook_ui_value_new',hook.ui_value,size=60)}
-            <span class="btn btn-default btn-xs"
-                onclick="delete_hook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
-            <i class="icon-minus-circled" style="color:#FF4444"></i>
-            ${_('Delete')}
-            </span>
-        </div>
-      </div>
-      % endfor
+        %for hook in c.custom_hooks:
+            <div class="field"  id="${'id%s' % hook.ui_id }">
+                <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label>
+                <div class="input" style="margin-left:280px">
+                    ${h.hidden('hook_ui_key',hook.ui_key)}
+                    ${h.hidden('hook_ui_value',hook.ui_value)}
+                    ${h.text('hook_ui_value_new',hook.ui_value,size=60)}
+                    <span class="btn btn-default btn-xs"
+                        onclick="delete_hook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
+                        <i class="icon-minus-circled" style="color:#FF4444"></i>
+                        ${_('Delete')}
+                    </span>
+                </div>
+            </div>
+        %endfor
 
-      <div class="form-group">
-        <div class="input" style="margin-left:-135px;position: absolute;">
-          <div class="input">
-             ${h.text('new_hook_ui_key',size=20)}
-          </div>
+        <div class="form-group">
+            <div class="input" style="margin-left:-135px;position: absolute;">
+                <div class="input">
+                    ${h.text('new_hook_ui_key',size=20)}
+                </div>
+            </div>
+            <div class="input" style="margin-left:280px">
+                ${h.text('new_hook_ui_value',size=60)}
+            </div>
         </div>
-        <div class="input" style="margin-left:280px">
-            ${h.text('new_hook_ui_value',size=60)}
+        <div class="form-group">
+            <div class="buttons" style="margin-left:280px">
+                ${h.submit('save',_('Save'),class_="btn btn-default")}
+            </div>
         </div>
-      </div>
-      <div class="form-group">
-          <div class="buttons" style="margin-left:280px">
-               ${h.submit('save',_('Save'),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,7 +1,7 @@
 ${h.form(url('admin_settings'), method='post')}
     <div class="form">
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label>${_('Hooks')}:</label>
                 <div class="checkboxes">
                     <div class="checkbox">
@@ -21,8 +21,8 @@ ${h.form(url('admin_settings'), method='
                         <label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label>
                     </div>
                 </div>
-             </div>
-             <div class="form-group">
+            </div>
+            <div class="form-group">
                 <label>${_('Mercurial extensions')}:</label>
                 <div class="checkboxes">
                     <div class="checkbox">
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
@@ -3,7 +3,7 @@ ${h.form(url('admin_settings_visual'), m
 
         <div class="form-horizontal">
 
-             <div class="form-group">
+            <div class="form-group">
                 <label>${_('General')}:</label>
                 <div class="checkboxes">
                     <div class="checkbox">
@@ -47,7 +47,7 @@ ${h.form(url('admin_settings_visual'), m
                                                         {repo}   full repository name,
                                                         {repoid} ID of repository, can be used to construct clone-by-id''')}</span>
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <label class="control-label" for="dashboard_items">${_('Dashboard items')}:</label>
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
@@ -27,25 +27,25 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                 <div class="input">
                     ${h.text('users_group_name',class_='small')}
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <label class="control-label" for="user_group_description">${_('Description')}:</label>
                 <div class="textarea text-area editor">
                     ${h.textarea('user_group_description')}
                     <span class="help-block">${_('Short, optional description for this user group.')}</span>
                 </div>
-             </div>
-             <div class="form-group">
+            </div>
+            <div class="form-group">
                 <label class="control-label" for="users_group_active">${_('Active')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('users_group_active',value=True, checked='checked')}
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <div class="buttons">
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
@@ -2,25 +2,25 @@ ${h.form(url('update_users_group', id=c.
     <div class="form">
         <!-- fields -->
             <div class="form-horizontal">
-                 <div class="form-group">
+                <div class="form-group">
                     <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                     <div class="input">
                         ${h.text('users_group_name',class_='large')}
                     </div>
-                 </div>
-                 <div class="form-group">
+                </div>
+                <div class="form-group">
                     <label class="control-label" for="user_group_description">${_('Description')}:</label>
                     <div class="textarea-small editor">
                         ${h.textarea('user_group_description')}
                         <span class="help-block">${_('Short, optional description for this user group.')}</span>
                     </div>
-                 </div>
-                 <div class="form-group">
+                </div>
+                <div class="form-group">
                     <label class="control-label" for="users_group_active">${_('Active')}:</label>
                     <div class="checkboxes">
                         ${h.checkbox('users_group_active',value=True)}
                     </div>
-                 </div>
+                </div>
                 <div class="form-group">
                     <label class="control-label" for="users_group_active">${_('Members')}:</label>
                     <div class="select">
@@ -46,7 +46,6 @@ ${h.form(url('update_users_group', id=c.
                                 </tr>
                         </table>
                     </div>
-
                 </div>
                 <div class="form-group">
                     <div class="buttons">
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
@@ -27,54 +27,54 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
                 <div class="input">
                     ${h.text('username',class_='small')}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="password">${_('Password')}:</label>
                 <div class="input">
                     ${h.password('password',class_='small')}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label>
                 <div class="input">
                     ${h.password('password_confirmation',class_="small")}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
                 <div class="input">
                     ${h.text('firstname',class_='small')}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 <div class="input">
                     ${h.text('lastname',class_='small')}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
                 <div class="input">
                     ${h.text('email',class_='small')}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="active">${_('Active')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True,checked='checked')}
                 </div>
-             </div>
+            </div>
 
             ${h.hidden('extern_type', c.default_extern_type)}
             ${h.hidden('extern_name', c.default_extern_name)}
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
@@ -37,12 +37,12 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
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
@@ -37,12 +37,12 @@
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 <div class="input">
                     ${h.text('new_ip', class_='medium')}
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
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,7 +1,7 @@
 ${h.form(url('update_user', id=c.user.user_id))}
-<div class="form">
+    <div class="form">
         <div class="form-group">
-           <div class="gravatar_box">
+            <div class="gravatar_box">
                 ${h.gravatar_div(c.user.email)}
                 <p>
                 %if c.visual.use_gravatar:
@@ -15,79 +15,79 @@ ${h.form(url('update_user', id=c.user.us
                             [${_('Current IP')}: ${c.ip_addr}]
                         %endif
                 %endif
-           </div>
+            </div>
         </div>
         <div class="form-horizontal">
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
                 <div class="input">
-                  ${h.text('username',class_='medium', readonly=c.readonly('username'))}
+                    ${h.text('username',class_='medium', readonly=c.readonly('username'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
                 <div class="input">
                     ${h.text('email',class_='medium', readonly=c.readonly('email'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="extern_type">${_('Source of Record')}:</label>
                 <div class="input">
                     ${h.text('extern_type',class_='medium',readonly="readonly")}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label>
                 <div class="input">
                     ${h.text('extern_name',class_='medium',readonly="readonly")}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="new_password">${_('New password')}:</label>
                 <div class="input">
                     ${h.password('new_password',class_='medium',readonly=c.readonly('password'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label>
                 <div class="input">
                     ${h.password('password_confirmation',class_="medium",readonly=c.readonly('password'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
                 <div class="input">
                     ${h.text('firstname',class_='medium', readonly=c.readonly('firstname'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 <div class="input">
                     ${h.text('lastname',class_='medium', readonly=c.readonly('lastname'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="active">${_('Active')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True, readonly=c.readonly('active'))}
                 </div>
-             </div>
+            </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="admin">${_('Admin')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True, readonly=c.readonly('admin'))}
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <div class="buttons">
@@ -96,5 +96,5 @@ ${h.form(url('update_user', id=c.user.us
                 </div>
             </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
@@ -14,8 +14,8 @@ ${h.form(form_url)}
                 <div class="checkboxes">
                     ${h.checkbox('inherit_default_permissions',value=True)}
                     <span class="help-block">
-                    ${h.literal(_('Select to inherit global settings, IP whitelist and permissions from the %s.')
-                                % h.link_to('default permissions', url('admin_permissions')))}
+                        ${h.literal(_('Select to inherit global settings, IP whitelist and permissions from the %s.')
+                                    % h.link_to('default permissions', url('admin_permissions')))}
                     </span>
                 </div>
             </div>
@@ -26,7 +26,7 @@ ${h.form(form_url)}
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                     <span class="help-block">
-                    ${h.literal(_('Select this option to allow repository creation for this user'))}
+                        ${h.literal(_('Select this option to allow repository creation for this user'))}
                     </span>
                 </div>
             </div>
diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html
+++ b/kallithea/templates/changelog/changelog.html
@@ -33,20 +33,20 @@ ${self.repo_context_bar('changelog', c.f
         ${self.breadcrumbs()}
     </div>
     <div class="table">
-        % if c.pagination:
+        %if c.pagination:
             <div>
                 <div style="overflow:auto; ${'display:none' if c.changelog_for_path else ''}">
                     <div class="container_header">
                         <div style="float:left; margin-left:20px;">
-                          ${h.form(h.url.current(),method='get',style="display:inline")}
-                            ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}
-                            ${h.text('size',size=3,value=c.size)}
-                            ${_('revisions')}
-                            %if c.branch_name:
-                            ${h.hidden('branch', c.branch_name)}
-                            %endif
-                          ${h.end_form()}
-                          <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
+                            ${h.form(h.url.current(),method='get',style="display:inline")}
+                                ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}
+                                ${h.text('size',size=3,value=c.size)}
+                                ${_('revisions')}
+                                %if c.branch_name:
+                                    ${h.hidden('branch', c.branch_name)}
+                                %endif
+                            ${h.end_form()}
+                            <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                         </div>
                         <div style="float: right; margin: 0px 0px 0px 4px">
                             <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a>
diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html
--- a/kallithea/templates/changeset/changeset_file_comment.html
+++ b/kallithea/templates/changeset/changeset_file_comment.html
@@ -74,8 +74,8 @@
                 </label>
                 %for status, lbl in c.changeset_statuses:
                     <label>
-                      <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
-                      ${lbl}<i class="icon-circle changeset-status-${status}" /></i>
+                        <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
+                        ${lbl}<i class="icon-circle changeset-status-${status}" /></i>
                     </label>
                 %endfor
 
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html
--- a/kallithea/templates/changeset/changeset_range.html
+++ b/kallithea/templates/changeset/changeset_range.html
@@ -35,10 +35,10 @@ ${self.repo_context_bar('changelog')}
             </div>
         </div>
         <div id="changeset_compare_view_content">
-            <div class="container">
+          <div class="container">
             <table class="compare_view_commits noborder">
             %for cnt,cs in enumerate(c.cs_ranges):
-                <tr>
+              <tr>
                 %if c.visual.use_gravatar:
                 <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</td>
                 %endif
@@ -51,12 +51,12 @@ ${self.repo_context_bar('changelog')}
                   %endif
                 </td>
                 <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
-                </tr>
+              </tr>
             %endfor
             </table>
-            </div>
-            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
-            <div class="cs_files">
+          </div>
+          <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
+          <div class="cs_files">
                 %for cs in c.cs_ranges:
                     <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</div>
                     <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
@@ -70,7 +70,7 @@ ${self.repo_context_bar('changelog')}
                         </div>
                     %endfor
                 %endfor
-            </div>
+          </div>
         </div>
 
     </div>
@@ -81,8 +81,8 @@ ${self.repo_context_bar('changelog')}
           ## diff block
           <div class="h3">
           <a class="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>
-             ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
-             <div class="right">
+            ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
+            <div class="right">
               <span class="logtags">
                 %if len(cs.parents)>1:
                 <span class="merge">${_('Merge')}</span>
@@ -105,7 +105,7 @@ ${self.repo_context_bar('changelog')}
                 %endif
               </span>
             </div>
-           </div>
+          </div>
           <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
           ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,
                                   c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}
diff --git a/kallithea/templates/compare/compare_cs.html b/kallithea/templates/compare/compare_cs.html
--- a/kallithea/templates/compare/compare_cs.html
+++ b/kallithea/templates/compare/compare_cs.html
@@ -18,7 +18,7 @@
 
     <table class="compare_view_commits noborder">
     %for cnt, cs in enumerate(reversed(c.cs_ranges)):
-        <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
+      <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
         <td style="width:50px">
           %if cs.raw_id in c.statuses:
             <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
@@ -75,7 +75,7 @@
             </div>
             <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>
         </td>
-        </tr>
+      </tr>
     %endfor
     </table>
 
diff --git a/kallithea/templates/files/files_browser.html b/kallithea/templates/files/files_browser.html
--- a/kallithea/templates/files/files_browser.html
+++ b/kallithea/templates/files/files_browser.html
@@ -37,11 +37,11 @@
             ${h.end_form()}
         </div>
         <div class="browser-branch">
-           ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
-           <label>${_('Follow current branch')}</label>
+            ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
+            <label>${_('Follow current branch')}</label>
         </div>
         <div id="search_activate_id" class="search_activate">
-           <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>
+            <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>
         </div>
         <div class="browser-search">
             <div>
diff --git a/kallithea/templates/files/files_source.html b/kallithea/templates/files/files_source.html
--- a/kallithea/templates/files/files_source.html
+++ b/kallithea/templates/files/files_source.html
@@ -33,7 +33,7 @@
               %endif
               ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
-              % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
+              %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                %if c.on_branch_head and not c.file.is_binary:
                 ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-default btn-xs")}
                 ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")}
@@ -43,8 +43,8 @@
                %else:
                 ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}
                 ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-xs disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))}
-               % endif
-              % endif
+               %endif
+              %endif
             </div>
         </div>
         <div class="author">
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
@@ -23,12 +23,12 @@ ${self.repo_context_bar('createfork')}
         <div class="form-horizontal">
 
             <div class="form-group">
-              <label class="control-label" for="repo_name">${_('Fork name')}:</label>
-              <div class="input">
-                  ${h.text('repo_name',class_="small")}
-                  ${h.hidden('repo_type',c.repo_info.repo_type)}
-                  ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
-              </div>
+                <label class="control-label" for="repo_name">${_('Fork name')}:</label>
+                <div class="input">
+                    ${h.text('repo_name',class_="small")}
+                    ${h.hidden('repo_type',c.repo_info.repo_type)}
+                    ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
+                </div>
             </div>
 
             <div class="form-group">
@@ -40,14 +40,14 @@ ${self.repo_context_bar('createfork')}
             </div>
 
             <div class="form-group">
-                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
-                 <div class="input">
-                     ${h.select('repo_group','',c.repo_groups,class_="medium")}
-                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
-                 </div>
+                <label class="control-label" for="repo_group">${_('Repository group')}:</label>
+                <div class="input">
+                    ${h.select('repo_group','',c.repo_groups,class_="medium")}
+                    <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
+                </div>
             </div>
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="landing_rev">${_('Landing revision')}:</label>
                 <div class="input">
                     ${h.select('landing_rev','',c.landing_revs,class_="medium")}
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
@@ -20,12 +20,12 @@
             <!-- fields -->
             <div class="form-horizontal">
 
-                 <div class="form-group">
+                <div class="form-group">
                     <label class="control-label" for="email">${_('Email Address')}:</label>
                     <div class="input">
                         ${h.text('email')}
                     </div>
-                 </div>
+                </div>
 
                 %if c.captcha_active:
                 <div class="form-group">
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
@@ -26,12 +26,12 @@ ${self.repo_context_bar('showpullrequest
 
         <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;">
 
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="pullrequest_title">${_('Title')}:</label>
                 <div class="input">
                     ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <label class="control-label" for="pullrequest_desc">${_('Description')}:</label>
@@ -81,7 +81,7 @@ ${self.repo_context_bar('showpullrequest
                 <div class="buttons">
                     ${h.submit('save',_('Create Pull Request'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
-               </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
@@ -213,9 +213,9 @@ ${self.repo_context_bar('showpullrequest
               ## If you change something here it should be reflected in the template too.
               <li id="reviewer_${member.user_id}">
                 <div class="reviewers_member">
-                    <div class="reviewer_status tooltip" title="${h.changeset_status_lbl(status)}">
+                  <div class="reviewer_status tooltip" title="${h.changeset_status_lbl(status)}">
                       <i class="icon-circle changeset-status-${status}"></i>
-                    </div>
+                  </div>
                   ${h.gravatar_div(member.email, size=14, div_class="reviewer_gravatar gravatar")}
                   <div style="float:left;">
                     ${member.full_name_and_username}
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -73,12 +73,12 @@
 
                 <div class="buttons">
                     <div class="nohighlight">
-                      ${h.submit('sign_up',_('Sign Up'),class_="btn btn-default")}
-                      %if c.auto_active:
-                          <div class="activation_msg">${_('Registered accounts are ready to use and need no further action.')}</div>
-                      %else:
-                          <div class="activation_msg">${_('Please wait for an administrator to activate your account.')}</div>
-                      %endif
+                        ${h.submit('sign_up',_('Sign Up'),class_="btn btn-default")}
+                        %if c.auto_active:
+                            <div class="activation_msg">${_('Registered accounts are ready to use and need no further action.')}</div>
+                        %else:
+                            <div class="activation_msg">${_('Please wait for an administrator to activate your account.')}</div>
+                        %endif
                     </div>
                 </div>
             </div>
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
@@ -61,7 +61,7 @@ ${self.repo_context_bar('options')}
                         ##('repository',_('Repository names')),
                         ])}
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <div class="buttons">