diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index acf860b..437154e 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -73,33 +73,66 @@
     </header>
     <ul class="nav nav-tabs nav-small">
       <li class="nav-item">
-        <a {% if select == 'overview' %}class="nav-link active" {% else %}class="nav-link"{% endif %} href="{{ url_for('view_repo',username=username, repo=repo.name) }}"><span class="oi hidden-md-up" data-glyph="home"></span><span class="hidden-sm-down">Overview</span></a>
+        <a {%
+          if select == 'overview' %}class="nav-link active" {%
+          else %}class="nav-link" {%
+          endif %}href="{{ url_for('view_repo',username=username, repo=repo.name) }}">
+            <span class="oi hidden-md-up" data-glyph="home"></span>
+            <span class="hidden-sm-down">Overview</span>
+        </a>
       </li>
         {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %}
         <li class="nav-item" >
-          <a  {% if select == 'docs' %}class="active nav-link"  {% else %}class="nav-link"{% endif %} href="{{ url_for('.view_docs', username=username, repo=repo.name) }}"><span class="oi hidden-md-up" data-glyph="book"></span><span class="hidden-sm-down">Docs</span></a>
+          <a  {%
+            if select == 'docs' %}class="active nav-link" {%
+            else %}class="nav-link" {%
+            endif %}href="{{ url_for('.view_docs', username=username, repo=repo.name) }}">
+              <span class="oi hidden-md-up" data-glyph="book"></span>
+              <span class="hidden-sm-down">Docs</span>
+          </a>
         </li>
         {% endif %}
 
         <li class="nav-item">
-          <a {% if select == 'logs' %}class="active nav-link"  {% else %}class="nav-link"{% endif %} href="{{ url_for('.view_commits', username=username,
-                     repo=repo.name, branchname=branchname) }}"><span class="oi hidden-md-up" data-glyph="spreadsheet"></span><span class="hidden-sm-down">Commits</span></a>
+          <a {%
+            if select == 'logs' %}class="active nav-link" {%
+            else %}class="nav-link" {%
+            endif %}href="{{ url_for('.view_commits', username=username,
+                     repo=repo.name, branchname=branchname) }}">
+              <span class="oi hidden-md-up" data-glyph="spreadsheet">
+              </span><span class="hidden-sm-down">Commits</span>
+            </a>
         </li>
 
         <li class="nav-item">
-          <a {% if select == 'tree' %}class="active nav-link"  {% else %}class="nav-link"{% endif %} href="{{ url_for('.view_tree', username=username,
-                     repo=repo.name, identifier=branchname) }}"><span class="oi hidden-md-up" data-glyph="file"></span><span class="hidden-sm-down">Files</span></a>
+          <a {%
+            if select == 'tree' %}class="active nav-link" {%
+            else %}class="nav-link"{%
+            endif %} href="{{ url_for('.view_tree', username=username,
+                     repo=repo.name, identifier=branchname) }}">
+              <span class="oi hidden-md-up" data-glyph="file"></span>
+              <span class="hidden-sm-down">Files</span>
+          </a>
         </li>
 
         <li class="nav-item">
-          <a {% if select == 'tags' %}class="active nav-link"  {% else %}class="nav-link"{% endif %} href="{{ url_for('.view_tags', username=username,
-                     repo=repo.name) }}"><span class="oi hidden-md-up" data-glyph="box"></span><span class="hidden-sm-down">Releases</span></a>
+          <a {%
+            if select == 'tags' %}class="active nav-link" {%
+            else %}class="nav-link" {%
+            endif %}href="{{ url_for('.view_tags', username=username,
+                     repo=repo.name) }}">
+              <span class="oi hidden-md-up" data-glyph="box"></span>
+              <span class="hidden-sm-down">Releases</span>
+          </a>
         </li>
 
         {% if config.get('ENABLE_TICKETS', True) and repo
               and repo.settings.get('issue_tracker', True) %}
         <li class="nav-item">
-            <a {% if select == 'issues' %}class="active nav-link"  {% else %}class="nav-link"{% endif %} href="{{ url_for('.view_issues', username=username,
+            <a {%
+              if select == 'issues' %}class="active nav-link" {%
+              else %}class="nav-link" {%
+              endif %}href="{{ url_for('.view_issues', username=username,
                        repo=repo.name) }}">
                 <span class="oi hidden-md-up" data-glyph="warning"></span>
                 <span class="hidden-sm-down">Issues&nbsp;</span>
@@ -112,30 +145,46 @@
 
         {% if repo and repo.settings.get('pull_requests', True) %}
         <li class="nav-item">
-          <a {% if select == 'requests' %}class="active nav-link"  {% else %}class="nav-link"{% endif %} href="{{ url_for('.request_pulls', username=username,
+          <a {%
+            if select == 'requests' %}class="active nav-link" {%
+            else %}class="nav-link" {%
+            endif %}href="{{ url_for('.request_pulls', username=username,
                      repo=repo.name) }}">
-            <span class="oi hidden-md-up" data-glyph="task"></span>
-            <span class="hidden-sm-down">Pull Requests&nbsp;</span>
-            <span class="label label-default label-pill hidden-sm-down">
+              <span class="oi hidden-md-up" data-glyph="task"></span>
+              <span class="hidden-sm-down">Pull Requests&nbsp;</span>
+              <span class="label label-default label-pill hidden-sm-down">
                 {{ repo.open_requests }}
-            </span>
+              </span>
           </a>
         </li>
         {% endif %}
 
         {% if repo and repo.forks %}
         <li class="nav-item">
-          <a {% if select == 'forks' %}class="active nav-link"  {% else %}class="nav-link"{% endif %} href="{{ url_for('.view_forks', username=username,
-                     repo=repo.name) }}"><span class="oi hidden-md-up" data-glyph="fork"></span><span class="hidden-sm-down">Forks&nbsp;</span><span class="hidden-sm-down label label-default label-pill">{{ repo.forks |length }}</span></a>
+          <a {%
+            if select == 'forks' %}class="active nav-link" {%
+            else %}class="nav-link" {%
+            endif %}href="{{ url_for('.view_forks', username=username,
+                     repo=repo.name) }}">
+              <span class="oi hidden-md-up" data-glyph="fork"></span>
+              <span class="hidden-sm-down">Forks&nbsp;</span>
+              <span class="hidden-sm-down label label-default label-pill">
+                {{ repo.forks |length }}
+              </span>
+            </a>
         </li>
         {% endif %}
 
       {% if authenticated %}
         {% if repo_admin %}
           <li class="nav-item pull-xs-right">
-            <a title="Settings" {% if select == 'settings' %}class="active nav-link" {% else %}class="nav-link"{% endif %} href="{{ url_for(
+            <a title="Settings" {%
+              if select == 'settings' %}class="active nav-link" {%
+              else %}class="nav-link" {%
+              endif %}href="{{ url_for(
                 '.view_settings', repo=repo.name, username=username) }}">
-              <span class="oi" data-glyph="cog"></span></a>
+                <span class="oi" data-glyph="cog"></span>
+            </a>
           </li>
         {% endif %}
       {% endif %}