diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index 62e8f93..abaeda3 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -65,15 +65,16 @@
         username=None, hide=True) %}
 
     <section class="project_list container p-t-2" id="{{ id }}">
-        <h2 class=" m-b-1">{{ title }}
-            <span class="label label-default">{{ count }}</span>
-            {% if username %}
+        <h2 class=" m-b-1">{{
+            title
+            }} <span class="label label-default">{{ count }}</span>
+            {%- if username -%}
             <a href="{{ url_for('new_project') }}">
             <button type="button" class="btn btn-success pull-xs-right">
               New Project
             </button>
             </a>
-            {% endif %}
+            {%- endif -%}
         </h2>
         {% if total and total > 1 %}
         {{ pagination_link(pagetitle, page, total) }}
diff --git a/tests/test_progit_flask_ui_app.py b/tests/test_progit_flask_ui_app.py
index 700539e..6909998 100644
--- a/tests/test_progit_flask_ui_app.py
+++ b/tests/test_progit_flask_ui_app.py
@@ -56,16 +56,16 @@ class PagureFlaskApptests(tests.Modeltests):
         output = self.app.get('/')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<h2 class=" m-b-1">All Projects <span class="label '
-            'label-default">0</span></h2', output.data)
+            '<h2 class=" m-b-1">All Projects '
+            '<span class="label label-default">0</span></h2>', output.data)
 
         tests.create_projects(self.session)
 
         output = self.app.get('/?page=abc')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<h2 class=" m-b-1">All Projects <span class="label '
-            'label-default">2</span></h2', output.data)
+            '<h2 class=" m-b-1">All Projects '
+            '<span class="label label-default">2</span></h2>', output.data)
 
         # Add a 3rd project with a long description
         item = pagure.lib.model.Project(
@@ -111,13 +111,15 @@ class PagureFlaskApptests(tests.Modeltests):
 
         output = self.app.get('/user/pingou?repopage=abc&forkpage=def')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-            '<section class="project_list p-t-2" id="repos">' in output.data)
         self.assertIn(
-            '<h2 class=" m-b-1">Projects <span class="label '
-            'label-default">0</span></h2', output.data)
-        self.assertTrue(
-            '<section class="project_list p-t-2" id="forks">' in output.data)
+            '<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">0</span></h2>', output.data)
+        self.assertIn(
+            '<section class="project_list container p-t-2" id="forks">',
+            output.data)
         self.assertIn(
             '<h2 class=" m-b-1">Forks <span class="label '
             'label-default">0</span></h2', output.data)
@@ -128,13 +130,15 @@ class PagureFlaskApptests(tests.Modeltests):
 
         output = self.app.get('/user/pingou?repopage=abc&forkpage=def')
         self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-            '<section class="project_list p-t-2" id="repos">' in output.data)
         self.assertIn(
-            '<h2 class=" m-b-1">Projects <span class="label '
-            'label-default">2</span></h2', output.data)
-        self.assertTrue(
-            '<section class="project_list p-t-2" id="forks">' in output.data)
+            '<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">',
+            output.data)
         self.assertIn(
             '<h2 class=" m-b-1">Forks <span class="label '
             'label-default">0</span></h2', output.data)