diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index b377a28..fcd5ded 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -185,7 +185,9 @@ class PagureFlaskApptests(tests.Modeltests):
             data['csrf_token'] =  csrf_token
             output = self.app.post('/new/', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>Project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\nProject #1        </div>',
+                output.data)
             self.assertIn(
                 '</button>\n                      Project &#34;project-1&#34; created',
                 output.data)
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index ca42902..bd34b53 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -128,12 +128,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '</button>\n                      Issue created', output.data)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
         # Project w/o issue tracker
         repo = pagure.lib.get_project(self.session, 'test')
@@ -188,12 +187,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '</button>\n                      Issue created', output.data)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
         # Project w/o issue tracker
         repo = pagure.lib.get_project(self.session, 'test')
@@ -231,7 +229,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
 
         output = self.app.get('/test/issues')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            'div class="projectinfo m-t-1 m-b-1">\ntest project #1        '
+            '</div>', output.data)
         self.assertTrue(
             '<h2 class="p-b-1">\n      0 Open Issues' in output.data)
 
@@ -251,27 +251,21 @@ class PagureFlaskIssuestests(tests.Modeltests):
         # Whole list
         output = self.app.get('/test/issues')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+        self.assertIn('<title>Issues - test - Pagure</title>', output.data)
         self.assertTrue(
             '<h2 class="p-b-1">\n      1 Open Issues' in output.data)
 
         # Status = closed
         output = self.app.get('/test/issues?status=cloSED')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+        self.assertIn('<title>Issues - test - Pagure</title>', output.data)
         self.assertTrue(
             '<h2 class="p-b-1">\n      0 Closed Issues' in output.data)
 
         # Status = fixed
         output = self.app.get('/test/issues?status=fixed')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+        self.assertIn('<title>Issues - test - Pagure</title>', output.data)
         self.assertTrue(
             '<h2 class="p-b-1">\n      0 Closed Issues' in output.data)
 
@@ -314,9 +308,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
 
         output = self.app.get('/test/issue/1')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+        self.assertIn(
+            '<a class="btn btn-secondary btn-sm" href="/test/issue/1/edit">',
+            output.data)
         self.assertTrue(
             '<p><a href="/login/?next=http%3A%2F%2Flocalhost%2Ftest%2Fissue%2F1'
             '">Login</a> to comment on this ticket.</p>'
@@ -326,9 +320,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+            '<a class="btn btn-secondary btn-sm" href="/test/issue/1/edit">',
+            output.data)
             self.assertFalse(
                 '<p><a href="/login/">Login</a> to comment on this ticket.</p>'
                 in output.data)
@@ -337,9 +331,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -373,9 +367,14 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/2')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #2 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<span class="oi red-icon" data-glyph="lock-locked" '
+                'title="Private issue"></span>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/2/edit">', output.data)
 
         # Project w/o issue tracker
         repo = pagure.lib.get_project(self.session, 'test')
@@ -419,9 +418,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -441,9 +442,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertFalse(
                 '<option selected value="Fixed">Fixed</option>'
                 in output.data)
@@ -452,9 +455,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertFalse(
                 '<option selected value="Fixed">Fixed</option>'
                 in output.data)
@@ -463,9 +468,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Successfully edited issue #1',
                 output.data)
@@ -482,9 +489,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Comment added',
                 output.data)
@@ -508,9 +517,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Tag added: tag2',
                 output.data)
@@ -534,9 +545,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      No user &#34;ralph&#34; found',
                 output.data)
@@ -557,9 +570,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Issue assigned',
                 output.data)
@@ -603,9 +618,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/2/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #2 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/2/edit">', output.data)
             self.assertIn(
                 '</button>\n                      You cannot close a ticket '
                 'that has ticket depending that are still open.',
@@ -676,9 +693,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -691,9 +710,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Comment added',
                 output.data)
@@ -730,9 +751,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Comment removed',
                 output.data)
@@ -785,9 +808,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -800,9 +825,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Dependency added',
                 output.data)
@@ -815,9 +842,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertNotIn(
                 '</button>\n                      Dependency added', output.data)
 
@@ -865,9 +894,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -880,9 +911,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Dependency added',
                 output.data)
@@ -895,9 +928,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertNotIn(
                 '</button>\n                      Dependency added',
                 output.data)
@@ -936,9 +971,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -1256,9 +1293,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/tag/tag1/edit', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Settings - test - Pagure</title>', output.data)
             self.assertIn(
                 '</button>\n                      Edited tag: tag1 to tag2',
                 output.data)
@@ -1451,9 +1487,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -1466,9 +1504,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Comment added',
                 output.data)
@@ -1507,9 +1547,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Comment updated',
                 output.data)
