diff --git a/pagure/ui/app.py b/pagure/ui/app.py
index 3fa8560..cabee76 100644
--- a/pagure/ui/app.py
+++ b/pagure/ui/app.py
@@ -897,7 +897,8 @@ def add_api_user_token():
             )
             flask.g.session.commit()
             flask.flash(msg)
-            return flask.redirect(flask.url_for('ui_ns.user_settings')+"#nav-api-tab")
+            return flask.redirect(
+                flask.url_for('ui_ns.user_settings') + "#nav-api-tab")
         except SQLAlchemyError as err:  # pragma: no cover
             flask.g.session.rollback()
             _log.exception(err)
@@ -949,7 +950,8 @@ def revoke_api_user_token(token_id):
                 'Token could not be revoked, please contact an admin',
                 'error')
 
-    return flask.redirect(flask.url_for('ui_ns.user_settings')+"#nav-api-token")
+    return flask.redirect(
+        flask.url_for('ui_ns.user_settings') + "#nav-api-token")
 
 
 @UI_NS.route('/settings/forcelogout/', methods=('POST', ))
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 69c3440..e725fa1 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -383,7 +383,7 @@ def avatar(packager, size=64, css_class=None):
 
     class_string = "avatar circle"
     if css_class:
-        class_string = class_string+" "+css_class
+        class_string = class_string + " " + css_class
 
     output = '<img class="%s" src="%s"/>' % (
         class_string,
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 3e1e45c..c77a452 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -183,6 +183,7 @@ def view_repo(repo, username=None, namespace=None):
         git_url_ssh=get_git_url_ssh(),
     )
 
+
 """
 @UI_NS.route('/<repo>/branch/<path:branchname>')
 @UI_NS.route('/<namespace>/<repo>/branch/<path:branchname>')
@@ -279,6 +280,7 @@ def view_repo_branch(repo, branchname, username=None, namespace=None):
     )
 """
 
+
 @UI_NS.route('/<repo>/commits/')
 @UI_NS.route('/<repo>/commits')
 @UI_NS.route('/<repo>/commits/<path:branchname>')
@@ -987,6 +989,7 @@ def view_tags(repo, username=None, namespace=None):
         pagure_checksum=pagure_checksum,
     )
 
+
 @UI_NS.route('/<repo>/branches/')
 @UI_NS.route('/<repo>/branches')
 @UI_NS.route('/<namespace>/<repo>/branches/')
@@ -1022,7 +1025,6 @@ def view_branches(repo, username=None, namespace=None):
     )
 
 
-
 @UI_NS.route('/<repo>/upload/', methods=('GET', 'POST'))
 @UI_NS.route('/<repo>/upload', methods=('GET', 'POST'))
 @UI_NS.route('/<namespace>/<repo>/upload/', methods=('GET', 'POST'))
diff --git a/tests/test_pagure_flask_ui_plugins.py b/tests/test_pagure_flask_ui_plugins.py
index 7adcf69..9be60aa 100644
--- a/tests/test_pagure_flask_ui_plugins.py
+++ b/tests/test_pagure_flask_ui_plugins.py
@@ -110,11 +110,13 @@ class PagureFlaskPluginstests(tests.SimplePagureTest):
             output = self.app.post(
                 '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<section class="settings">\n  <h3>Settings for test</h3>',
-                output.get_data(as_text=True))
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
-                '</button>\n                      Hook Mail activated', output.get_data(as_text=True))
+                '</button>\n                      Hook Mail activated',
+                output_text)
 
             data = {
                 'mail_to': '',
@@ -124,11 +126,13 @@ class PagureFlaskPluginstests(tests.SimplePagureTest):
             output = self.app.post(
                 '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
+            output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<section class="settings">\n  <h3>Settings for test</h3>',
-                output.get_data(as_text=True))
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
-                '</button>\n                      Hook Mail deactivated', output.get_data(as_text=True))
+                '</button>\n                      Hook Mail deactivated',
+                output_text)
 
     def test_RequiredIf(self):
         """ Test the behavior of the RequiredIf validator. """
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
index adc9746..3ba2be4 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
@@ -39,7 +39,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<title>Settings Pagure request - test - Pagure</title>',
+                '<title>Settings Pagure requests - test - Pagure</title>',
                 output_text)
             self.assertIn(
                 '<input class="form-control" id="active" name="active" '
@@ -54,7 +54,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<title>Settings Pagure request - test - Pagure</title>',
+                '<title>Settings Pagure requests - test - Pagure</title>',
                 output_text)
             self.assertIn(
                 '<input class="form-control" id="active" name="active" '
@@ -81,7 +81,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<title>Settings Pagure request - test - Pagure</title>',
+                '<title>Settings Pagure requests - test - Pagure</title>',
                 output_text)
             self.assertIn(
                 '<input class="form-control" id="active" name="active" '
@@ -113,7 +113,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<title>Settings Pagure request - test - Pagure</title>',
+                '<title>Settings Pagure requests - test - Pagure</title>',
                 output_text)
             self.assertIn(
                 '<input checked class="form-control" id="active" name="active" '
@@ -141,7 +141,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<title>Settings Pagure request - test - Pagure</title>',
+                '<title>Settings Pagure requests - test - Pagure</title>',
                 output_text)
             self.assertIn(
                 '<input class="form-control" id="active" name="active" '
diff --git a/tests/test_pagure_flask_ui_priorities.py b/tests/test_pagure_flask_ui_priorities.py
index bf11c49..06c1a41 100644
--- a/tests/test_pagure_flask_ui_priorities.py
+++ b/tests/test_pagure_flask_ui_priorities.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- (c) 2016-2017 - Copyright Red Hat Inc
+ (c) 2016-2018 - Copyright Red Hat Inc
 
  Authors:
    Pierre-Yves Chibon <pingou@pingoured.fr>
@@ -155,7 +155,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -171,7 +173,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the result of the action -- None, no CSRF
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.priorities, {})
@@ -188,7 +192,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the result of the action -- Priority recorded
             self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
@@ -206,7 +212,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the ordering
             self.assertTrue(
                 output_text.find('High') < output_text.find('Normal'))
@@ -233,7 +241,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n'
                 '                      Priorities weights and titles are '
@@ -259,7 +269,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n'
                 '                      Priorities weights must be numbers',
@@ -285,7 +297,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n'
                 '                      Priority weight 2 is present 2 times',
@@ -311,7 +325,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n'
                 '                      Priority Normal is present 2 times',
@@ -377,7 +393,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -394,7 +412,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             # Check the result of the action -- Priority recorded
             self.session.commit()
@@ -442,7 +462,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             # Check that the issue list renders fine
             output = self.app.get('/test/issues')
