diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 22e57ac..ba55e94 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -201,6 +201,24 @@ min-height: 85vh;
 right:6px!important;
 }
 
+.button-label{
+  padding: .25rem .75rem;
+  font-size: .875rem;
+  line-height: 1.5;
+  border-radius: .2rem;
+  display: inline-block;
+  font-weight: 400;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  border: 1px solid transparent;
+}
+
+.button-label-default
+{
+  background-color:#eee;
+}
+
 .ellipsis {
   white-space: nowrap;
   overflow: hidden;
diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html
index 0827f00..c824857 100644
--- a/pagure/templates/commits.html
+++ b/pagure/templates/commits.html
@@ -4,7 +4,7 @@
 {% set tag = "home" %}
 
 {% block repo %}
-  <div class="row">
+  <div class="row m-b-1">
     {% if repo_obj and repo_obj.is_empty %}
     <div class="col-md-12">
       <div class="alert alert-info" role="alert">
@@ -13,25 +13,42 @@
       </div>
     </div>
     {% else %}
+    <div class="col-sm-6">
     <h3>
       Commits <span class="label label-default"> {{number_of_commits}}</span>
     </h3>
+    </div>
 
-    <div class="m-b-1">
-      Displaying {{number_of_commits}} commits in
-      <span class="pr-toplabel">
+    <div class="col-sm-6">
+      <div class="pull-xs-right">
+      <div class="button-label button-label-default">
         {% if repo.is_fork %}
         <span class="oi" data-glyph="fork"></span>
+        {{ repo.user.user }}/{{ repo.name }}
         {% else %}
-        <span class="oi" data-glyph="document"></span>
+        <span class="oi" data-glyph="document"></span> {{ repo.name }}
         {% endif %}
-        {{ repo.fullname }}
-      </span>
-      <span class="pr-toplabel">
-        <span class="oi" data-glyph="random"> </span>
-        {{branchname}}
-      </span>
+
+      </div>
+      {% if branchname %}
+        <div class="btn-group">
+          <button type="button" class="btn btn-secondary btn-sm dropdown-toggle"
+                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <span class="oi" data-glyph="random"> </span> {{ branchname }}
+          </button>
+          <div class="dropdown-menu dropdown-menu-right">
+            {% for branch in branches %}
+                <a class="dropdown-item" href="{{ url_for('view_commits',
+                            username=username, repo=repo.name, branchname=branch) }}">
+                  {{ branch }}
+                </a>
+            {% endfor %}
+          </div>
+        </div>
+      {% endif %}
     </div>
+  </div>
+  </div>
 
     {% if diff_commits|count > 0 %}
     <div class="alert alert-info" role="alert">
diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index fb8377a..f312966 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -5,6 +5,51 @@
 
 
 {% block repo %}
+  <div class="row m-b-1">
+    <div class="col-sm-6">
+    <h3>
+      Files
+    </h3>
+    </div>
+
+    <div class="col-sm-6">
+      <div class="pull-xs-right">
+      <div class="button-label button-label-default">
+        {% if repo.is_fork %}
+        <span class="oi" data-glyph="fork"></span>
+        {{ repo.user.user }}/{{ repo.name }}
+        {% else %}
+        <span class="oi" data-glyph="document"></span> {{ repo.name }}
+        {% endif %}
+
+      </div>
+      {% if branchname %}
+        <div class="btn-group">
+          <button type="button" class="btn btn-secondary btn-sm dropdown-toggle"
+                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <span class="oi" data-glyph="random"> </span> {{ branchname }}
+          </button>
+          <div class="dropdown-menu dropdown-menu-right">
+            {% for branch in branches %}
+              {% if origin == 'view_tree' %}
+                <a class="dropdown-item" href="{{ url_for('view_tree',
+                            username=username, repo=repo.name, identifier=branch) }}">
+                  {{ branch }}
+                </a>
+              {% elif origin == 'view_file' %}
+                <a class="dropdown-item" href="{{ url_for('view_file',
+                            username=username, repo=repo.name, identifier=branch,
+                            filename=filename) }}">
+                  {{ branch }}
+                </a>
+              {% endif %}
+            {% endfor %}
+          </div>
+        </div>
+      {% endif %}
+    </div>
+  </div>
+  </div>
     <div class="card">
       <div class="card-header">
           <ol class="breadcrumb">
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 47d677e..f65c3fc 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -86,9 +86,9 @@ git push -u origin master</pre>
                   {% else  %}
                   <span class="oi text-muted" data-glyph="random"
                     title="Default branch"></span>