@@ -1521,9 +1563,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
 
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/issue/1/comment/1/edit')
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>test - Pagure</title>', output.data)
             self.assertTrue('<div id="edit">' in output.data)
             self.assertTrue('<section class="edit_comment">' in output.data)
             self.assertTrue(
@@ -1542,9 +1583,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 data=data,
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue(
-                '<p>test project<a href="/test/issue/1"> #1</a></p>'
-                in output.data)
+            self.assertIn(
+                '<title>Issue #1 - test - Pagure</title>', output.data)
+            self.assertIn(
+                '<a class="btn btn-secondary btn-sm" '
+                'href="/test/issue/1/edit">', output.data)
             self.assertIn(
                 '</button>\n                      Comment updated',
                 output.data)
diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py
index c05deae..1a2cc91 100644
--- a/tests/test_pagure_flask_ui_plugins_fedmsg.py
+++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py
@@ -59,7 +59,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/settings/Fedmsg')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -72,7 +74,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
 
             output = self.app.post('/test/settings/Fedmsg', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -99,7 +103,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
                 '</button>\n                      Hook Fedmsg inactived',
                 output.data)
             output = self.app.get('/test/settings/Fedmsg', data=data)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertIn('<h3>Fedmsg settings</h3>', output.data)
             self.assertIn(
                 '<input id="active" name="active" type="checkbox" value="y">',
@@ -125,7 +131,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
                 output.data)
             output = self.app.get('/test/settings/Fedmsg', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
@@ -147,7 +155,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
                 output.data)
             output = self.app.get('/test/settings/Fedmsg', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
diff --git a/tests/test_pagure_flask_ui_plugins_irc.py b/tests/test_pagure_flask_ui_plugins_irc.py
index f81f8b3..3a7d818 100644
--- a/tests/test_pagure_flask_ui_plugins_irc.py
+++ b/tests/test_pagure_flask_ui_plugins_irc.py
@@ -59,7 +59,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -72,7 +74,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
 
             output = self.app.post('/test/settings/IRC', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -100,7 +104,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -129,7 +135,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
@@ -151,7 +159,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
diff --git a/tests/test_pagure_flask_ui_plugins_mail.py b/tests/test_pagure_flask_ui_plugins_mail.py
index b786209..ee84d32 100644
--- a/tests/test_pagure_flask_ui_plugins_mail.py
+++ b/tests/test_pagure_flask_ui_plugins_mail.py
@@ -59,7 +59,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/settings/Mail')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
@@ -75,7 +77,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
 
             output = self.app.post('/test/settings/Mail', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
@@ -103,7 +107,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
 
             output = self.app.get('/test/settings/Mail')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
@@ -121,7 +127,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertFalse(
                 '</button>\n                      Hook activated' in output.data)
@@ -153,7 +161,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
                 '</button>\n                      Hook Mail activated' in output.data)
 
             output = self.app.get('/test/settings/Mail')
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
@@ -177,7 +187,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
                 '</button>\n                      Hook Mail inactived' in output.data)
 
             output = self.app.get('/test/settings/Mail')
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
index e8a0265..a4b7c2f 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
@@ -61,7 +61,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -74,7 +76,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
 
             output = self.app.post('/test/settings/pagure', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -102,7 +106,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -129,7 +135,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
@@ -152,7 +160,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
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 e04d5eb..d470c78 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
@@ -59,7 +59,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/settings/pagure requests')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -72,7 +74,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
 
             output = self.app.post('/test/settings/pagure requests', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -101,7 +105,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure requests')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -130,7 +136,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure requests')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
@@ -155,7 +163,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure requests')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
index c8efa80..32ec8c8 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
@@ -59,7 +59,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/test/settings/pagure tickets')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -72,7 +74,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
 
             output = self.app.post('/test/settings/pagure tickets', data=data)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -101,7 +105,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure tickets')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
@@ -130,7 +136,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure tickets')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
@@ -155,7 +163,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
 
             output = self.app.get('/test/settings/pagure tickets')
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<p>test project #1</p>' in output.data)
+            self.assertIn(
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index f5e2f59..df69fe8 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -444,8 +444,8 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn(
                 '<title>Overview - test - Pagure</title>', output.data)
             self.assertIn(
-                '<div class="projectinfo m-t-1">\n<p>test project #1</p></div>',
-                output.data)
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertIn(
                 '</button>\n                      Edited successfully '
                 'settings of repo: test', output.data)
@@ -474,8 +474,8 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn(
                 '<title>Overview - test - Pagure</title>', output.data)
             self.assertIn(
-                '<div class="projectinfo m-t-1">\n<p>test project #1</p></div>',
-                output.data)
+                '<div class="projectinfo m-t-1 m-b-1">\n'
+                'test project #1        </div>', output.data)
             self.assertIn(
                 '</button>\n                      Edited successfully '
                 'settings of repo: test', output.data)
@@ -524,7 +524,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/test')
         self.assertEqual(output.status_code, 200)
         self.assertTrue('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
 
         # Add some content to the git repo
         tests.add_content_git_repo(os.path.join(tests.HERE, 'test.git'))
@@ -534,7 +536,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         self.assertFalse('<p>This repo is brand new!</p>' in output.data)
         self.assertFalse('Forked from' in output.data)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
 
         # Turn that repo into a fork
         repo = pagure.lib.get_project(self.session, 'test')
@@ -555,7 +559,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/fork/pingou/test')
         self.assertEqual(output.status_code, 200)
         self.assertFalse('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
         self.assertTrue('Forked from' in output.data)
 
         # Add a fork of a fork
@@ -580,7 +586,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/fork/pingou/test3')
         self.assertEqual(output.status_code, 200)
         self.assertFalse('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue('<p>test project #3</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #3        </div>', output.data)
         self.assertTrue('Forked from' in output.data)
 
     def test_view_repo_empty(self):
@@ -623,7 +631,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         self.assertFalse('<p>This repo is brand new!</p>' in output.data)
         self.assertFalse('Forked from' in output.data)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
         self.assertEqual(
             output.data.count('<span class="commitid">'), 0)
 
@@ -655,7 +665,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         self.assertFalse('<p>This repo is brand new!</p>' in output.data)
         self.assertFalse('Forked from' in output.data)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
 
         # Turn that repo into a fork
         repo = pagure.lib.get_project(self.session, 'test')
@@ -676,7 +688,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/fork/pingou/test/branch/master')
         self.assertEqual(output.status_code, 200)
         self.assertFalse('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
         self.assertTrue('Forked from' in output.data)
 
         # Add a fork of a fork
@@ -701,7 +715,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/fork/pingou/test3/branch/master')
         self.assertEqual(output.status_code, 200)
         self.assertFalse('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue('<p>test project #3</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #3        </div>', output.data)
         self.assertTrue('Forked from' in output.data)
 
     def test_view_commits(self):
@@ -721,7 +737,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/test/commits')
         self.assertEqual(output.status_code, 200)
         self.assertIn('<p>This repo is brand new!</p>', output.data)
-        self.assertIn('<p>test project #1</p>', output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
 
         # Add some content to the git repo
         tests.add_content_git_repo(os.path.join(tests.HERE, 'test.git'))
@@ -731,14 +749,18 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         self.assertNotIn('<p>This repo is brand new!</p>', output.data)
         self.assertNotIn('Forked from', output.data)
-        self.assertIn('<p>test project #1</p>', output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
         self.assertIn('<title>Logs - test - Pagure</title>', output.data)
 
         output = self.app.get('/test/commits/master')
         self.assertEqual(output.status_code, 200)
         self.assertNotIn('<p>This repo is brand new!</p>', output.data)
         self.assertNotIn('Forked from', output.data)
-        self.assertIn('<p>test project #1</p>', output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
 
         # Turn that repo into a fork
         repo = pagure.lib.get_project(self.session, 'test')
@@ -759,7 +781,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/fork/pingou/test/commits?page=abc')
         self.assertEqual(output.status_code, 200)
         self.assertNotIn('<p>This repo is brand new!</p>', output.data)
-        self.assertIn('<p>test project #1</p>', output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
         self.assertIn('Forked from', output.data)
 
         # Add a fork of a fork
@@ -787,7 +811,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/fork/pingou/test3/commits')
         self.assertEqual(output.status_code, 200)
         self.assertNotIn('<p>This repo is brand new!</p>', output.data)
-        self.assertIn('<p>test project #3</p>', output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #3        </div>', output.data)
         self.assertIn('Forked from', output.data)
 
     def test_view_file(self):
@@ -1260,7 +1286,9 @@ index 0000000..fb7093d
         # View first commit
         output = self.app.get('/test/tree/%s' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
         self.assertIn('<title>Tree - test - Pagure</title>', output.data)
         self.assertTrue('README.rst' in output.data)
         self.assertFalse(
@@ -1269,7 +1297,9 @@ index 0000000..fb7093d
         # View tree by branch
         output = self.app.get('/test/tree/master')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue('<p>test project #1</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #1        </div>', output.data)
         self.assertIn('<title>Tree - test - Pagure</title>', output.data)
         self.assertTrue('README.rst' in output.data)
         self.assertFalse(
@@ -1291,7 +1321,9 @@ index 0000000..fb7093d
 
         output = self.app.get('/fork/pingou/test3/tree/')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue('<p>test project #3</p>' in output.data)
+        self.assertIn(
+            '<div class="projectinfo m-t-1 m-b-1">\n'
+            'test project #3        </div>', output.data)
         self.assertIn('<title>Tree - test3 - Pagure</title>', output.data)
         self.assertTrue(
             '<a href="/fork/pingou/test3/blob/master/f/folder1">'
diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py
index 2467395..84f3fe8 100644
--- a/tests/test_pagure_flask_ui_slash_branch_name.py
+++ b/tests/test_pagure_flask_ui_slash_branch_name.py
@@ -141,7 +141,8 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         output = self.app.get('/test')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<div class="card-block">            <h4>Admins</h4>', output.data)
+            '<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)
@@ -164,7 +165,8 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         output = self.app.get('/test/branch/maxamilion/feature')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<div class="card-block">            <h4>Admins</h4>', output.data)
+            '<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)