diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html
--- a/kallithea/templates/admin/gists/edit.html
+++ b/kallithea/templates/admin/gists/edit.html
@@ -61,7 +61,7 @@
                      %else:
                       ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))}
                      %endif
-                   </span>
+                    </span>
                 </div>
             </div>
 
diff --git a/kallithea/templates/admin/permissions/permissions_ips.html b/kallithea/templates/admin/permissions/permissions_ips.html
--- a/kallithea/templates/admin/permissions/permissions_ips.html
+++ b/kallithea/templates/admin/permissions/permissions_ips.html
@@ -14,9 +14,9 @@
               </td>
           </tr>
         %endfor
-       %else:
+      %else:
         <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr>
-       %endif
+      %endif
 </table>
 
 ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
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
@@ -7,7 +7,7 @@ ${h.form(url('repos'))}
             <div>
                 ${h.text('repo_name',class_='form-control')}
             </div>
-         </div>
+        </div>
         <div id="remote_clone" class="form-group">
             <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label>
             <div>
diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html
--- a/kallithea/templates/admin/repos/repo_edit_settings.html
+++ b/kallithea/templates/admin/repos/repo_edit_settings.html
@@ -49,7 +49,7 @@ ${h.form(url('update_repo', repo_name=c.
                    ${h.text('owner',class_='form-control', placeholder=_('Type name of user'))}
                    <span class="help-block">${_('Change owner of this repository.')}</span>
                 </div>
-             </div>
+            </div>
             <div class="form-group">
                 <label class="control-label" for="repo_description">${_('Description')}:</label>
                 <div>
@@ -91,7 +91,7 @@ ${h.form(url('update_repo', repo_name=c.
                           <span class="help-block">${field.field_desc}</span>
                         %endif
                     </div>
-                 </div>
+                </div>
               %endfor
             %endif
             <div class="form-group">
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,12 +1,12 @@
 ${h.form(url('admin_settings_global'), method='post')}
     <div class="form">
-             <div class="form-group">
+            <div class="form-group">
                 <label class="control-label" for="title">${_('Site branding')}:</label>
                 <div>
                     ${h.text('title',size=30,class_='form-control')}
                     <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span>
                 </div>
-             </div>
+            </div>
 
             <div class="form-group">
                 <label class="control-label" for="realm">${_('HTTP authentication realm')}:</label>
@@ -49,6 +49,6 @@ ${h.form(url('admin_settings_global'), m
                     ${h.submit('save',_('Save Settings'),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_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
@@ -58,7 +58,7 @@ ${h.form(url('admin_settings'), method='
                     ${h.submit('save',_('Save Settings'),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_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
@@ -95,7 +95,7 @@ ${h.form(url('admin_settings_visual'), m
                         </label>
                     </div>
                     <span class="help-block">${_('Show public/private icons next to repository names.')}</span>
-                 </div>
+                </div>
             </div>
 
             <div class="form-group">
@@ -120,7 +120,7 @@ ${h.form(url('admin_settings_visual'), m
                             <li>[see =&gt; URI] <span class="label label-meta" data-tag="see">see =&gt; <a href="#">URI</a> </span></li>
                         </ul>
                     </div>
-                 </div>
+                </div>
             </div>
 
             <div class="form-group">
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -171,7 +171,7 @@
                   <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-fork"></i>${_('Fork')}</a></li>
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i>${_('Create Pull Request')}</a></li>
               %endif
-             </ul>
+          </ul>
         </li>
     </ul>
     </div>
diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html
--- a/kallithea/templates/changeset/changeset.html
+++ b/kallithea/templates/changeset/changeset.html
@@ -139,8 +139,8 @@ ${self.repo_context_bar('changelog', c.c
               % else:
                   ${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(file_diff_data)) % (len(file_diff_data), c.lines_added, c.lines_deleted)}:
               %endif
-              </div>
-              <div class="cs_files">
+            </div>
+            <div class="cs_files">
                 %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
                     <div class="cs_${op} clearfix">
                       <span class="node">
@@ -182,7 +182,7 @@ ${self.repo_context_bar('changelog', c.c
     ## main comment form and it status
     ${comment.comments()}
 
-    </div>
+  </div>
 
     ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS
     <script>
@@ -202,5 +202,5 @@ ${self.repo_context_bar('changelog', c.c
 
     </script>
 
-  </div>
+</div>
 </%def>
diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html
--- a/kallithea/templates/compare/compare_diff.html
+++ b/kallithea/templates/compare/compare_diff.html
@@ -30,11 +30,14 @@ ${self.repo_context_bar('changelog')}
                 ## divs are "inline-block" and cannot have whitespace between them.
                 <span>
                     ${h.hidden('compare_org')}
-                </span><span>
+                </span><!--
+             --><span>
                     <i class="icon-right"></i>
-                </span><span>
+                </span><!--
+             --><span>
                     ${h.hidden('compare_other')}
-                </span><span>
+                </span><!--
+             --><span>
                     %if not c.compare_home:
                         <a class="btn btn-default btn-sm" href="${c.swap_url}"><i class="icon-arrows-cw"></i>${_('Swap')}</a>
                     %endif
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
@@ -90,14 +90,15 @@
                      <td>
                          %if node.is_file():
                              <span data-toggle="tooltip" title="${h.fmt_date(node.last_changeset.date)}">
-                            ${h.age(node.last_changeset.date)}</span>
+                               ${h.age(node.last_changeset.date)}
+                             </span>
                          %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <span title="${node.last_changeset.author}">
-                            ${h.person(node.last_changeset.author)}
-                            </span>
+                               ${h.person(node.last_changeset.author)}
+                             </span>
                          %endif
                      </td>
                 </tr>
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
@@ -54,7 +54,7 @@
         </div>
         ${h.end_form()}
     </div>
-   </div>
 </div>
 </div>
 </div>
+</div>
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -97,7 +97,7 @@
         });
         </script>
     </div>
- </div>
- </div>
- </div>
- </div>
+</div>
+</div>
+</div>
+</div>
diff --git a/kallithea/templates/summary/statistics.html b/kallithea/templates/summary/statistics.html
--- a/kallithea/templates/summary/statistics.html
+++ b/kallithea/templates/summary/statistics.html
@@ -22,7 +22,7 @@
 
 <%def name="main()">
 ${self.repo_context_bar('summary')}
-    <div class="panel panel-primary">
+<div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
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
@@ -126,13 +126,13 @@ ${self.repo_context_bar('summary')}
         </div>
         <ul id="summary-menu-stats" class="list-group pull-right">
             <li class="list-group-item">
-               <a title="${_('Owner')} ${c.db_repo.owner.email}">
+              <a title="${_('Owner')} ${c.db_repo.owner.email}">
                 <i class="icon-user"></i>${c.db_repo.owner.username}
                 ${h.gravatar_div(c.db_repo.owner.email, size=18, div_class="pull-right")}
               </a>
             </li>
             <li class="list-group-item">
-               <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
+              <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                 <i class="icon-heart"></i>${_('Followers')}
                 <span class="badge pull-right" id="current_followers_count">${c.repository_followers}</span>
               </a>
@@ -180,7 +180,7 @@ ${self.repo_context_bar('summary')}
             ${h.link_to(_('Latest Changes'),h.url('changelog_home',repo_name=c.repo_name))}
         %else:
             ${_('Quick Start')}
-         %endif
+        %endif
         </div>
     </div>
     <div class="panel-body">