diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html
--- a/kallithea/templates/about.html
+++ b/kallithea/templates/about.html
@@ -12,7 +12,6 @@
 <%def name="main()">
 
 <div class="panel panel-primary">
-  <!-- box / title -->
   <div class="panel-heading">
     <h5>${_('About')} Kallithea</h5>
   </div>
diff --git a/kallithea/templates/admin/admin.html b/kallithea/templates/admin/admin.html
--- a/kallithea/templates/admin/admin.html
+++ b/kallithea/templates/admin/admin.html
@@ -19,11 +19,9 @@
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     <div class="table">
         <div id="user_log">
             <%include file='admin_log.html'/>
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
@@ -17,7 +17,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </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
@@ -17,15 +17,12 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
 
     ${h.form(url('defaults_update', id='defaults'))}
     <div class="form">
-        <!-- fields -->
-
         <div class="form-horizontal">
 
             <div class="form-group">
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
@@ -24,7 +24,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
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
@@ -28,7 +28,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         %if c.authuser.username != 'default':
diff --git a/kallithea/templates/admin/gists/new.html b/kallithea/templates/admin/gists/new.html
--- a/kallithea/templates/admin/gists/new.html
+++ b/kallithea/templates/admin/gists/new.html
@@ -24,7 +24,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html
--- a/kallithea/templates/admin/gists/show.html
+++ b/kallithea/templates/admin/gists/show.html
@@ -16,7 +16,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         %if c.authuser.username != 'default':
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
@@ -54,7 +54,6 @@
 <div>
     ${h.form(url('my_account_api_keys'), method='post')}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('New API key')}</label>
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">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
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
@@ -15,7 +15,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html
--- a/kallithea/templates/admin/notifications/show_notification.html
+++ b/kallithea/templates/admin/notifications/show_notification.html
@@ -17,7 +17,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/admin/permissions/permissions_globals.html b/kallithea/templates/admin/permissions/permissions_globals.html
--- a/kallithea/templates/admin/permissions/permissions_globals.html
+++ b/kallithea/templates/admin/permissions/permissions_globals.html
@@ -1,6 +1,5 @@
 ${h.form(url('admin_permissions'), method='post')}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="anonymous">${_('Anonymous access')}:</label>
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
@@ -23,7 +23,6 @@
 
 ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
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
@@ -19,14 +19,11 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     ${h.form(url('repos_groups'))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="group_name">${_('Group name')}:</label>
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">
-    <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="group_name">${_('Group name')}:</label>
diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html
--- a/kallithea/templates/admin/repo_groups/repo_groups.html
+++ b/kallithea/templates/admin/repo_groups/repo_groups.html
@@ -16,7 +16,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
@@ -27,7 +26,6 @@
             %endif
         </ul>
     </div>
-    <!-- end box / title -->
     <div class="table">
         <table id="datatable_list_wrap"></table>
     </div>
diff --git a/kallithea/templates/admin/repos/repo_add.html b/kallithea/templates/admin/repos/repo_add.html
--- a/kallithea/templates/admin/repos/repo_add.html
+++ b/kallithea/templates/admin/repos/repo_add.html
@@ -25,7 +25,6 @@
 
 <%def name="main()">
     <div class="panel panel-primary">
-        <!-- box / title -->
         <div class="panel-heading clearfix">
             ${self.breadcrumbs()}
         </div>
diff --git a/kallithea/templates/admin/repos/repo_add_base.html b/kallithea/templates/admin/repos/repo_add_base.html
--- a/kallithea/templates/admin/repos/repo_add_base.html
+++ b/kallithea/templates/admin/repos/repo_add_base.html
@@ -2,7 +2,6 @@
 
 ${h.form(url('repos'))}
 <div class="form">
-    <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="repo_name">${_('Name')}:</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
@@ -18,7 +18,6 @@
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/admin/repos/repo_edit.html b/kallithea/templates/admin/repos/repo_edit.html
--- a/kallithea/templates/admin/repos/repo_edit.html
+++ b/kallithea/templates/admin/repos/repo_edit.html
@@ -19,23 +19,8 @@
 <%def name="main()">
 ${self.repo_context_bar('options')}
 <div class="panel panel-primary" style="overflow:auto">
-    <!--<div class="panel-heading">-->
-        <!--${self.breadcrumbs()}-->
-    <!--</div>-->
-
-    ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
-          <!--<li>-->
-           <!--<div class="gravatar_box" style="height: 26px">-->
-             <!--<div class="gravatar" style="float: left">-->
-                <!--<i class="icon-users" style="font-size: 26px"></i>-->
-             <!--</div>-->
-               <!--<div style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left">-->
-                <!--<strong>${'repo-info'}</strong>-->
-               <!--</div>-->
-           <!--</div>-->
-          <!--</li>-->
           <li class="${'active' if c.active=='settings' else ''}">
               <a href="${h.url('edit_repo', repo_name=c.repo_name)}">${_('Settings')}</a>
           </li>
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
@@ -26,7 +26,6 @@
     %endif
     ${h.form(url('create_repo_fields', repo_name=c.repo_name))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_field_key">${_('New field key')}:</label>
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">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Name')}:</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
@@ -18,14 +18,11 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     ${h.form(url('users_groups'))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="users_group_name">${_('Group name')}:</label>
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">
-        <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="users_group_name">${_('Group name')}:</label>
diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html
--- a/kallithea/templates/admin/user_groups/user_groups.html
+++ b/kallithea/templates/admin/user_groups/user_groups.html
@@ -15,7 +15,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
@@ -26,7 +25,6 @@
         %endif
         </ul>
     </div>
-    <!-- end box / title -->
     <div class="table">
         <table id="datatable_list_wrap"></table>
     </div>
diff --git a/kallithea/templates/admin/users/user_add.html b/kallithea/templates/admin/users/user_add.html
--- a/kallithea/templates/admin/users/user_add.html
+++ b/kallithea/templates/admin/users/user_add.html
@@ -18,14 +18,11 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     ${h.form(url('new_user'))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
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
@@ -54,7 +54,6 @@
 <div>
     ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('New API key')}</label>
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">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
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
@@ -35,7 +35,6 @@
 <div>
     ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html
--- a/kallithea/templates/admin/users/users.html
+++ b/kallithea/templates/admin/users/users.html
@@ -15,7 +15,6 @@
 
 <%def name="main()">
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
@@ -24,7 +23,6 @@
           </li>
         </ul>
     </div>
-    <!-- end box / title -->
     <div class="table">
         <table id="datatable_list_wrap"></table>
     </div>
diff --git a/kallithea/templates/base/default_perms_box.html b/kallithea/templates/base/default_perms_box.html
--- a/kallithea/templates/base/default_perms_box.html
+++ b/kallithea/templates/base/default_perms_box.html
@@ -7,7 +7,6 @@
 <%def name="default_perms_box(form_url)">
 ${h.form(form_url)}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label>
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
@@ -28,7 +28,6 @@
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </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
@@ -19,7 +19,6 @@
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.changeset.raw_id)}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
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
@@ -19,7 +19,6 @@
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
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
@@ -20,7 +20,6 @@
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/files/diff_2way.html b/kallithea/templates/files/diff_2way.html
--- a/kallithea/templates/files/diff_2way.html
+++ b/kallithea/templates/files/diff_2way.html
@@ -26,7 +26,6 @@
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/files/file_diff.html b/kallithea/templates/files/file_diff.html
--- a/kallithea/templates/files/file_diff.html
+++ b/kallithea/templates/files/file_diff.html
@@ -15,7 +15,6 @@
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/files/files.html b/kallithea/templates/files/files.html
--- a/kallithea/templates/files/files.html
+++ b/kallithea/templates/files/files.html
@@ -21,7 +21,6 @@
 <%def name="main()">
 ${self.repo_context_bar('files', c.revision)}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
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
@@ -24,7 +24,6 @@
 <%def name="main()">
 ${self.repo_context_bar('files')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
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
@@ -15,7 +15,6 @@
 <%def name="main()">
 ${self.repo_context_bar('files')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html
--- a/kallithea/templates/files/files_edit.html
+++ b/kallithea/templates/files/files_edit.html
@@ -24,7 +24,6 @@
 <%def name="main()">
 ${self.repo_context_bar('files')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
diff --git a/kallithea/templates/followers/followers.html b/kallithea/templates/followers/followers.html
--- a/kallithea/templates/followers/followers.html
+++ b/kallithea/templates/followers/followers.html
@@ -16,11 +16,9 @@
 <%def name="main()">
 ${self.repo_context_bar('followers')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     <div class="table">
         <div id="followers">
             <%include file='followers_data.html'/>
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
@@ -16,10 +16,8 @@
 <%def name="main()">
 ${self.repo_context_bar('createfork')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
     <div class="form">
-        <!-- fields -->
         <div class="form-horizontal">
 
             <div class="form-group">
diff --git a/kallithea/templates/forks/forks.html b/kallithea/templates/forks/forks.html
--- a/kallithea/templates/forks/forks.html
+++ b/kallithea/templates/forks/forks.html
@@ -16,11 +16,9 @@
 <%def name="main()">
 ${self.repo_context_bar('showforks')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     <div class="table">
         <div id="forks">
             <%include file='forks_data.html'/>
diff --git a/kallithea/templates/index_base.html b/kallithea/templates/index_base.html
--- a/kallithea/templates/index_base.html
+++ b/kallithea/templates/index_base.html
@@ -1,6 +1,5 @@
 <%page args="parent,group_name=''" />
     <div class="panel panel-primary">
-        <!-- box / title -->
         <div class="panel-heading clearfix">
             <div class="breadcrumbs">
                 %if c.group is not None:
@@ -42,7 +41,6 @@
               </ul>
             %endif
         </div>
-        <!-- end box / title -->
         %if c.groups:
         <div class="table">
             <div id='groups_list_wrap'>
diff --git a/kallithea/templates/journal/journal.html b/kallithea/templates/journal/journal.html
--- a/kallithea/templates/journal/journal.html
+++ b/kallithea/templates/journal/journal.html
@@ -21,7 +21,6 @@
 
 <%def name="main()">
     <div class="panel panel-primary">
-        <!-- box / title -->
         <div class="panel-heading clearfix">
          ${self.breadcrumbs()}
          <ul class="links icon-only-links">
diff --git a/kallithea/templates/journal/public_journal.html b/kallithea/templates/journal/public_journal.html
--- a/kallithea/templates/journal/public_journal.html
+++ b/kallithea/templates/journal/public_journal.html
@@ -16,7 +16,6 @@
 <%def name="main()">
 
 <div class="panel panel-primary">
-  <!-- box / title -->
   <div class="panel-heading clearfix">
     <h5>${_('Public Journal')}</h5>
     <ul class="links icon-only-links">
diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html
--- a/kallithea/templates/login.html
+++ b/kallithea/templates/login.html
@@ -7,7 +7,6 @@
 
 <div id="login" class="panel panel-default">
     <%include file="/base/flash_msg.html"/>
-    <!-- login -->
     <div class="panel-heading title withlogo">
         %if c.site_name:
             <h5>${_('Log In to %s') % c.site_name}</h5>
@@ -19,7 +18,6 @@
         ${h.form(url('login_home', came_from=c.came_from))}
         <div class="form">
             <i class="icon-lock"></i>
-            <!-- fields -->
 
             <div class="form-horizontal">
                 <div class="form-group">
@@ -27,14 +25,12 @@
                     <div class="col-sm-7">
                         ${h.text('username',class_='form-control')}
                     </div>
-
                 </div>
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="password">${_('Password')}:</label>
                     <div class="col-sm-7">
                         ${h.password('password',class_='form-control')}
                     </div>
-
                 </div>
                 <div class="form-group">
                     <div class="col-sm-offset-5 col-sm-7">
@@ -47,8 +43,7 @@
                     </div>
                 </div>
             </div>
-            <!-- end fields -->
-            <!-- links -->
+
             <div class="links">
                 ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
                 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
@@ -59,8 +54,6 @@
                     ${h.submit('sign_in',_('Sign In'),class_="btn btn-default")}
                 </span>
             </div>
-
-            <!-- end links -->
         </div>
         ${h.end_form()}
         <script type="text/javascript">
@@ -69,5 +62,4 @@
         });
         </script>
     </div>
-    <!-- end login -->
 </div>
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,7 +17,6 @@
     <div class="inner">
         ${h.form(url('password_reset'))}
         <div class="form">
-            <!-- fields -->
             <div class="form-horizontal">
 
                 <div class="form-group">
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
@@ -23,7 +23,6 @@
             ${h.hidden('timestamp')}
         </div>
         <div class="form">
-            <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="token">${_('Code you received in the email')}:</label>
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
@@ -15,14 +15,12 @@
 <%def name="main()">
 ${self.repo_context_bar('showpullrequest')}
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
 
     ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
     <div class="form">
-        <!-- fields -->
 
         <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;">
 
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
@@ -18,7 +18,6 @@
 <% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.owner_id == c.authuser.user_id) %>
 ${self.repo_context_bar('showpullrequest')}
 <div class="panel panel-primary">
-  <!-- box / title -->
   <div class="panel-heading">
     ${self.breadcrumbs()}
   </div>
diff --git a/kallithea/templates/pullrequests/pullrequest_show_all.html b/kallithea/templates/pullrequests/pullrequest_show_all.html
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html
+++ b/kallithea/templates/pullrequests/pullrequest_show_all.html
@@ -22,7 +22,6 @@
 ${self.repo_context_bar('showpullrequest')}
 
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
         <ul class="links">
diff --git a/kallithea/templates/pullrequests/pullrequest_show_my.html b/kallithea/templates/pullrequests/pullrequest_show_my.html
--- a/kallithea/templates/pullrequests/pullrequest_show_my.html
+++ b/kallithea/templates/pullrequests/pullrequest_show_my.html
@@ -17,7 +17,6 @@
 <%def name="main()">
 
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -17,7 +17,6 @@
     <div class="inner">
         ${h.form(url('register'))}
         <div class="form">
-            <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="username">${_('Username')}:</label>
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
@@ -33,11 +33,9 @@
 ${self.repo_context_bar('options')}
 %endif
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     %if c.repo_name:
         ${h.form(h.url('search_repo',repo_name=c.repo_name),method='get')}
     %else:
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
@@ -23,7 +23,6 @@ ${self.repo_context_bar('summary')}
     summary = lambda n:{False:'summary-short'}.get(n)
     %>
     <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${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
@@ -60,11 +60,9 @@ ${self.repo_context_bar('summary')}
 summary = lambda n:{False:'summary-short'}.get(n)
 %>
 <div class="panel panel-primary">
-    <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
-    <!-- end box / title -->
     <div class="form">
         <div id="summary" class="form-horizontal">
             <div class="form-group form-inline clearfix">