diff --git a/tests/test_progit_flask_ui_app.py b/tests/test_progit_flask_ui_app.py
index 493da7d..395717f 100644
--- a/tests/test_progit_flask_ui_app.py
+++ b/tests/test_progit_flask_ui_app.py
@@ -77,19 +77,21 @@ class PagureFlaskApptests(tests.Modeltests):
         self.session.add(item)
         self.session.commit()
 
-        user = tests.FakeUser()
+        user = tests.FakeUser(username='foo')
         with tests.user_set(pagure.APP, user):
             output = self.app.get('/?repopage=abc&forkpage=def')
             self.assertIn(
-                'My Projects <span class="label label-default">0</span>',
+                'Projects <span class="label label-default">1</span>',
                 output.data)
             self.assertIn(
-                'My Forks <span class="label label-default">0</span>',
+                'Forks <span class="label label-default">0</span>',
                 output.data)
             self.assertEqual(
-                output.data.count('<p>No projects found</p>'), 2)
+                output.data.count('<p>No projects found</p>'), 1)
+            self.assertEqual(
+                output.data.count('<p>No group found</p>'), 1)
             self.assertEqual(
-                output.data.count('<div class="card-header">'), 2)
+                output.data.count('<div class="card-header">'), 3)
 
     def test_view_users(self):
         """ Test the view_users endpoint. """
@@ -112,17 +114,11 @@ class PagureFlaskApptests(tests.Modeltests):
         output = self.app.get('/user/pingou?repopage=abc&forkpage=def')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<section class="project_list container p-t-2" id="repos">',
+            'Projects <span class="label label-default">0</span>',
             output.data)
         self.assertIn(
-            '<h2 class=" m-b-1">Projects '
-            '<span class="label label-default">0</span></h2>', output.data)
-        self.assertIn(
-            '<section class="project_list container p-t-2" id="forks">',
+            'Forks <span class="label label-default">0</span>',
             output.data)
-        self.assertIn(
-            '<h2 class=" m-b-1">Forks <span class="label '
-            'label-default">0</span></h2', output.data)
 
         tests.create_projects(self.session)
         self.gitrepos = tests.create_projects_git(
@@ -131,17 +127,10 @@ class PagureFlaskApptests(tests.Modeltests):
         output = self.app.get('/user/pingou?repopage=abc&forkpage=def')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<section class="project_list container p-t-2" id="repos">',
-            output.data)
-        self.assertIn(
-            '<h2 class=" m-b-1">Projects '
-            '<span class="label label-default">2</span></h2>', output.data)
-        self.assertIn(
-            '<section class="project_list container p-t-2" id="forks">',
+            'Projects <span class="label label-default">2</span>',
             output.data)
         self.assertIn(
-            '<h2 class=" m-b-1">Forks <span class="label '
-            'label-default">0</span></h2', output.data)
+            'Forks <span class="label label-default">0</span>', output.data)
 
     def test_new_project(self):
         """ Test the new_project endpoint. """
diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py
index cadb481..4721f73 100644
--- a/tests/test_progit_flask_ui_repo.py
+++ b/tests/test_progit_flask_ui_repo.py
@@ -65,6 +65,7 @@ class PagureFlaskRepotests(tests.Modeltests):
 
         user = tests.FakeUser()
         with tests.user_set(pagure.APP, user):
+
             output = self.app.get('/foo/adduser')
             self.assertEqual(output.status_code, 404)
 
@@ -80,14 +81,16 @@ class PagureFlaskRepotests(tests.Modeltests):
             # Redirect also happens for POST request
             output = self.app.post('/test/adduser')
             self.assertEqual(output.status_code, 302)
-            # Check the message flashed during the redirect
-            output = self.app.get('/')
-            self.assertEqual(output.status_code, 200)
-            self.assertIn(
-                '</button>\n                      Action canceled, try it '
-                'again',output.data)
 
-            ast.return_value = False
+        # Need to do this un-authentified since our fake user isn't in the DB
+        # Check the message flashed during the redirect
+        output = self.app.get('/')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn(
+            '</button>\n                      Action canceled, try it '
+            'again',output.data)
+
+        ast.return_value = False
 
         user.username = 'pingou'
         with tests.user_set(pagure.APP, user):
@@ -150,14 +153,16 @@ class PagureFlaskRepotests(tests.Modeltests):
             # Redirect also happens for POST request
             output = self.app.post('/test/addgroup')
             self.assertEqual(output.status_code, 302)
