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
@@ -11,7 +11,10 @@ ${h.form(url('repos'))}
             <div class="input">
                 ${h.text('repo_name',class_="small")}
                 <div style="margin: 6px 0px 0px 0px">
-                    <a id="remote_clone_toggle" href="#"><i class="icon-download-cloud"></i> ${_('Import existing repository ?')}</a>
+                    <a id="remote_clone_toggle" href="#">
+                        <i class="icon-download-cloud"></i>
+                        ${_('Import existing repository ?')}
+                    </a>
                 </div>
                 %if not c.authuser.is_admin:
                     ${h.hidden('user_created',True)}
@@ -24,7 +27,9 @@ ${h.form(url('repos'))}
             </div>
             <div class="input">
                 ${h.text('clone_uri',class_="small")}
-                <span class="help-block">${_('Optional URL from which repository should be cloned.')}</span>
+                <span class="help-block">
+                    ${_('Optional URL from which repository should be cloned.')}
+                </span>
             </div>
         </div>
         <div class="field">
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
@@ -4,9 +4,12 @@
 </div>
 ${h.form(url('edit_repo_remote', repo_name=c.repo_name), method='put')}
 <div class="form">
-   <div class="fields">
-       ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull Changes from Remote Location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side.')+"');")}
-   </div>
+    <div class="fields">
+        ${h.submit('remote_pull_%s' % c.repo_info.repo_name,
+            _('Pull Changes from Remote Location'),
+            class_="btn btn-small",
+            onclick="return confirm('"+_('Confirm to pull changes from remote side.')+"');")}
+    </div>
 </div>
 ${h.end_form()}
 %else:
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
@@ -15,13 +15,13 @@ ${h.form(url('repo', repo_name=c.repo_in
                                Using the above permanent URL guarantees that this repository always will be accessible on that URL.
                                This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')}</span>
                 </div>
-           </div>
-           <div class="field">
-               <div class="label">
-                   <label for="clone_uri">${_('Clone URL')}:</label>
-               </div>
-               <div class="input">
-                   %if c.repo_info.clone_uri:
+            </div>
+            <div class="field">
+                <div class="label">
+                    <label for="clone_uri">${_('Clone URL')}:</label>
+                </div>
+                <div class="input">
+                  %if c.repo_info.clone_uri:
                     <div id="clone_uri_hidden" style="font-size: 14px">
                         <span id="clone_uri_hidden_value">${c.repo_info.clone_uri_hidden}</span>
                         <span style="cursor: pointer; padding: 0px 0px 5px 0px" id="edit_clone_uri"><i class="icon-edit"></i>${_('Edit')}</span>
@@ -29,13 +29,15 @@ ${h.form(url('repo', repo_name=c.repo_in
                     <div id="alter_clone_uri" style="display: none">
                         ${h.text('clone_uri',class_="medium",  placeholder=_('new value'))}
                     </div>
-                   %else:
+                  %else:
                     ## not set yet, display form to set it
                     ${h.text('clone_uri',class_="medium")}
                     ${h.hidden('clone_uri_change', 'NEW')}
-                   %endif
-                 <span id="alter_clone_uri_help_block" class="help-block">${_('URL used for doing remote pulls.')}</span>
-               </div>
+                  %endif
+                  <span id="alter_clone_uri_help_block" class="help-block">
+                      ${_('URL used for doing remote pulls.')}
+                  </span>
+                </div>
             </div>
             <div class="field">
                 <div class="label">