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
@@ -29,18 +29,21 @@
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label>
-            <div>${h.text("auth_plugins", class_='form-control')}
-            <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>
+            <div>
+                ${h.text("auth_plugins", class_='form-control')}
+                <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label>${_('Available built-in plugins')}</label>
+            <div>
+                <ul class="list-group">
                 %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 ''}">
+                    <li class="list-group-item">
+                        <span plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}">
                             ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}
                         </span>
                         ${plugin_path}
-                      </div>
                     </li>
                 %endfor
                 </ul>
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
@@ -52,8 +52,10 @@
                           id="description" name="description"
                           placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea>
                 <div style="padding:0px 0px 0px 42px">
-                    <label for='lifetime'>${_('Gist lifetime')}</label>
-                    ${h.select('lifetime', '0', c.lifetime_options)}
+                    <label>
+                        ${_('Gist lifetime')}
+                        ${h.select('lifetime', '0', c.lifetime_options)}
+                    </label>
                     <span class="text-muted">
                      %if c.gist.gist_expires == -1:
                       ${_('Expires')}: ${_('Never')}
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
@@ -36,8 +36,10 @@
                 ${h.gravatar_div(c.authuser.email, size=32)}
                 <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>
                 <div style="padding:0px 0px 0px 42px">
-                <label for='lifetime'>${_('Gist lifetime')}</label>
-                ${h.select('lifetime', '', c.lifetime_options)}
+                    <label>
+                        ${_('Gist lifetime')}
+                        ${h.select('lifetime', '', c.lifetime_options)}
+                    </label>
                 </div>
             </div>
             <div id="body" class="codeblock">
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
@@ -15,11 +15,12 @@ ${h.form(url('admin_permissions'), metho
                 <label class="control-label" for="default_repo_perm">${_('Repository')}:</label>
                 <div class="form-inline">
                     ${h.select('default_repo_perm','',c.repo_perms_choices,class_='form-control')}
-                    ${h.checkbox('overwrite_default_repo','true')}
-                    <label for="overwrite_default_repo">
-                    <span data-toggle="tooltip"
-                        title="${_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost')}">
-                    ${_('Apply to all existing repositories')}</span> </label>
+                    <label>
+                        ${h.checkbox('overwrite_default_repo','true')}
+                        <span data-toggle="tooltip" title="${_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost')}">
+                            ${_('Apply to all existing repositories')}
+                        </span>
+                    </label>
                     <span class="help-block">${_('Permissions for the Default user on new repositories.')}</span>
                 </div>
             </div>
@@ -27,11 +28,12 @@ ${h.form(url('admin_permissions'), metho
                 <label class="control-label" for="default_group_perm">${_('Repository group')}:</label>
                 <div class="form-inline">
                     ${h.select('default_group_perm','',c.group_perms_choices,class_='form-control')}
-                    ${h.checkbox('overwrite_default_group','true')}
-                    <label for="overwrite_default_group">
-                    <span data-toggle="tooltip"
-                        title="${_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost')}">
-                    ${_('Apply to all existing repository groups')}</span> </label>
+                    <label>
+                        ${h.checkbox('overwrite_default_group','true')}
+                        <span data-toggle="tooltip" title="${_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost')}">
+                            ${_('Apply to all existing repository groups')}
+                        </span>
+                    </label>
                     <span class="help-block">${_('Permissions for the Default user on new repository groups.')}</span>
                 </div>
             </div>
@@ -39,11 +41,12 @@ ${h.form(url('admin_permissions'), metho
                 <label class="control-label" for="default_user_group_perm">${_('User group')}:</label>
                 <div class="form-inline">
                     ${h.select('default_user_group_perm','',c.user_group_perms_choices,class_='form-control')}
-                    ${h.checkbox('overwrite_default_user_group','true')}
-                    <label for="overwrite_default_user_group">
-                    <span data-toggle="tooltip"
-                        title="${_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost')}">
-                    ${_('Apply to all existing user groups')}</span></label>
+                    <label>
+                        ${h.checkbox('overwrite_default_user_group','true')}
+                        <span data-toggle="tooltip" title="${_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost')}">
+                            ${_('Apply to all existing user groups')}
+                        </span>
+                    </label>
                     <span class="help-block">${_('Permissions for the Default user on new user groups.')}</span>
                 </div>
             </div>
diff --git a/kallithea/templates/admin/repos/repo_edit_advanced.html b/kallithea/templates/admin/repos/repo_edit_advanced.html
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html
+++ b/kallithea/templates/admin/repos/repo_edit_advanced.html
@@ -82,8 +82,14 @@ ${h.form(url('delete_repo', repo_name=c.
     </button>
     %if c.repo_info.forks.count():
         ${ungettext('This repository has %s fork', 'This repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}
-        <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
-        <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label>
+        <label>
+            <input type="radio" name="forks" value="detach_forks" checked="checked"/>
+            ${_('Detach forks')}
+        </label>
+        <label>
+            <input type="radio" name="forks" value="delete_forks" />
+            ${_('Delete forks')}
+        </label>
     %endif
     <div class="text-muted" style="border:none">
         <ul>
diff --git a/kallithea/templates/admin/settings/settings_mapping.html b/kallithea/templates/admin/settings/settings_mapping.html
--- a/kallithea/templates/admin/settings/settings_mapping.html
+++ b/kallithea/templates/admin/settings/settings_mapping.html
@@ -5,25 +5,33 @@ ${h.form(url('admin_settings_mapping'), 
                 <label class="control-label" for="destroy">${_('Rescan options')}:</label>
                 <div>
                     <div class="checkbox">
-                        ${h.checkbox('destroy',True)}
-                        <label for="destroy">${_('Delete records of missing repositories')}</label>
+                        <label>
+                            ${h.checkbox('destroy',True)}
+                            ${_('Delete records of missing repositories')}
+                        </label>
                     </div>
                     <span class="help-block">${_('Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem.')}</span>
 
                     <div class="checkbox">
-                        ${h.checkbox('invalidate',True)}
-                        <label for="invalidate"> ${_('Invalidate cache for all repositories')}</label>
+                        <label>
+                            ${h.checkbox('invalidate',True)}
+                            ${_('Invalidate cache for all repositories')}
+                        </label>
                     </div>
                     <span class="help-block">${_('Check this to reload data and clear cache keys for all repositories.')}</span>
 
                     <div class="checkbox">
-                        ${h.checkbox('hooks',True)}
-                        <label for="hooks"> ${_('Install Git hooks')} </label>
+                        <label>
+                            ${h.checkbox('hooks',True)}
+                            ${_('Install Git hooks')}
+                        </label>
                     </div>
                     <span class="help-block">${_("Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version.")}</span>
                     <div class="checkbox">
-                        ${h.checkbox('hooks_overwrite', True)}
-                        <label for="hooks_overwrite"> ${_('Overwrite existing Git hooks')}</label>
+                        <label>
+                            ${h.checkbox('hooks_overwrite', True)}
+                            ${_('Overwrite existing Git hooks')}
+                        </label>
                     </div>
                     <span class="help-block">${_("If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!")}</span>
                 </div>
diff --git a/kallithea/templates/admin/settings/settings_search.html b/kallithea/templates/admin/settings/settings_search.html
--- a/kallithea/templates/admin/settings/settings_search.html
+++ b/kallithea/templates/admin/settings/settings_search.html
@@ -6,11 +6,12 @@ ${h.form(url('admin_settings_search'), m
                 <label class="control-label">${_('Index build option')}:</label>
                 <div>
                     <div class="checkbox">
-                        ${h.checkbox('full_index',True)}
-                        <label for="full_index">${_('Build from scratch')}</label>
+                        <label>
+                            ${h.checkbox('full_index',True)}
+                            ${_('Build from scratch')}
+                        </label>
                     </div>
                     <span class="help-block">${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')}</span>
-
                 </div>
             </div>
 
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
@@ -5,20 +5,28 @@ ${h.form(url('admin_settings'), method='
                 <label>${_('Hooks')}:</label>
                 <div>
                     <div class="checkbox">
-                        ${h.checkbox('hooks_changegroup_repo_size','True')}
-                        <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label>
+                        <label>
+                            ${h.checkbox('hooks_changegroup_repo_size','True')}
+                            ${_('Show repository size after push')}
+                        </label>
                     </div>
                     <div class="checkbox">
-                        ${h.checkbox('hooks_changegroup_push_logger','True')}
-                        <label for="hooks_changegroup_push_logger">${_('Log user push commands')}</label>
+                        <label>
+                            ${h.checkbox('hooks_changegroup_push_logger','True')}
+                            ${_('Log user push commands')}
+                        </label>
                     </div>
                     <div class="checkbox">
-                        ${h.checkbox('hooks_outgoing_pull_logger','True')}
-                        <label for="hooks_outgoing_pull_logger">${_('Log user pull commands')}</label>
+                        <label>
+                            ${h.checkbox('hooks_outgoing_pull_logger','True')}
+                            ${_('Log user pull commands')}
+                        </label>
                     </div>
                     <div class="checkbox">
-                        ${h.checkbox('hooks_changegroup_update','True')}
-                        <label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label>
+                        <label>
+                            ${h.checkbox('hooks_changegroup_update','True')}
+                            ${_('Update repository after push (hg update)')}
+                        </label>
                     </div>
                 </div>
             </div>
@@ -26,17 +34,23 @@ ${h.form(url('admin_settings'), method='
                 <label>${_('Mercurial extensions')}:</label>
                 <div>
                     <div class="checkbox">
-                        ${h.checkbox('extensions_largefiles','True')}
-                        <label for="extensions_largefiles">${_('Enable largefiles extension')}</label>
+                        <label>
+                            ${h.checkbox('extensions_largefiles','True')}
+                            ${_('Enable largefiles extension')}
+                        </label>
                     </div>
                     <div class="checkbox">
-                        ${h.checkbox('extensions_hgsubversion','True')}
-                        <label for="extensions_hgsubversion">${_('Enable hgsubversion extension')}</label>
+                        <label>
+                            ${h.checkbox('extensions_hgsubversion','True')}
+                            ${_('Enable hgsubversion extension')}
+                        </label>
                     </div>
                     <span class="help-block">${_('Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial.')}</span>
                     ##<div class="checkbox">
-                    ##    ${h.checkbox('extensions_hggit','True')}
-                    ##    <label for="extensions_hggit">${_('Enable hg-git extension')}</label>
+                    ##    <label>
+                    ##        ${h.checkbox('extensions_hggit','True')}
+                    ##        ${_('Enable hg-git extension')}
+                    ##    </label>
                     ##</div>
                     ##<span class="help-block">${_('Requires hg-git library to be installed. Enables cloning of remote Git repositories while converting them to Mercurial.')}</span>
                 </div>
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
@@ -7,23 +7,28 @@ ${h.form(url('admin_settings_visual'), m
                 <label>${_('General')}:</label>
                 <div>
                     <div class="checkbox">
-                        ${h.checkbox('repository_fields','True')}
-                        <label for="repository_fields">${_('Use repository extra fields')}</label>
+                        <label>
+                            ${h.checkbox('repository_fields','True')}
+                            ${_('Use repository extra fields')}
+                        </label>
+                        <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
                     </div>
-                    <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
 
                     <div class="checkbox">
-                        ${h.checkbox('show_version','True')}
-                        <label for="show_version">${_('Show Kallithea version')}</label>
+                        <label>
+                            ${h.checkbox('show_version','True')}
+                            ${_('Show Kallithea version')}
+                        </label>
                     </div>
                     <span class="help-block">${_('Shows or hides a version number of Kallithea displayed in the footer.')}</span>
 
                     <div class="checkbox">
-                        ${h.checkbox('use_gravatar','True')}
-                        <label for="use_gravatar">${_('Use Gravatars in Kallithea')}</label>
+                        <label>
+                            ${h.checkbox('use_gravatar','True')}
+                            ${_('Use Gravatars in Kallithea')}
+                        </label>
                     </div>
-                </div>
-                <div>
+                    <div>
                         ${h.text('gravatar_url', size=80, class_='form-control')}
                         <span class="help-block">${_('''Gravatar URL allows you to use another avatar server application.
                                                         The following variables of the URL will be replaced accordingly.
@@ -32,6 +37,7 @@ ${h.form(url('admin_settings_visual'), m
                                                         {md5email}  md5 hash of the user email (like at gravatar.com),
                                                         {size}      size of the image that is expected from the server application,
                                                         {netloc}    network location/server host of running Kallithea server''')}</span>
+                    </div>
                 </div>
             </div>
 
@@ -69,12 +75,16 @@ ${h.form(url('admin_settings_visual'), m
                 <label>${_('Icons')}:</label>
                 <div>
                     <div class="checkbox">
-                        ${h.checkbox('show_public_icon','True')}
-                        <label for="show_public_icon">${_('Show public repository icon on repositories')}</label>
+                        <label>
+                            ${h.checkbox('show_public_icon','True')}
+                            ${_('Show public repository icon on repositories')}
+                        </label>
                     </div>
                     <div class="checkbox">
-                        ${h.checkbox('show_private_icon','True')}
-                        <label for="show_private_icon">${_('Show private repository icon on repositories')}</label>
+                        <label>
+                            ${h.checkbox('show_private_icon','True')}
+                            ${_('Show private repository icon on repositories')}
+                        </label>
                     </div>
                     <span class="help-block">${_('Show public/private icons next to repository names.')}</span>
                  </div>
@@ -85,9 +95,9 @@ ${h.form(url('admin_settings_visual'), m
                 <div>
                     <div class="checkbox">
                         ${h.checkbox('stylify_metatags','True')}
-                        <label for="stylify_metatags">${_('Stylify recognised meta tags:')}</label>
                     </div>
-                    <div style="padding-left: 20px;">
+                    <div>
+                        ${_('Stylify recognised meta tags:')}
                         <ul> <!-- Fix style here -->
                             <li>[featured] <span class="metatag" tag="featured">featured</span></li>
                             <li>[stale] <span class="metatag" tag="stale">stale</span></li>
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
@@ -372,14 +372,17 @@
             <div class="form">
                 <div class="fields">
                     <div>
-                        <label for="username">${_('Username')}:</label>
+                        <div>
+                            <label for="username">${_('Username')}:</label>
+                        </div>
                         <div>
                             ${h.text('username',class_='form-control')}
                         </div>
-
                     </div>
                     <div>
-                        <label for="password">${_('Password')}:</label>
+                        <div>
+                            <label for="password">${_('Password')}:</label>
+                        </div>
                         <div>
                             ${h.password('password',class_='form-control')}
                         </div>
diff --git a/kallithea/templates/base/perms_summary.html b/kallithea/templates/base/perms_summary.html
--- a/kallithea/templates/base/perms_summary.html
+++ b/kallithea/templates/base/perms_summary.html
@@ -11,10 +11,10 @@
             %if section != 'global':
                 <div style="float: right">
                 ${_('Show')}:
-                ${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='none')} <label for="${'perms_filter_none_%s' % section}"><span class="perm_tag none">${_('None')}</span></label>
-                ${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='read')} <label for="${'perms_filter_read_%s' % section}"><span class="perm_tag read">${_('Read')}</span></label>
-                ${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='write')} <label for="${'perms_filter_write_%s' % section}"> <span class="perm_tag write">${_('Write')}</span></label>
-                ${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='admin')} <label for="${'perms_filter_admin_%s' % section}"><span class="perm_tag admin">${_('Admin')}</span></label>
+                <label>${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='none')}<span class="perm_tag none">${_('None')}</span></label>
+                <label>${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='read')}<span class="perm_tag read">${_('Read')}</span></label>
+                <label>${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='write')}<span class="perm_tag write">${_('Write')}</span></label>
+                <label>${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='admin')}<span class="perm_tag admin">${_('Admin')}</span></label>
                 </div>
             %endif
         </div>
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
@@ -50,8 +50,10 @@ ${self.repo_context_bar('files')}
           </h3>
             <div id="body" class="codeblock">
             <div class="code-header" id="mimetype_header">
-                <label class="commit" for="mimetype">${_('New file type')}</label>
-                <select class="form-control" id="mimetype" name="mimetype"/>
+                <label class="commit">
+                    ${_('New file type')}
+                    <select class="form-control" id="mimetype" name="mimetype"/>
+                </label>
             </div>
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
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,8 +37,10 @@
             ${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>
+            <label>
+                ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
+                ${_('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>
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
@@ -55,8 +55,10 @@ ${self.repo_context_bar('files')}
                       % endif
                     </div>
                 </div>
-                <label class="commit" for="mimetype">${_('Editing file')}: ${c.file.unicode_path}</label>
-                <select class="form-control" id="mimetype" name="mimetype"/>
+                <label class="commit">
+                    ${_('Editing file')}: ${c.file.unicode_path}
+                    <select class="form-control" id="mimetype" name="mimetype"/>
+                </label>
             </div>
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html
--- a/kallithea/templates/login.html
+++ b/kallithea/templates/login.html
@@ -39,7 +39,7 @@
                 <div class="form-group">
                     <div class="col-sm-offset-5 col-sm-7">
                         <div class="checkbox">
-                            <label for="remember">
+                            <label>
                                 <input type="checkbox" id="remember" name="remember"/>
                                 ${_('Stay logged in after browser restart')}
                             </label>
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
@@ -209,8 +209,8 @@ function SummaryPlot(from,to,dataset,ove
             i++;
             if(data[pos].label != ''){
                 choiceContainerTable.innerHTML +=
-                    '<tr><td><input type="checkbox" id="id_user_{0}" name="{0}" checked="checked" /> \
-                     <label for="id_user_{0}">{0}</label></td></tr>'.format(data[pos].label);
+                    '<tr><td><label><input type="checkbox" id="id_user_{0}" name="{0}" checked="checked" /> \
+                     {0}</label></td></tr>'.format(data[pos].label);
             }
         }
     }
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
@@ -113,8 +113,10 @@ summary = lambda n:{False:'summary-short
                     </span>
                     ${h.hidden('download_options')}
                     <span style="vertical-align: bottom">
-                      <input id="archive_subrepos" type="checkbox" name="subrepos" />
-                      <label for="archive_subrepos" data-toggle="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('With subrepos')}</label>
+                      <label data-toggle="tooltip" title="${_('Check this to download archive with subrepos')}">
+                          <input id="archive_subrepos" type="checkbox" name="subrepos" />
+                          ${_('With subrepos')}
+                      </label>
                     </span>
                 %endif
               </div>