@@ -485,7 +507,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -502,7 +526,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             # Check the result of the action -- Priority recorded
             self.session.commit()
@@ -551,7 +577,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             # Check that the issue list renders fine
             output = self.app.get('/test/issues')
@@ -592,7 +620,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -610,7 +640,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             # Check the result of the action -- Priority recorded
             self.session.commit()
@@ -722,7 +754,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -740,7 +774,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             # Check the result of the action -- Priority recorded
             self.session.commit()
@@ -830,7 +866,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -848,7 +886,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             # Check the result of the action -- Priority recorded
             self.session.commit()
@@ -946,7 +986,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the ordering
             self.assertTrue(
                 output_text.find('High') < output_text.find('Normal'))
@@ -970,7 +1012,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the result of the action -- default_priority no change
             self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
@@ -986,7 +1030,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n                      Default priority set '
                 'to High', output_text)
@@ -1005,7 +1051,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the result of the action -- default_priority no change
             self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
@@ -1021,7 +1069,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n                      Default priority reset',
                 output_text)
@@ -1092,7 +1142,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the ordering
             self.assertTrue(
                 output_text.find('High') < output_text.find('Normal'))
@@ -1116,7 +1168,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n                      Default priority set '
                 'to High', output_text)
@@ -1138,7 +1192,9 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n                      Priorities updated',
                 output_text)
diff --git a/tests/test_pagure_flask_ui_quick_reply.py b/tests/test_pagure_flask_ui_quick_reply.py
index e45b19f..0fc4efd 100644
--- a/tests/test_pagure_flask_ui_quick_reply.py
+++ b/tests/test_pagure_flask_ui_quick_reply.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- (c) 2015-2016 - Copyright Red Hat Inc
+ (c) 2015-2018 - Copyright Red Hat Inc
 
  Authors:
    Lubomír Sedlář <lsedlar@redhat.com>
