diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html
--- a/kallithea/templates/about.html
+++ b/kallithea/templates/about.html
@@ -24,7 +24,7 @@
   v 3.0 (GPLv3)</a>.</p>
 
   <p>Kallithea is copyrighted by various authors, including but not
-  necessarily limited to the following:
+  necessarily limited to the following:</p>
   <ul style="margin: 0 0 0 50px;">
 
   <li>Copyright &copy; 2012&ndash;2016, Mads Kiilerich</li>
@@ -144,7 +144,7 @@
 ## Stefan Engel <mail@engel-stefan.de> in 2012
 ## Ton Plomp <tcplomp@gmail.com> in 2013
 ##
-  </ul></p>
+  </ul>
 
   <p>The above are the copyright holders who have submitted direct
   contributions to the Kallithea repository.  In
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
@@ -2,11 +2,12 @@
     %if c.repo_fields:
     <div class="emails_wrap">
       <table class="table">
-        <th>${_('Label')}</th>
-        <th>${_('Key')}</th>
-        <th>${_('Type')}</th>
-        <th>${_('Action')}</th>
-
+        <tr>
+          <th>${_('Label')}</th>
+          <th>${_('Key')}</th>
+          <th>${_('Type')}</th>
+          <th>${_('Action')}</th>
+        </tr>
       %for field in c.repo_fields:
         <tr>
             <td>${field.field_label}</td>
diff --git a/kallithea/templates/admin/repos/repo_edit_remote.html b/kallithea/templates/admin/repos/repo_edit_remote.html
--- a/kallithea/templates/admin/repos/repo_edit_remote.html
+++ b/kallithea/templates/admin/repos/repo_edit_remote.html
@@ -1,6 +1,6 @@
 %if c.repo_info.clone_uri:
 <h4>
-   ${_('Remote repository URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a></li>
+   ${_('Remote repository URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a>
 </h4>
 ${h.form(url('edit_repo_remote_update', repo_name=c.repo_name))}
 <div class="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
@@ -62,7 +62,7 @@ ${h.form(url('admin_settings'), method='
                     ${h.text('paths_root_path',size=60,readonly="readonly",class_='form-control')}
                     <span id="path_unlock" data-toggle="tooltip" style="cursor: pointer"
                             title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}">
-                        <div class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></div>
+                        <span class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></span>
                     </span>
                     <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span>
                 </div>
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
@@ -26,7 +26,7 @@
 
           %if co.author_id == c.authuser.user_id or h.HasRepoPermissionAny('repository.admin')(c.repo_name):
             %if co.deletable():
-              <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div>
+              <div onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div>
             %endif
           %endif
       </div>
diff --git a/kallithea/templates/changeset/diff_block.html b/kallithea/templates/changeset/diff_block.html
--- a/kallithea/templates/changeset/diff_block.html
+++ b/kallithea/templates/changeset/diff_block.html
@@ -29,32 +29,32 @@
                 <div class="diff-actions">
                   <span style="margin: 0 10px">
                     %if op == 'A':
-                      <span class="no-file" data-toggle="tooltip" title="${_("No file before")}">
+                      <span class="no-file" data-toggle="tooltip" title="${_('No file before')}">
                         <i class="icon-minus-circled"></i></span>
                     %else:
-                      <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_("File before")}">
+                      <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_('File before')}">
                         <i class="icon-doc"></i></a>
                     %endif
 
                     %if op == 'A':
-                      <span class="arrow" data-toggle="tooltip" title="${_("Added")}">&#10142;</span>
+                      <span class="arrow" data-toggle="tooltip" title="${_('Added')}">&#10142;</span>
                     %elif op == 'M':
-                      <span class="arrow" data-toggle="tooltip" title="${_("Modified")}">&#10142;</span>
+                      <span class="arrow" data-toggle="tooltip" title="${_('Modified')}">&#10142;</span>
                     %elif op == 'D':
-                      <span class="arrow" data-toggle="tooltip" title="${_("Deleted")}">&#10142;</span>
+                      <span class="arrow" data-toggle="tooltip" title="${_('Deleted')}">&#10142;</span>
                     %elif op == 'R':
-                      <span class="arrow" data-toggle="tooltip" title="${_("Renamed")}">&#10142;</span>
+                      <span class="arrow" data-toggle="tooltip" title="${_('Renamed')}">&#10142;</span>
                     %elif op is None:
-                      <span class="arrow" data-toggle="tooltip" title="${_("No change")}">&#10142;</span>
+                      <span class="arrow" data-toggle="tooltip" title="${_('No change')}">&#10142;</span>
                     %else:
-                      <span class="arrow" data-toggle="tooltip" title="${_("Unknown operation: %r") % op}">&#10142;</span>
+                      <span class="arrow" data-toggle="tooltip" title="${_('Unknown operation: %r') % op}">&#10142;</span>
                     %endif
 
                     %if op == 'D':
-                      <span class="no-file" data-toggle="tooltip" title="${_("No file after")}">
+                      <span class="no-file" data-toggle="tooltip" title="${_('No file after')}">
                         <i class="icon-minus-circled"></i></span>
                     %else:
-                      <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" data-toggle="tooltip" title="${_("File after")}">
+                      <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" data-toggle="tooltip" title="${_('File after')}">
                         <i class="icon-doc"></i></a>
                     %endif
                   </span>
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
@@ -44,7 +44,7 @@ ${self.repo_context_bar('files')}
               </span>
               <span id="upload_file_container" class="reviewer_ac" style="display:none">
                   <input class="form-control" type="file" size="20" name="upload_file" id="upload_file">
-                  ${_('or')} <div class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</div>
+                  ${_('or')} <span class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</span>
               </span>
           </h3>
             <div id="body" class="codeblock">
diff --git a/kallithea/templates/pullrequests/pullrequest_data.html b/kallithea/templates/pullrequests/pullrequest_data.html
--- a/kallithea/templates/pullrequests/pullrequest_data.html
+++ b/kallithea/templates/pullrequests/pullrequest_data.html
@@ -25,9 +25,9 @@
       <td width="80px">
         <% status = pr.user_review_status(c.authuser.user_id) %>
         %if status:
-          <i class="icon-circle changeset-status-${status}" title="${_("You voted: %s") % h.changeset_status_lbl(status)}"></i>
+          <i class="icon-circle changeset-status-${status}" title="${_('You voted: %s') % h.changeset_status_lbl(status)}"></i>
         %else:
-          <i class="icon-circle changeset-status-not_reviewed" title="${_("You didn't vote")}"></i>
+          <i class="icon-circle changeset-status-not_reviewed" title="${_('You didn\'t vote')}"></i>
         %endif
       </td>
       <td>
diff --git a/kallithea/templates/search/search_commit.html b/kallithea/templates/search/search_commit.html
--- a/kallithea/templates/search/search_commit.html
+++ b/kallithea/templates/search/search_commit.html
@@ -13,7 +13,7 @@
                 <div class="author">
                     ${h.gravatar_div(h.email_or_none(sr['author']), size=20)}
                     <span>${h.person(sr['author'])}</span><br/>
-                    <span>${h.email_or_none(sr['author'])}</a></span><br/>
+                    <span>${h.email_or_none(sr['author'])}</span><br/>
                 </div>
                 %if sr['message_hl']:
                 <div class="search-code-body">