diff --git a/pagure/templates/repo_branches.html b/pagure/templates/repo_branches.html
index 55698f5..0f7de20 100644
--- a/pagure/templates/repo_branches.html
+++ b/pagure/templates/repo_branches.html
@@ -14,96 +14,96 @@
       Branches <span class="badge badge-secondary">{{g.branches|length}}</span>
     </h3>
     <div class="list-group">
-        {% if head %}
-        <div id="branch-{{ head }}" class="list-group-item">
+      {% if head %}
+      <div id="branch-{{ head }}" class="list-group-item">
+        <div class="row align-items-center">
+          <div class="col">
+            <span class="fa fa-random fa-fw text-muted"></span>
+            <a href="{{ url_for('ui_ns.view_tree',
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace,
+              identifier=head) }}"
+              title="{{ head }}" data-toggle="tooltip"
+              class="font-weight-bold">
+              {{ head }}
+            </a>
+          </div>
+          <div class="col-xs-auto pl-2">
+            <button class="btn btn-outline-light bg-white border-white" title="this is the default branch for this project">
+            <span class="fa fa-star fa-fw text-warning"></span>
+            </button>
+          </div>
+        </div>
+      </div>
+      {% endif %}
+
+      {% for branch in g.branches if branch != head %}
+        <div id="branch-{{ branch | unicode | replace('/', '__')}}" class="list-group-item">
           <div class="row align-items-center">
             <div class="col">
               <span class="fa fa-random fa-fw text-muted"></span>
-              <a href="{{ url_for('ui_ns.view_tree',
+              <a class="font-weight-bold" href="{{ url_for('ui_ns.view_tree',
                 repo=repo.name,
                 username=username,
                 namespace=repo.namespace,
-                identifier=head) }}"
-                title="{{ head }}" data-toggle="tooltip"
-                class="font-weight-bold">
-                {{ head }}
+                identifier=branch) }}"
+                title="{{ branch | unicode }}" data-toggle="tooltip">{{ branch | unicode }}
               </a>
+              <small class="text-muted commits_ahead_label"></small>
             </div>
-            <div class="col-xs-auto pl-2">
-              <button class="btn btn-outline-light bg-white border-white" title="this is the default branch for this project">
-              <span class="fa fa-star fa-fw text-warning"></span>
-              </button>
-            </div>
-          </div>
-        </div>
-        {% endif %}
-
-        {% for branch in g.branches if branch != head %}
-          <div id="branch-{{ branch | unicode | replace('/', '__')}}" class="list-group-item">
-            <div class="row align-items-center">
-              <div class="col">
-                <span class="fa fa-random fa-fw text-muted"></span>
-                <a class="font-weight-bold" href="{{ url_for('ui_ns.view_tree',
-                  repo=repo.name,
-                  username=username,
-                  namespace=repo.namespace,
-                  identifier=branch) }}"
-                  title="{{ branch | unicode }}" data-toggle="tooltip">{{ branch | unicode }}
-                </a>
-                <small class="text-muted commits_ahead_label"></small>
-              </div>
-              <div class="col-xs-auto pr-2">
-                <div class="branch_del">
-                  <div class="btn-group">
-                      <a class="btn btn-outline-primary" href="{{ url_for('ui_ns.view_tree',
-                        repo=repo.name,
-                        username=username,
-                        namespace=repo.namespace,
-                        identifier=branch) }}"
-                        title="view code tree for this branch">
-                      <i class="fa fa-fw fa-file-code-o"></i>
-                      </a>
-                      <a class="btn btn-outline-primary" href="{{ url_for('ui_ns.view_commits',
-                        repo=repo.name,
-                        username=username,
-                        namespace=repo.namespace,
-                        identifier=branch,
-                        branchname=branch) }}"
-                        title="view commit list for this branch">
-                      <i class="fa fa-fw fa-list-alt"></i>
-                      </a>
-                  </div>
-                  {% if g.repo_committer and branch != head
-                        and (
-                          config.get('ALLOW_DELETE_BRANCH', True)
-                          or repo.is_fork) %}
-                    <form id="delete_branch_form-{{
-                        branch | unicode | replace('/', '__') | replace('+', '___')
-                      }}" action="{{
-                      url_for('ui_ns.delete_branch',
-                              repo=repo.name,
-                              username=username,
-                              namespace=repo.namespace,
-                              branchname=branch)
-                      }}" method="post" class="icon d-inline"
-                      onsubmit="return confirm('Are you sure you want to remove the branch: {{ branch | unicode }}?\nThis cannot be un-done!');">
-                      {{ g.confirmationform.csrf_token }}
-                      <a title="Remove branch {{ branch }}" href="#"
-                        class="btn btn-outline-danger"
-                        onclick="$('#delete_branch_form-{{
-                          branch | unicode | replace('/', '__') | replace('.', '\\\\.')
-                          | replace('+', '___')
-                          }}').submit();">
-                        <i class="fa fa-trash"></i>
-                      </a>
-                    </form>
-                  {% endif %}
+            <div class="col-xs-auto pr-2">
+              <div class="branch_del">
+                <div class="btn-group">
+                    <a class="btn btn-outline-primary" href="{{ url_for('ui_ns.view_tree',
+                      repo=repo.name,
+                      username=username,
+                      namespace=repo.namespace,
+                      identifier=branch) }}"
+                      title="view code tree for this branch">
+                    <i class="fa fa-fw fa-file-code-o"></i>
+                    </a>
+                    <a class="btn btn-outline-primary" href="{{ url_for('ui_ns.view_commits',
+                      repo=repo.name,
+                      username=username,
+                      namespace=repo.namespace,
+                      identifier=branch,
+                      branchname=branch) }}"
+                      title="view commit list for this branch">
+                    <i class="fa fa-fw fa-list-alt"></i>
+                    </a>
                 </div>
+                {% if g.repo_committer and branch != head
+                      and (
+                        config.get('ALLOW_DELETE_BRANCH', True)
+                        or repo.is_fork) %}
+                  <form id="delete_branch_form-{{
+                      branch | unicode | replace('/', '__') | replace('+', '___')
+                    }}" action="{{
+                    url_for('ui_ns.delete_branch',
+                            repo=repo.name,
+                            username=username,
+                            namespace=repo.namespace,
+                            branchname=branch)
+                    }}" method="post" class="icon d-inline"
+                    onsubmit="return confirm('Are you sure you want to remove the branch: {{ branch | unicode }}?\nThis cannot be un-done!');">
+                    {{ g.confirmationform.csrf_token }}
+                    <a title="Remove branch {{ branch }}" href="#"
+                      class="btn btn-outline-danger"
+                      onclick="$('#delete_branch_form-{{
+                        branch | unicode | replace('/', '__') | replace('.', '\\\\.')
+                        | replace('+', '___')
+                        }}').submit();">
+                      <i class="fa fa-trash"></i>
+                    </a>
+                  </form>
+                {% endif %}
               </div>
             </div>
           </div>
-        {% endfor %}
         </div>
+      {% endfor %}
+    </div>
   </div>
 </div>
 {% endblock %}