@@ -74,11 +74,15 @@ class PagureFlaskQuickReplytest(tests.Modeltests):
         and that a given notice was printed.
         """
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<title>Settings - %s - Pagure</title>' % project, output.get_data(as_text=True))
-        self.assertIn('<h3>Settings for %s</h3>' % project, output.get_data(as_text=True))
+            '<title>Settings - %s - Pagure</title>' % project,
+            output_text)
+        self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
         if notice:
-            self.assertIn(notice, output.get_data(as_text=True))
+            self.assertIn(notice, output_text)
 
     def assertQuickReplies(self, quick_replies, project='test'):
         self.session.commit()
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 88d40c4..0f7442b 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -790,7 +790,8 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn(
                 '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn(
-                '<h2 class="repo-name mb-0">\n<a href="/test">test</a>',
+                '<h3 class="mb-0">\n<a href="/test"><strong>test</strong>'
+                '</a>\n            </h3>',
                 output_text)
             self.assertIn(
                 '</button>\n                      User removed', output_text)
@@ -1241,9 +1242,6 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn(
                 '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
-            self.assertIn(
                 '</button>\n                      Edited successfully '
                 'settings of repo: test', output_text)
 
@@ -1273,9 +1271,6 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn(
                 '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
-            self.assertIn(
                 '</button>\n                      Edited successfully '
                 'settings of repo: test', output_text)
 
@@ -1325,9 +1320,6 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn(
                 '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
-            self.assertIn(
                 '</button>\n                      Edited successfully '
                 'settings of repo: test', output_text)
 
@@ -1402,18 +1394,16 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn('<h5 class="pl-2 font-weight-bold text-muted">Project Settings</h5>', output_text)
             # Check that the priorities have their empty fields
             self.assertIn(
-            '''<div id="priorities">
-              <div class="row p-t-1">
-                <div class="col-sm-2 p-r-0">
-                  <input type="text" name="priority_weigth"
-                    value="" size="3" class="form-control"/>
-                </div>
-                <div class="col-sm-9 p-r-0">
-                  <input type="text" name="priority_title"
-                    value="" class="form-control"/>
-                </div>
-              </div>
-          </div>''', output_text)
+            '''<div class="form-group settings-field-rows" id="priorities-list">
+                        <div class="row hidden blank-field">
+                            <div class="col-sm-2" >
+                              <input type="text" name="priority_weigth"
+                                     value="" size="3" class="form-control"/>
+                            </div>
+                            <div class="col-sm-9">
+                              <input type="text" name="priority_title"
+                                     value="" class="form-control"/>
+                            </div>''', output_text)
 
             # Check that the milestones have their empty fields
             self.assertIn(
@@ -1428,12 +1418,10 @@ class PagureFlaskRepotests(tests.Modeltests):
                     value="" class="form-control"/>
                 </div>
                 <div class="col-sm-2 p-r-0" >
-                    <span class="oi milestone_order_up"
-                        data-stone="1"
-                        data-glyph="arrow-thick-top"></span>
-                    <span class="oi milestone_order_bottom"
-                        data-stone="1"
-                        data-glyph="arrow-thick-bottom"></span>
+                    <span class="fa fa-long-arrow-up milestone_order_up"
+                        data-stone="1"></span>
+                    <span class="fa fa-long-arrow-down milestone_order_bottom"
+                        data-stone="1"></span>
                 </div>
                 <div class="col-sm-1 p-r-0" >
                     <input type="checkbox" name="active_milestone_1" checked />
@@ -1442,39 +1430,36 @@ class PagureFlaskRepotests(tests.Modeltests):
 
             # Check that the close_status have its empty field
             self.assertIn(
-            '''<div id="close_sstatus">
-              <div class="row p-t-1">
-                <div class="col-sm-12 p-r-0">
-                  <input type="text" name="close_status"
-                    value="" class="form-control"/>
-                </div>
-              </div>''', output_text)
+            '''<div class="form-group settings-field-rows" id="status-list">
+                        <div class="row hidden blank-field">
+                            <div class="col-sm-11" >
+                              <input type="text" name="close_status"
+                                      value="" class="form-control"/>
+                            </div>''', output_text)
 
             # Check that the custom fields have their empty fields
             self.assertIn(
-            '''<div id="custom_fields">
-              <div class="row p-t-1">
-                <div class="col-sm-3 p-r-0">
-                  <input type="text" name="custom_keys"
-                    value="" class="form-control"/>
-                </div>
-                <div class="col-sm-2 p-r-0">
-                  <select name="custom_keys_type" class="form-control">
-                    <option value="text" >Text</option>
-                    <option value="boolean" >Boolean</option>
-                    <option value="link" >Link</option>
-                    <option value="list" >List</option>
-                  </select>
-                </div>
-                <div class="col-sm-6 p-r-0">
-                    <input title="Comma separated list items" type="text" name="custom_keys_data"
-                      value="" class="form-control"/>
-                </div>
-                <div class="col-sm-1 p-r-0">
-                  <input type="checkbox" name="custom_keys_notify-1" title="Trigger email notification when updated"
-                  class="form-control"/>
-                </div>
-              </div>''', output_text)
+            '''<div class="form-group settings-field-rows" id="customfields-list">
+                              <div class="row hidden blank-field">
+                                  <div class="col-sm-2 pr-0">
+                                      <input type="text" name="custom_keys"
+                                        value="" class="form-control"/>
+                                    </div>
+                                    <div class="col-sm-2 pr-0">
+                                      <select name="custom_keys_type" class="form-control">
+                                        <option value="text">Text</option>
+                                        <option value="boolean">Boolean</option>
+                                        <option value="link">Link</option>
+                                        <option value="list">List</option>
+                                      </select>
+                                    </div>
+                                    <div class="col-sm-6 pr-0">
+                                        <input title="Comma separated list items" type="text" name="custom_keys_data"
+                                          value="" class="form-control"/>
+                                    </div>
+                                    <div class="col-sm-1 pr-0">
+                                      <input type="checkbox" name="custom_keys_notify" title="Trigger email notification when updated">
+                                    </div>''', output_text)
 
     def test_view_forks(self):
         """ Test the view_forks endpoint. """
@@ -1520,10 +1505,9 @@ class PagureFlaskRepotests(tests.Modeltests):
             'href="#moregiturls"', output_text)
         self.assertIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+                '<title>Overview - test - Pagure</title>', output_text)
         self.assertIn(
-            '<span class="d-none d-md-inline">Stats&nbsp;</span>',
+            '<span class="d-none d-md-inline">Stats</span>',
             output_text)
         self.perfMaxWalks(0, 0)
         self.perfReset()
@@ -1541,14 +1525,14 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<span class="pull-xs-right"><a data-toggle="collapse" '
-                'href="#moregiturls"', output_text)
+                '<input class="form-control bg-white" type="text" '
+                'value="ssh://git@pagure.org/tickets/test.git" readonly>',
+                output_text)
             self.assertIn('<p>This repo is brand new!</p>', output_text)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
+                '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn(
-                '<span class="d-none d-md-inline">Stats&nbsp;</span>',
+                '<span class="d-none d-md-inline">Stats</span>',
                 output_text)
             self.perfMaxWalks(0, 0)
             self.perfReset()
@@ -1566,14 +1550,14 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertNotIn(
-                '<span class="pull-xs-right"><a data-toggle="collapse" '
-                'href="#moregiturls"', output_text)
+                '<input class="form-control bg-white" type="text" '
+                'value="ssh://git@pagure.org/tickets/test.git" readonly>',
+                output_text)
             self.assertIn('<p>This repo is brand new!</p>', output_text)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
+                '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn(
-                '<span class="d-none d-md-inline">Stats&nbsp;</span>',
+                '<span class="d-none d-md-inline">Stats</span>',
                 output_text)
             self.perfMaxWalks(0, 0)
             self.perfReset()
@@ -1600,10 +1584,11 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Overview - test - Pagure</title>', output_text)
         self.assertIn(
-            '<span class="d-none d-md-inline">Stats&nbsp;</span>',
+            '<a class="nav-link" href="/test/stats">\n              '
+            '<i class="fa fa-line-chart fa-fw text-muted"></i>\n              '
+            '<span class="d-none d-md-inline">Stats</span>\n          </a>',
             output_text)
         self.perfMaxWalks(0, 0)
         self.perfReset()
@@ -1613,8 +1598,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Overview - test - Pagure</title>', output_text)
         self.perfMaxWalks(0, 0)
         self.perfReset()
 
@@ -1633,15 +1617,14 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<i class="fa fa-code-fork"></i>Fork</button>',
+                '<i class="fa fa-code-fork fa-fw"></i> Fork</button>',
                 output.data)
             self.assertFalse('<p>This repo is brand new!</p>' in output.data)
             self.assertFalse('Forked from' in output.data)
             self.assertFalse('README.txt' in output.data)
             self.assertFalse('README.dummy' in output.data)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
+            '<title>Overview - test - Pagure</title>', output_text)
             self.perfMaxWalks(3, 8)  # Target: (1, 3)
             self.perfReset()
 
@@ -1657,8 +1640,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertFalse('README.txt' in output.data)
         self.assertFalse('README.dummy' in output.data)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Overview - test - Pagure</title>', output_text)
         self.perfMaxWalks(3, 8)  # Target: (1, 3)
         self.perfReset()
 
@@ -1687,14 +1669,13 @@ class PagureFlaskRepotests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertNotIn('<p>This repo is brand new!</p>', output_text)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
+                '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn('Forked from', output_text)
             self.assertNotIn(
-                '<i class="fa fa-code-fork"></i>Fork</button>',
+                '<i class="fa fa-code-fork fa-fw"></i> Fork</button>',
                 output.data)
             self.assertIn(
-                '<i class="fa fa-code-fork"></i> View Fork',
+                '<i class="fa fa-code-fork fa-fw"></i> View Upstream',
                 output.data)
             self.perfMaxWalks(1, 3)
             self.perfReset()
@@ -1707,14 +1688,13 @@ class PagureFlaskRepotests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertNotIn('<p>This repo is brand new!</p>', output_text)
             self.assertIn(
-                '<div class="projectinfo my-3">\n'
-                'test project #1      </div>', output_text)
+                '<title>Overview - test - Pagure</title>', output_text)
             self.assertIn('Forked from', output_text)
             self.assertNotIn(
-                '<i class="fa fa-code-fork"></i> View Fork',
+                '<i class="fa fa-code-fork fa-fw"></i> View Upstream',
                 output.data)
             self.assertIn(
-                '<i class="fa fa-code-fork"></i>Fork</button>',
+                '<i class="fa fa-code-fork fa-fw"></i> Fork</button>',
                 output.data)
             self.perfMaxWalks(1, 3)
             self.perfReset()
@@ -1725,8 +1705,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Overview - test - Pagure</title>', output_text)
         self.assertIn('Forked from', output_text)
         self.assertNotIn(
             '<i class="fa fa-code-fork"></i> View Fork',
@@ -1762,8 +1741,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #3      </div>', output_text)
+            '<title>Overview - test3 - Pagure</title>', output_text)
         self.assertIn('Forked from', output_text)
         self.perfMaxWalks(3, 18)  # Ideal: (1, 3)
         self.perfReset()
@@ -1810,13 +1788,13 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
         self.assertNotIn('Forked from', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Overview - test - Pagure</title>', output_text)
         self.assertEqual(
             output_text.count('<span class="commitid">'), 0)
 
         shutil.rmtree(newpath)
 
+    '''
     def test_view_repo_branch(self):
         """ Test the view_repo_branch endpoint. """
 
@@ -1840,15 +1818,6 @@ class PagureFlaskRepotests(tests.Modeltests):
                                                 'test.git'))
         tests.add_readme_git_repo(os.path.join(self.path, 'repos', 'test.git'))
 
-        output = self.app.get('/test/branch/master')
-        self.assertEqual(output.status_code, 200)
-        output_text = output.get_data(as_text=True)
-        self.assertNotIn('<p>This repo is brand new!</p>', output_text)
-        self.assertNotIn('Forked from', output_text)
-        self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
-
         # Turn that repo into a fork
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         repo.parent_id = 2
@@ -1856,23 +1825,16 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.session.add(repo)
         self.session.commit()
 
-        # View the repo in the UI
-        output = self.app.get('/test/branch/master')
-        self.assertEqual(output.status_code, 404)
-
         # Add some content to the git repo
         tests.add_content_git_repo(
             os.path.join(self.path, 'repos', 'forks', 'pingou', 'test.git'))
         tests.add_readme_git_repo(
             os.path.join(self.path, 'repos', 'forks', 'pingou', 'test.git'))
 
-        output = self.app.get('/fork/pingou/test/branch/master')
+        output = self.app.get('/fork/pingou/test/')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
-        self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
         self.assertIn('Forked from', output_text)
 
         # Add a fork of a fork
@@ -1895,14 +1857,12 @@ class PagureFlaskRepotests(tests.Modeltests):
             os.path.join(self.path, 'repos', 'forks', 'pingou', 'test3.git'),
             ncommits=10)
 
-        output = self.app.get('/fork/pingou/test3/branch/master')
+        output = self.app.get('/fork/pingou/test3/')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
-        self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #3      </div>', output_text)
         self.assertIn('Forked from', output_text)
+    '''
 
     def test_view_commits(self):
         """ Test the view_commits endpoint. """
@@ -1923,8 +1883,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Commits - test - Pagure</title>', output_text)
 
         # Add some content to the git repo
         tests.add_content_git_repo(os.path.join(self.path, 'repos',
@@ -1936,9 +1895,6 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
         self.assertNotIn('Forked from', output_text)
-        self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
         self.assertIn('<title>Commits - test - Pagure</title>', output_text)
 
         output = self.app.get('/test/commits/master')
@@ -1947,8 +1903,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
         self.assertNotIn('Forked from', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Commits - test - Pagure</title>', output_text)
 
         # Turn that repo into a fork
         repo = pagure.lib.get_authorized_project(self.session, 'test')
@@ -1972,8 +1927,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
+            '<title>Commits - test - Pagure</title>', output_text)
         self.assertIn('Forked from', output_text)
 
         # Add a fork of a fork
@@ -2009,8 +1963,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertNotIn('<p>This repo is brand new!</p>', output_text)
         self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #3      </div>', output_text)
+            '<title>Commits - test3 - Pagure</title>', output_text)
         self.assertIn('Forked from', output_text)
 
     def test_view_commits_from_tag(self):
@@ -2296,7 +2249,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<span class="oi text-muted" data-glyph="folder"></span>',
+            '<li class="active breadcrumb-item">\n            '
+            '<span class="fa fa-folder" data-glyph="">\n            '
+            '</span>&nbsp; folder1\n          </li>',
             output_text)
         self.assertIn('<title>Tree - test - Pagure</title>', output_text)
         self.assertIn(
@@ -2366,9 +2321,10 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-                '<li><a\n      href="/fork/pingou/test3/blob/master/f/folder1/folder2"\n'
-                '        ><span class="fa fa-folder"></span>&nbsp; folder2</a>\n'
-                '        </li>', output_text)
+            '<li class="breadcrumb-item">'
+            '<a href="/fork/pingou/test3/blob/master/f/folder1/folder2">'
+            '\n            <span class="fa fa-folder"></span>'
+            '&nbsp; folder2</a>\n          </li>', output_text)
 
 
         output = self.app.get('/fork/pingou/test3/blob/master/f/sources')
@@ -2792,15 +2748,20 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<a class="active nav-link" href="/test/commits/master">',
-            output_text)
+            '<a class=\n      "nav-link nowrap\n active"\n      '
+            'href="/test/commits/master">\n      <i class="fa fa-list-alt '
+            'text-muted fa-fw" data-glyph="spreadsheet"></i>&nbsp;Commits'
+            '\n    </a>', output_text)
 
         #View the commit when branch name is wrong, show the commit
         output = self.app.get('/test/c/%s?branch=abcxyz' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<a class="active nav-link" href="/test/commits">', output_text)
+            '<a class=\n      "nav-link nowrap\n active"\n      '
+            'href="/test/commits">\n      <i class="fa fa-list-alt '
+            'text-muted fa-fw" data-glyph="spreadsheet"></i>&nbsp;Commits'
+            '\n    </a>', output_text)
 
         # Add a fork of a fork
         item = pagure.lib.model.Project(
@@ -2858,16 +2819,21 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<a class="active nav-link" href="/fork/pingou/test3/commits/master">',
-            output_text)
+            '<a class=\n      "nav-link nowrap\n active"\n      '
+            'href="/fork/pingou/test3/commits/master">\n      '
+            '<i class="fa fa-list-alt '
+            'text-muted fa-fw" data-glyph="spreadsheet"></i>&nbsp;Commits'
+            '\n    </a>', output_text)
 
         #View the commit of the fork when branch name is wrong
         output = self.app.get('/fork/pingou/test3/c/%s?branch=abcxyz' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<a class="active nav-link" href="/fork/pingou/test3/commits">',
-            output_text)
+            '<a class=\n      "nav-link nowrap\n active"\n      '
+            'href="/fork/pingou/test3/commits">\n      <i class="fa fa-list-alt '
+            'text-muted fa-fw" data-glyph="spreadsheet"></i>&nbsp;Commits'
+            '\n    </a>', output_text)
 
     def test_view_commit_patch(self):
         """ Test the view_commit_patch endpoint. """
@@ -3069,11 +3035,10 @@ index 0000000..fb7093d
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '''
-        <ol class="breadcrumb">
-          <li>
+            '''<ol class="breadcrumb">
+          <li class="breadcrumb-item">
             <a href="/test/tree">
-              <span class="oi" data-glyph="random">
+              <span class="fa fa-random">
               </span>&nbsp; None
             </a>
           </li>
@@ -3090,9 +3055,6 @@ index 0000000..fb7093d
         output = self.app.get('/test/tree/%s' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
         self.assertIn('<title>Tree - test - Pagure</title>', output_text)
         self.assertIn('README.rst', output_text)
         self.assertFalse(
@@ -3102,9 +3064,6 @@ index 0000000..fb7093d
         output = self.app.get('/test/tree/master')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #1      </div>', output_text)
         self.assertIn('<title>Tree - test - Pagure</title>', output_text)
         self.assertIn('README.rst', output_text)
         self.assertNotIn(
@@ -3129,9 +3088,6 @@ index 0000000..fb7093d
         output = self.app.get('/fork/pingou/test3/tree/')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn(
-            '<div class="projectinfo my-3">\n'
-            'test project #3      </div>', output_text)
         self.assertIn('<title>Tree - test3 - Pagure</title>', output_text)
         self.assertIn(
             '<a href="/fork/pingou/test3/blob/master/f/folder1">',
@@ -4220,8 +4176,11 @@ index 0000000..fb7093d
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn('0.0.1', output_text)
-        self.assertIn('<span id="tagid" class="badge badge-secondary">', output_text)
-        self.assertTrue(output_text.count('tagid'), 1)
+        self.assertIn('<section class="tag_list">', output_text)
+        print(output_text)
+        self.assertEqual(
+            output_text.count('<i class="fa fa-fw fa-archive text-muted"></i>'),
+            1)
 
     def test_edit_file_no_signed_off(self):
         """ Test the edit_file endpoint when signed-off isn't enforced. """