-                  <a class="" href="{{ url_for('view_repo_branch',
+                  <a href="{{ url_for('view_repo_branch',
                     username=username, repo=repo.name, branchname=head) }}"
-                    title="{{ head }}">
+                    title="{{ head }}" data-toggle="tooltip">
                     {{ head }}
                   </a>
                   {% endif %}
@@ -107,8 +107,7 @@ git push -u origin master</pre>
                   {% if branchname != branch %}
                   <a class="" href="{{ url_for('view_repo_branch',
                     username=username, repo=repo.name, branchname=branch) }}"
-                    title="{{ branch }}">
-                    {{ branch }}
+                    title="{{ branch }}" data-toggle="tooltip">{{ branch }}
                   </a>
                   {% else %}
                   <strong title="Currently viewing branch {{branch}}" data-toggle="tooltip">{{ branch }}</strong>
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index ba9ba5c..b33fa8f 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -18,52 +18,17 @@
               {%- endif -%}
             </a>
             {% if authenticated and not repo.is_fork %}
+            <div class="pull-xs-right">
               <form method="POST" name="fork_project"
                 action="{{ url_for(
                   '.fork_project', repo=repo.name, username=username) }}">
-                <div class="pull-xs-right">
-                  <button class="btn btn-warning"
+                  <button class="btn btn-sm btn-secondary"
                     onclick="fork_project.submit();"
-                    id="fork_project">Fork</Button>
+                    id="fork_project"><span class="oi" data-glyph="fork"></span> Fork</Button>
                 {{ forkbuttonform.csrf_token }}
-                </div>
               </form>
-             {% endif %}
-
-          {% if branchname %}
-            <div class="btn-group pull-xs-right">
-              <button type="button" class="btn btn-default">{{ branchname }}</button>
-              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <span class="sr-only">Toggle Dropdown</span>
-              </button>
-              <div class="dropdown-menu">
-                {% for branch in branches %}
-                  {% if origin == 'view_commits' %}
-                    <a class="dropdown-item" href="{{ url_for('view_commits',
-                                username=username, repo=repo.name, branchname=branch) }}">
-                      {{ branch }}
-                    </a>
-                  {% elif origin == 'view_repo_branch' or origin == 'view_repo' %}
-                    <a class="dropdown-item" href="{{ url_for('view_repo_branch',
-                                username=username, repo=repo.name, branchname=branch) }}">
-                      {{ branch }}
-                    </a>
-                  {% elif origin == 'view_tree' %}
-                    <a class="dropdown-item" href="{{ url_for('view_tree',
-                                username=username, repo=repo.name, identifier=branch) }}">
-                      {{ branch }}
-                    </a>
-                  {% elif origin == 'view_file' %}
-                    <a class="dropdown-item" href="{{ url_for('view_file',
-                                username=username, repo=repo.name, identifier=branch,
-                                filename=filename) }}">
-                      {{ branch }}
-                    </a>
-                  {% endif %}
-                {% endfor %}
-              </div>
             </div>
-          {% endif %}
+            {% endif %}
         </h2>
         {% if repo.is_fork %}
         <div class="m-t-0">
diff --git a/tests/test_pagure_flask_ui_no_master_branch.py b/tests/test_pagure_flask_ui_no_master_branch.py
index 7b1de81..d843d86 100644
--- a/tests/test_pagure_flask_ui_no_master_branch.py
+++ b/tests/test_pagure_flask_ui_no_master_branch.py
@@ -164,9 +164,6 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         self.assertIn(
             '<div class="container p-t-3">\n  <div class="row">',
             output.data)
-        self.assertEqual(
-            output.data.count('<a class="dropdown-item" href="/test/branch/'),
-            1)
 
     @patch('pagure.lib.notify.send_email')
     def test_view_commits(self, send_email):