-            # Check the message flashed during the redirect
-            output = self.app.get('/')
-            self.assertEqual(output.status_code, 200)
-            self.assertIn(
-                '</button>\n                      Action canceled, try it '
-                'again', output.data)
 
-            ast.return_value = False
+        # Need to do this un-authentified since our fake user isn't in the DB
+        # Check the message flashed during the redirect
+        output = self.app.get('/')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn(
+            '</button>\n                      Action canceled, try it '
+            'again', output.data)
+
+        ast.return_value = False
 
         msg = pagure.lib.add_group(
             self.session,
@@ -1322,11 +1327,10 @@ index 0000000..fb7093d
                 '</button>\n                      Could not delete all the '
                 'repos from the system', output.data)
             self.assertIn(
-                '<h2 class=" m-b-1">Projects <span class="label '
-                'label-default">1</span></h2>', output.data)
+                '<div class="card-header">\n            Projects <span '
+                'class="label label-default">1</span>', output.data)
             self.assertIn(
-                '<div style="text-align:right;" class="p-r-1 text-muted">'
-                '<span class="oi" data-glyph="fork"></span>0</div>',
+                'Forks <span class="label label-default">0</span>',
                 output.data)
 
             # Only git repo
@@ -1345,11 +1349,10 @@ index 0000000..fb7093d
                 '</button>\n                      Could not delete all the '
                 'repos from the system' in output.data)
             self.assertIn(
-                '<h2 class=" m-b-1">Projects <span class="label '
-                'label-default">1</span></h2>', output.data)
+                '<div class="card-header">\n            Projects <span '
+                'class="label label-default">1</span>', output.data)
             self.assertIn(
-                '<div style="text-align:right;" class="p-r-1 text-muted">'
-                '<span class="oi" data-glyph="fork"></span>0</div>',
+                'Forks <span class="label label-default">0</span>',
                 output.data)
 
             # Only git and doc repo
@@ -1385,6 +1388,16 @@ index 0000000..fb7093d
             tests.create_projects_git(
                 os.path.join(tests.HERE, 'requests'), bare=True)
 
+            # Check repo was created
+            output = self.app.get('/')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<div class="card-header">\n            Projects <span '
+                'class="label label-default">2</span>', output.data)
+            self.assertIn(
+                'Forks <span class="label label-default">0</span>',
+                output.data)
+
             # add issues
             repo = pagure.lib.get_project(self.session, 'test')
             msg = pagure.lib.new_issue(
@@ -1466,14 +1479,23 @@ index 0000000..fb7093d
             )
             self.assertEqual(msg, 'Comment added')
 
+            # Check before deleting the project
+            output = self.app.get('/')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<div class="card-header">\n            Projects <span '
+                'class="label label-default">2</span>', output.data)
+            self.assertIn(
+                'Forks <span class="label label-default">0</span>',
+                output.data)
+
             output = self.app.post('/test/delete', follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<h2 class=" m-b-1">Projects <span class="label '
-                'label-default">1</span></h2>', output.data)
+                '<div class="card-header">\n            Projects <span '
+                'class="label label-default">1</span>', output.data)
             self.assertIn(
-                '<div style="text-align:right;" class="p-r-1 text-muted">'
-                '<span class="oi" data-glyph="fork"></span>0</div>',
+                'Forks <span class="label label-default">0</span>',
                 output.data)
 
             repo = pagure.lib.get_project(self.session, 'test')
@@ -1498,15 +1520,24 @@ index 0000000..fb7093d
             tests.add_content_git_repo(
                 os.path.join(tests.HERE, 'tickets', 'pingou', 'test3.git'))
 
+            # Check before deleting the fork
+            output = self.app.get('/')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<div class="card-header">\n            Projects <span '
+                'class="label label-default">1</span>', output.data)
+            self.assertIn(
+                'Forks <span class="label label-default">1</span>',
+                output.data)
+
             output = self.app.post(
                 '/fork/pingou/test3/delete', follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<h2 class=" m-b-1">Projects <span class="label '
-                'label-default">1</span></h2>', output.data)
+                '<div class="card-header">\n            Projects <span '
+                'class="label label-default">1</span>', output.data)
             self.assertIn(
-                '<div style="text-align:right;" class="p-r-1 text-muted">'
-                '<span class="oi" data-glyph="fork"></span>0</div>',
+                'Forks <span class="label label-default">0</span>',
                 output.data)
 
     @patch('pagure.ui.repo.admin_session_timedout')