@@ -4461,7 +4420,8 @@ index 0000000..fb7093d
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<li><a href="/test/tree/master"><span class="fa fa-random">'
+                '<li><a href="/fork/pingou/test3/tree/master">'
+                '<span class="fa fa-random">'
                 '</span>&nbsp; master</a></li><li class="active">'
                 '<span class="fa fa-file"></span>&nbsp; sources</li>',
                 output_text)
@@ -5441,21 +5401,6 @@ index 0000000..fb7093d
             'href="/test/diff/master..master">Open Pull-Request',
             output_text)
 
-    def test_open_pr_button(self):
-        """ Test "Open Pull-Request" button on non-empty project. """
-
-        tests.create_projects(self.session)
-        tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True)
-        path = os.path.join(self.path, 'repos', 'test.git')
-        tests.add_content_git_repo(path)
-
-        output = self.app.get('/test')
-        self.assertEqual(output.status_code, 200)
-        output_text = output.get_data(as_text=True)
-        self.assertNotIn('<p>This repo is brand new!</p>', output_text)
-        self.assertIn(
-            'href="/test/diff/master..master">Open Pull-Request',
-            output_text)
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/tests/test_pagure_flask_ui_repo_flag_commit.py b/tests/test_pagure_flask_ui_repo_flag_commit.py
index fefe735..695afbc 100644
--- a/tests/test_pagure_flask_ui_repo_flag_commit.py
+++ b/tests/test_pagure_flask_ui_repo_flag_commit.py
@@ -55,11 +55,11 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
         self.assertIn('  Merged by Alice Author\n', output.get_data(as_text=True))
         self.assertIn('  Committed by Cecil Committer\n', output.get_data(as_text=True))
         self.assertIn('''<section class="list-group" id="flag_list">
-  <div class="card" id="pr_flags">
-      <ul class="list-group list-group-flush">
-      </ul>
-    </div>
-</section>''', output.get_data(as_text=True))
+      <div class="card" id="pr_flags">
+          <ul class="list-group list-group-flush">
+          </ul>
+        </div>
+    </section>''', output.get_data(as_text=True))
 
     def test_view_commit_pending_flag(self):
         """ Test the view_commit endpoint with a pending flag. """
@@ -84,23 +84,25 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
         # View first commit
         output = self.app.get('/test/c/%s' % self.commit.oid.hex)
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
             '<title>Commit - test - %s - Pagure</title>' % self.commit.oid.hex,
-            output.get_data(as_text=True))
+            output_text)
         self.assertIn(
             '<div class="list-group" id="diff_list" style="display:none;">',
-            output.get_data(as_text=True))
-        self.assertIn('  Merged by Alice Author\n', output.get_data(as_text=True))
-        self.assertIn('  Committed by Cecil Committer\n', output.get_data(as_text=True))
+            output_text)
+        self.assertIn('  Merged by Alice Author\n', output_text)
+        self.assertIn('  Committed by Cecil Committer\n', output_text)
         self.assertIn(
-            '<span>\n                <a href="https://koji.fp.o/koji...">'
-            'simple-koji-ci</a>\n              </span>', output.get_data(as_text=True))
+            '<span>\n                    <a '
+            'href="https://koji.fp.o/koji...">simple-koji-ci</a>'
+            '\n                  </span>', output_text)
         self.assertIn(
-            '<div class="pull-xs-right">\n                '
-            '<span class="label label-info">pending'
-            '</span>\n              </div>', output.get_data(as_text=True))
+            '<div class="pull-xs-right">\n                    '
+            '<span class="label label-info">pending</span>'
+            '\n                  </div>', output_text)
         self.assertIn(
-            '<span>Build is running</span>', output.get_data(as_text=True))
+            '<span>Build is running</span>', output_text)
 
     def test_view_commit_success_flag(self):
         """ Test the view_commit endpoint with a successful flag. """
@@ -125,23 +127,25 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
         # View first commit
         output = self.app.get('/test/c/%s' % self.commit.oid.hex)
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
             '<title>Commit - test - %s - Pagure</title>' % self.commit.oid.hex,
-            output.get_data(as_text=True))
+            output_text)
         self.assertIn(
             '<div class="list-group" id="diff_list" style="display:none;">',
-            output.get_data(as_text=True))
-        self.assertIn('  Merged by Alice Author\n', output.get_data(as_text=True))
-        self.assertIn('  Committed by Cecil Committer\n', output.get_data(as_text=True))
+            output_text)
+        self.assertIn('  Merged by Alice Author\n', output_text)
+        self.assertIn('  Committed by Cecil Committer\n', output_text)
         self.assertIn(
-            '<span>\n                <a href="https://koji.fp.o/koji...">'
-            'simple-koji-ci</a>\n              </span>', output.get_data(as_text=True))
+            '<span>\n                    <a '
+            'href="https://koji.fp.o/koji...">simple-koji-ci</a>'
+            '\n                  </span>', output_text)
         self.assertIn(
-            '<div class="pull-xs-right">\n                '
-            '<span class="label label-success">success (100%)'
-            '</span>\n              </div>', output.get_data(as_text=True))
+            '<div class="pull-xs-right">\n                    '
+            '<span class="label label-success">success (100%)</span>'
+            '\n                  </div>', output_text)
         self.assertIn(
-            '<span>Build passed</span>', output.get_data(as_text=True))
+            '<span>Build passed</span>', output_text)
 
     def test_view_commit_error_flag(self):
         """ Test the view_commit endpoint with a error flag. """
@@ -166,23 +170,25 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
         # View first commit
         output = self.app.get('/test/c/%s' % self.commit.oid.hex)
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
             '<title>Commit - test - %s - Pagure</title>' % self.commit.oid.hex,
-            output.get_data(as_text=True))
+            output_text)
         self.assertIn(
             '<div class="list-group" id="diff_list" style="display:none;">',
-            output.get_data(as_text=True))
-        self.assertIn('  Merged by Alice Author\n', output.get_data(as_text=True))
-        self.assertIn('  Committed by Cecil Committer\n', output.get_data(as_text=True))
+            output_text)
+        self.assertIn('  Merged by Alice Author\n', output_text)
+        self.assertIn('  Committed by Cecil Committer\n', output_text)
         self.assertIn(
-            '<span>\n                <a href="https://koji.fp.o/koji...">'
-            'simple-koji-ci</a>\n              </span>', output.get_data(as_text=True))
+            '<span>\n                    <a '
+            'href="https://koji.fp.o/koji...">simple-koji-ci</a>'
+            '\n                  </span>', output_text)
         self.assertIn(
-            '<div class="pull-xs-right">\n                '
-            '<span class="label label-danger">error'
-            '</span>\n              </div>', output.get_data(as_text=True))
+            '<div class="pull-xs-right">\n                    '
+            '<span class="label label-danger">error</span>'
+            '\n                  </div>', output_text)
         self.assertIn(
-            '<span>Build errored</span>', output.get_data(as_text=True))
+            '<span>Build errored</span>', output_text)
 
     def test_view_commit_failure_flag(self):
         """ Test the view_commit endpoint with a failure flag. """
@@ -207,23 +213,24 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
         # View first commit
         output = self.app.get('/test/c/%s' % self.commit.oid.hex)
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
             '<title>Commit - test - %s - Pagure</title>' % self.commit.oid.hex,
-            output.get_data(as_text=True))
+            output_text)
         self.assertIn(
             '<div class="list-group" id="diff_list" style="display:none;">',
-            output.get_data(as_text=True))
-        self.assertIn('  Merged by Alice Author\n', output.get_data(as_text=True))
-        self.assertIn('  Committed by Cecil Committer\n', output.get_data(as_text=True))
+            output_text)
+        self.assertIn('  Merged by Alice Author\n', output_text)
+        self.assertIn('  Committed by Cecil Committer\n', output_text)
         self.assertIn(
-            '<span>\n                <a href="https://koji.fp.o/koji...">'
-            'simple-koji-ci</a>\n              </span>', output.get_data(as_text=True))
+            '<span>\n                    <a href="https://koji.fp.o/koji...">'
+            'simple-koji-ci</a>\n                  </span>', output_text)
         self.assertIn(
-            '<div class="pull-xs-right">\n                '
-            '<span class="label label-danger">failure'
-            '</span>\n              </div>', output.get_data(as_text=True))
+            '<div class="pull-xs-right">\n                    '
+            '<span class="label label-danger">failure</span>'
+            '\n                  </div>', output_text)
         self.assertIn(
-            '<span>Build failed</span>', output.get_data(as_text=True))
+            '<span>Build failed</span>', output_text)
 
     def test_view_commit_canceled_flag(self):
         """ Test the view_commit endpoint with a canceled flag. """
@@ -248,23 +255,24 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
         # View first commit
         output = self.app.get('/test/c/%s' % self.commit.oid.hex)
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
             '<title>Commit - test - %s - Pagure</title>' % self.commit.oid.hex,
-            output.get_data(as_text=True))
+            output_text)
         self.assertIn(
             '<div class="list-group" id="diff_list" style="display:none;">',
-            output.get_data(as_text=True))
-        self.assertIn('  Merged by Alice Author\n', output.get_data(as_text=True))
-        self.assertIn('  Committed by Cecil Committer\n', output.get_data(as_text=True))
+            output_text)
+        self.assertIn('  Merged by Alice Author\n', output_text)
+        self.assertIn('  Committed by Cecil Committer\n', output_text)
         self.assertIn(
-            '<span>\n                <a href="https://koji.fp.o/koji...">'
-            'simple-koji-ci</a>\n              </span>', output.get_data(as_text=True))
+            '<span>\n                    <a href="https://koji.fp.o/koji...">'
+            'simple-koji-ci</a>\n                  </span>', output_text)
         self.assertIn(
-            '<div class="pull-xs-right">\n                '
-            '<span class="label label-warning">canceled'
-            '</span>\n              </div>', output.get_data(as_text=True))
+            '<div class="pull-xs-right">\n                    '
+            '<span class="label label-warning">canceled</span>'
+            '\n                  </div>', output_text)
         self.assertIn(
-            '<span>Build canceled</span>', output.get_data(as_text=True))
+            '<span>Build canceled</span>', output_text)
 
     @patch.dict('pagure.config.config',
                 {
@@ -297,23 +305,24 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
         # View first commit
         output = self.app.get('/test/c/%s' % self.commit.oid.hex)
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
             '<title>Commit - test - %s - Pagure</title>' % self.commit.oid.hex,
-            output.get_data(as_text=True))
+            output_text)
         self.assertIn(
             '<div class="list-group" id="diff_list" style="display:none;">',
-            output.get_data(as_text=True))
-        self.assertIn('  Merged by Alice Author\n', output.get_data(as_text=True))
-        self.assertIn('  Committed by Cecil Committer\n', output.get_data(as_text=True))
+            output_text)
+        self.assertIn('  Merged by Alice Author\n', output_text)
+        self.assertIn('  Committed by Cecil Committer\n', output_text)
         self.assertIn(
-            '<span>\n                <a href="https://koji.fp.o/koji...">'
-            'simple-koji-ci</a>\n              </span>', output.get_data(as_text=True))
+            '<span>\n                    <a href="https://koji.fp.o/koji...">'
+            'simple-koji-ci</a>\n                  </span>', output_text)
         self.assertIn(
-            '<div class="pull-xs-right">\n                '
-            '<span class="label label-warning">status1'
-            '</span>\n              </div>', output.get_data(as_text=True))
+            '<div class="pull-xs-right">\n                    '
+            '<span class="label label-warning">status1</span>'
+            '\n                  </div>', output_text)
         self.assertIn(
-            '<span>Build canceled</span>', output.get_data(as_text=True))
+            '<span>Build canceled</span>', output_text)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_pagure_flask_ui_repo_milestones.py b/tests/test_pagure_flask_ui_repo_milestones.py
index 80f0402..5de5684 100644
--- a/tests/test_pagure_flask_ui_repo_milestones.py
+++ b/tests/test_pagure_flask_ui_repo_milestones.py
@@ -78,12 +78,10 @@ class PagureFlaskRepoMilestonestests(tests.Modeltests):
                     value="" class="form-control"/>
                 </div>
                 <div class="col-sm-2 p-r-0" >
-                    <span class="oi milestone_order_up"
-                        data-stone="1"
-                        data-glyph="arrow-thick-top"></span>
-                    <span class="oi milestone_order_bottom"
-                        data-stone="1"
-                        data-glyph="arrow-thick-bottom"></span>
+                    <span class="fa fa-long-arrow-up milestone_order_up"
+                        data-stone="1"></span>
+                    <span class="fa fa-long-arrow-down milestone_order_bottom"
+                        data-stone="1"></span>
                 </div>
                 <div class="col-sm-1 p-r-0" >
                     <input type="checkbox" name="active_milestone_1" checked />
diff --git a/tests/test_pagure_flask_ui_repo_slash_name.py b/tests/test_pagure_flask_ui_repo_slash_name.py
index 1a78abe..26473a7 100644
--- a/tests/test_pagure_flask_ui_repo_slash_name.py
+++ b/tests/test_pagure_flask_ui_repo_slash_name.py
@@ -97,8 +97,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<div class="card-block">\n              '
-            '<h5><strong>Source GIT URLs</strong></h5>', output_text)
+            '<input class="form-control bg-white" type="text" '
+            'value="git://pagure.org/test.git" readonly>', output_text)
         self.assertIn(
             '<p>The Project Creator has not pushed any code yet</p>',
             output_text)
@@ -141,8 +141,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<div class="card-block">\n              '
-            '<h5><strong>Source GIT URLs</strong></h5>', output_text)
+            '<input class="form-control bg-white" type="text" '
+            'value="git://pagure.org/forks/test.git" readonly>', output_text)
         self.assertIn(
             '<p>The Project Creator has not pushed any code yet</p>',
             output_text)
@@ -175,8 +175,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<div class="card-block">\n              '
-            '<h5><strong>Source GIT URLs</strong></h5>', output_text)
+            '<input class="form-control bg-white" type="text" '
+            'value="git://pagure.org/test.git" readonly>', output_text)
 
         # We can't create the project `forks/test` the normal way
         self.assertRaises(
@@ -215,9 +215,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<div class="card-block">\n              '
-            '<h5><strong>Source GIT URLs</strong></h5>', output_text)
-        self.assertIn('Add sources file for testing', output_text)
+            '<input class="form-control bg-white" type="text" '
+            'value="git://pagure.org/forks/test.git" readonly>', output_text)
         self.assertIn(
             '<title>Overview - forks/test - Pagure</title>', output_text)
 
@@ -249,9 +248,6 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn('<title>Commit - forks/test ', output_text)
-        self.assertIn(
-            '<span class="label label-success">+2</span>          </span>',
-            output_text)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_pagure_flask_ui_repo_view_file.py b/tests/test_pagure_flask_ui_repo_view_file.py
index f842cca..a79b7cc 100644
--- a/tests/test_pagure_flask_ui_repo_view_file.py
+++ b/tests/test_pagure_flask_ui_repo_view_file.py
@@ -184,7 +184,7 @@ class PagureFlaskRepoViewFiletests(LocalBasetests):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<span class="oi text-muted" data-glyph="folder"></span>',
+            '<span class="fa fa-folder text-muted"></span>',
             output_text)
         self.assertIn('<title>Tree - test - Pagure</title>', output_text)
         self.assertIn(
@@ -198,10 +198,10 @@ class PagureFlaskRepoViewFiletests(LocalBasetests):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<li><a href="/test/blob/master/f/folder1/folder2">\n'
-            '            <span class="oi" data-glyph="folder">'
-            '</span>&nbsp; folder2</a>\n'
-            '          </li>', output_text)
+            '<li class="breadcrumb-item"><a '
+            'href="/test/blob/master/f/folder1/folder2">\n            '
+            '<span class="fa fa-folder"></span>&nbsp; folder2</a>'
+            '\n          </li>', output_text)
 
     def test_view_file_non_ascii_file(self):
         """ Test the view_file with a non-ascii file name. """
@@ -312,9 +312,10 @@ class PagureFlaskRepoViewFileForktests(LocalBasetests):
             '/fork/pingou/test/blob/master/f/folder1/folder2/file')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<li><a href="/fork/pingou/test/blob/master/f/folder1/folder2">\n'
-            '            <span class="oi" data-glyph="folder"></span>&nbsp; '
-            'folder2</a>\n          </li>', output.get_data(as_text=True))
+            '<li class="breadcrumb-item"><a '
+            'href="/fork/pingou/test/blob/master/f/folder1/folder2">'
+            '\n            <span class="fa fa-folder"></span>&nbsp; folder2'
+            '</a>\n          </li>', output.get_data(as_text=True))
 
     def test_view_file_in_branch_in_fork(self):
         """ Test the view_file in a specific branch of a fork. """
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index b352cf9..cb5d84a 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -168,7 +168,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
 
             csrf_token = output_text.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -184,7 +186,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the result of the action -- None, no CSRF
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.milestones, {})
@@ -201,7 +205,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn('Milestones updated', output_text)
             # Check the result of the action -- Milestones recorded
             self.session.commit()
@@ -221,7 +227,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn('Milestones updated', output_text)
             # Check the result of the action -- Milestones recorded
             self.session.commit()
@@ -249,7 +257,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             # Check the result of the action -- Milestones un-changed
             self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
@@ -276,7 +286,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n'
                 '                      Milestone v2.0 is present 2 times',
@@ -307,7 +319,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn(
                 '</button>\n'
                 '                      Milestones updated',
@@ -381,7 +395,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn('Milestones updated', output_text)
             # Check the result of the action -- Milestones recorded
             self.session.commit()
@@ -436,7 +452,9 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             # Check the redirect
             self.assertIn(
                 '<title>Settings - test - Pagure</title>', output_text)
-            self.assertIn('<h3>Settings for test</h3>', output_text)
+            self.assertIn(
+                '<h5 class="pl-2 font-weight-bold text-muted">'
+                'Project Settings</h5>\n', output_text)
             self.assertIn('Milestones updated', output_text)
             # Check the result of the action -- Milestones recorded
             self.session.commit()
@@ -522,28 +540,40 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         output = self.app.get('/test/roadmap')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn('<th>v2.0', output_text)
-        self.assertIn('<th>unplanned', output_text)
+        self.assertIn(
+            'title="Filter issues by milestone">\n        v2.0</a>',
+            output_text)
+        self.assertIn(
+            'title="Filter issues by milestone">\n        unplanned</a>',
+            output_text)
         self.assertEqual(
-            output_text.count('<span class="label label-default">#'), 4)
+            output_text.count('<span class="badge badge-secondary">#'), 4)
 
         # test the roadmap view for all milestones
         output = self.app.get('/test/roadmap?all_stones=True&status=All')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn('<th>v1.0', output_text)
-        self.assertIn('<th>v2.0', output_text)
-        self.assertIn('<th>unplanned', output_text)
+        self.assertIn(
+            'title="Filter issues by milestone">\n        v1.0</a>',
+            output_text)
+        self.assertIn(
+            'title="Filter issues by milestone">\n        v2.0</a>',
+            output_text)
+        self.assertIn(
+            'title="Filter issues by milestone">\n        unplanned</a>',
+            output_text)
         self.assertEqual(
-            output_text.count('<span class="label label-default">#'), 6)
+            output_text.count('<span class="badge badge-secondary">#'), 6)
 
         # test the roadmap view for a specific milestone
         output = self.app.get('/test/roadmap?milestone=v2.0')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn('<th>v2.0', output_text)
+        self.assertIn(
+            'title="Filter issues by milestone">\n        v2.0</a>',
+            output_text)
         self.assertEqual(
-            output_text.count('<span class="label label-default">#'), 2)
+            output_text.count('<span class="badge badge-secondary">#'), 2)
 
         # test the roadmap view for a specific milestone - open
         output = self.app.get('/test/roadmap?milestone=v1.0')
@@ -551,16 +581,18 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertIn('No issues found', output_text)
         self.assertEqual(
-            output_text.count('<span class="label label-default">#'), 0)
+            output_text.count('<span class="badge badge-secondary">#'), 0)
 
         # test the roadmap view for a specific milestone - closed
         output = self.app.get(
             '/test/roadmap?milestone=v1.0&status=All&all_stones=True')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn('<th>v1.0', output_text)
+        self.assertIn(
+            'title="Filter issues by milestone">\n        v1.0</a>',
+            output_text)
         self.assertEqual(
-            output_text.count('<span class="label label-default">#'), 2)
+            output_text.count('<span class="badge badge-secondary">#'), 2)
 
         # test the roadmap view for a specific tag
         output = self.app.get('/test/roadmap?milestone=v2.0&tag=unknown')
@@ -568,7 +600,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertIn('No issues found', output_text)
         self.assertEqual(
-            output_text.count('<span class="label label-default">#'), 0)
+            output_text.count('<span class="badge badge-secondary">#'), 0)
 
         # test the roadmap view for errors
         output = self.app.get('/foo/roadmap')
diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py
index fe2c78f..c9884a2 100644
--- a/tests/test_pagure_flask_ui_slash_branch_name.py
+++ b/tests/test_pagure_flask_ui_slash_branch_name.py
@@ -120,11 +120,12 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         # With git repo
         output = self.app.get('/test')
         self.assertEqual(output.status_code, 200)
+        output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<div class="card-block">\n              '
-            '<h5><strong>Source GIT URLs</strong></h5>',
-            output.get_data(as_text=True))
+            '<input class="form-control bg-white" type="text" '
+            'value="git://pagure.org/test.git" readonly>', output_text)
 
+    '''
     @patch('pagure.lib.notify.send_email')
     def test_view_repo_branch(self, send_email):
         """ Test the view_repo_branch endpoint when the git repo has no
@@ -144,8 +145,9 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<div class="card-block">\n              '
-            '<h5><strong>Source GIT URLs</strong></h5>', output_text)
+            '<input class="form-control bg-white" type="text" '
+            'value="git://pagure.org/test.git" readonly>', output_text)
+    '''
 
     @patch('pagure.lib.notify.send_email')
     def test_view_commits(self, send_email):
@@ -192,16 +194,15 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         output = self.app.get('/test/blob/master/f/sources')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '''
-        <ol class="breadcrumb">
-          <li>
+            '''<ol class="breadcrumb">
+          <li class="breadcrumb-item">
             <a href="/test/tree/master">
-              <span class="oi" data-glyph="random">
+              <span class="fa fa-random">
               </span>&nbsp; master
             </a>
           </li>
-          <li class="active">
-            <span class="oi" data-glyph="file">
+          <li class="active breadcrumb-item">
+            <span class="fa fa-file" data-glyph="">
             </span>&nbsp; sources
           </li>
         </ol>''', output.get_data(as_text=True))
@@ -213,16 +214,15 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '''
-        <ol class="breadcrumb">
-          <li>
+            '''<ol class="breadcrumb">
+          <li class="breadcrumb-item">
             <a href="/test/tree/maxamilion/feature">
-              <span class="oi" data-glyph="random">
+              <span class="fa fa-random">
               </span>&nbsp; maxamilion/feature
             </a>
           </li>
-          <li class="active">
-            <span class="oi" data-glyph="file">
+          <li class="active breadcrumb-item">
+            <span class="fa fa-file" data-glyph="">
             </span>&nbsp; .gitignore
           </li>
         </ol>''', output_text)
@@ -291,21 +291,21 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn('<a href="/test/blob/master/f/sources">', output_text)
         self.assertEqual(
-            output_text.count('<span class="oi text-muted" data-glyph="file">'), 1)
+            output_text.count('<span class="oi red-icon" data-glyph="file"'), 1)
 
         output = self.app.get('/test/tree/master/sources')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn('<a href="/test/blob/master/f/sources">', output_text)
         self.assertEqual(
-            output_text.count('<span class="oi text-muted" data-glyph="file">'), 1)
+            output_text.count('<span class="oi red-icon" data-glyph="file"'), 1)
 
         output = self.app.get('/test/tree/feature')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn('<a href="/test/blob/master/f/sources">', output_text)
         self.assertEqual(
-            output_text.count('<span class="oi text-muted" data-glyph="file">'), 1)
+            output_text.count('<span class="oi red-icon" data-glyph="file"'), 1)
 
         output = self.app.get('/test/tree/maxamilion/feature')
         self.assertEqual(output.status_code, 200)
@@ -314,7 +314,7 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
             '<a href="/test/blob/maxamilion/feature/f/sources">',
             output_text)
         self.assertEqual(
-            output_text.count('<span class="oi text-muted" data-glyph="file">'), 2)
+            output_text.count('<span class="oi red-icon" data-glyph="file"'), 1)
 
         # Wrong identifier, back onto master
         output = self.app.get('/test/tree/maxamilion/feature/f/.gitignore')
@@ -322,7 +322,7 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn('<a href="/test/blob/master/f/sources">', output_text)
         self.assertEqual(
-            output_text.count('<span class="oi text-muted" data-glyph="file">'), 1)
+            output_text.count('<span class="oi red-icon" data-glyph="file"'), 1)
 
     @patch('pagure.lib.notify.send_email')
     def test_new_request_pull(self, send_email):