@@ -193,7 +190,7 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         output = self.app.get('/test/commits/feature')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<div class="container p-t-3">\n  <div class="row">',
+            '<div class="container p-t-3">\n  <div class="row m-b-1">',
             output.data)
         self.assertIn('Add sources file for testing', output.data)
         self.assertIn('Add .gitignore file for testing', output.data)
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index c5f28b0..8fd0b94 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -2792,23 +2792,23 @@ index 0000000..fb7093d
             output = self.app.get('/test')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<a class="dropdown-item" href="/test/branch/foo">',
+                'data-toggle="tooltip">foo',
                 output.data)
             self.assertIn('<form id="delete_branch_form-foo"', output.data)
             self.assertIn(
-                '<a class="dropdown-item" href="/test/branch/master">',
+                '<strong title="Currently viewing branch master"',
                 output.data)
 
             # Delete the branch
             output = self.app.post('/test/b/foo/delete', follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertNotIn(
-                '<a class="dropdown-item" href="/test/branch/foo">',
+                'data-toggle="tooltip">foo',
                 output.data)
             self.assertNotIn(
                 '<form id="delete_branch_form-foo"', output.data)
             self.assertIn(
-                '<a class="dropdown-item" href="/test/branch/master">',
+                '<strong title="Currently viewing branch master"',
                 output.data)
 
             # Add a branch with a '/' in its name that we can delete
@@ -2821,24 +2821,24 @@ index 0000000..fb7093d
             output = self.app.get('/test')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<a class="dropdown-item" href="/test/branch/feature/foo">',
+                'data-toggle="tooltip">feature/foo',
                 output.data)
             self.assertIn(
                 '<form id="delete_branch_form-feature_foo"', output.data)
             self.assertIn(
-                '<a class="dropdown-item" href="/test/branch/master">',
+                '<strong title="Currently viewing branch master"',
                 output.data)
 
             # Delete the branch
             output = self.app.post('/test/b/feature/foo/delete', follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertNotIn(
-                '<a class="dropdown-item" href="/test/branch/feature/foo">',
+                'data-toggle="tooltip">feature/foo',
                 output.data)
             self.assertNotIn(
                 '<form id="delete_branch_form-feature_foo"', output.data)
             self.assertIn(
-                '<a class="dropdown-item" href="/test/branch/master">',
+                '<strong title="Currently viewing branch master"',
                 output.data)
 
     def test_view_docs(self):
diff --git a/tests/test_pagure_flask_ui_repo_slash_name.py b/tests/test_pagure_flask_ui_repo_slash_name.py
index 7bd960d..4ecd2a3 100644
--- a/tests/test_pagure_flask_ui_repo_slash_name.py
+++ b/tests/test_pagure_flask_ui_repo_slash_name.py
@@ -188,9 +188,6 @@ class PagureFlaskSlashInNametests(tests.Modeltests):
         self.assertIn(
             '<div class="card-block">\n            '
             '<h5><strong>Owners</strong></h5>', output.data)
-        self.assertEqual(output.data.count(
-            '<a class="dropdown-item" href="/test/branch/master'),
-            1)
 
         # We can't create the project `forks/test` the normal way
         self.assertRaises(
diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py
index e837c2b..17ec396 100644
--- a/tests/test_pagure_flask_ui_slash_branch_name.py
+++ b/tests/test_pagure_flask_ui_slash_branch_name.py
@@ -143,9 +143,6 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         self.assertIn(
             '<div class="card-block">\n            '
             '<h5><strong>Owners</strong></h5>', output.data)
-        self.assertEqual(output.data.count(
-            '<a class="dropdown-item" href="/test/branch/maxamilion/feature'),
-            1)
 
     @patch('pagure.lib.notify.send_email')
     def test_view_repo_branch(self, send_email):
@@ -167,9 +164,6 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         self.assertIn(
             '<div class="card-block">\n            '
             '<h5><strong>Owners</strong></h5>', output.data)
-        self.assertEqual(output.data.count(
-            '<a class="dropdown-item" href="/test/branch/maxamilion/feature'),
-            1)
 
     @patch('pagure.lib.notify.send_email')
     def test_view_commits(self, send_email):