diff --git a/tests/test_progit_flask_ui_plugins_fedmsg.py b/tests/test_progit_flask_ui_plugins_fedmsg.py
index ec35893..c05deae 100644
--- a/tests/test_progit_flask_ui_plugins_fedmsg.py
+++ b/tests/test_progit_flask_ui_plugins_fedmsg.py
@@ -60,7 +60,7 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
             output = self.app.get('/test/settings/Fedmsg')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>Fedmsg</h3>' in output.data)
+            self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -73,7 +73,7 @@ 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.assertTrue('<h3>Fedmsg</h3>' in output.data)
+            self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -92,13 +92,15 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/Fedmsg', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
             self.assertIn(
-                '<li class="message">Hook Fedmsg inactived</li>',
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
+            self.assertIn(
+                '</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('<h3>Fedmsg</h3>', output.data)
+            self.assertIn('<h3>Fedmsg settings</h3>', output.data)
             self.assertIn(
                 '<input id="active" name="active" type="checkbox" value="y">',
                 output.data)
@@ -115,14 +117,16 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/Fedmsg', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
             self.assertIn(
-                '<li class="message">Hook Fedmsg activated</li>',
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
+            self.assertIn(
+                '</button>\n                      Hook Fedmsg activated',
                 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.assertTrue('<h3>Fedmsg</h3>' in output.data)
+            self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
@@ -135,14 +139,16 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/Fedmsg', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
             self.assertIn(
-                '<li class="message">Hook Fedmsg inactived</li>',
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
+            self.assertIn(
+                '</button>\n                      Hook Fedmsg inactived',
                 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.assertTrue('<h3>Fedmsg</h3>' in output.data)
+            self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
diff --git a/tests/test_progit_flask_ui_plugins_irc.py b/tests/test_progit_flask_ui_plugins_irc.py
index 4a2f0b3..f81f8b3 100644
--- a/tests/test_progit_flask_ui_plugins_irc.py
+++ b/tests/test_progit_flask_ui_plugins_irc.py
@@ -60,7 +60,7 @@ 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.assertTrue('<h3>IRC</h3>' in output.data)
+            self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -73,7 +73,7 @@ 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.assertTrue('<h3>IRC</h3>' in output.data)
+            self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -92,14 +92,16 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/IRC', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook IRC inactived</li>' in output.data)
+                '</button>\n                      Hook IRC inactived' in output.data)
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>IRC</h3>' in output.data)
+            self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -119,14 +121,16 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/IRC', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook IRC activated</li>' in output.data)
+                '</button>\n                      Hook IRC activated' in output.data)
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>IRC</h3>' in output.data)
+            self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
@@ -139,14 +143,16 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
             data = {'csrf_token': csrf_token}
             output = self.app.post('/test/settings/IRC', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook IRC inactived</li>' in output.data)
+                '</button>\n                      Hook IRC inactived' in output.data)
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>IRC</h3>' in output.data)
+            self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
diff --git a/tests/test_progit_flask_ui_plugins_mail.py b/tests/test_progit_flask_ui_plugins_mail.py
index d22ee86..b786209 100644
--- a/tests/test_progit_flask_ui_plugins_mail.py
+++ b/tests/test_progit_flask_ui_plugins_mail.py
@@ -60,7 +60,7 @@ 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.assertTrue('<h3>Mail</h3>' in output.data)
+            self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
@@ -76,7 +76,7 @@ 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.assertTrue('<h3>Mail</h3>' in output.data)
+            self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
@@ -95,14 +95,16 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook Mail inactived</li>' in output.data)
+                '</button>\n                      Hook Mail inactived' in output.data)
 
             output = self.app.get('/test/settings/Mail')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>Mail</h3>' in output.data)
+            self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
@@ -120,9 +122,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
                 '/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.assertTrue('<h3>Mail</h3>' in output.data)
+            self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertFalse(
-                '<li class="message">Hook activated</li>' in output.data)
+                '</button>\n                      Hook activated' in output.data)
             self.assertTrue(
                 '<input id="mail_to" name="mail_to" type="text" value=""></td>'
                 '\n<td class="errors">This field is required.</td>'
@@ -144,13 +146,15 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook Mail activated</li>' in output.data)
+                '</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.assertTrue('<h3>Mail</h3>' in output.data)
+            self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
@@ -166,13 +170,15 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/Mail', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook Mail inactived</li>' in output.data)
+                '</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.assertTrue('<h3>Mail</h3>' in output.data)
+            self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
                 '<td><label for="mail_to">Mail to</label></td>'
                 in output.data)
diff --git a/tests/test_progit_flask_ui_plugins_progit_hook.py b/tests/test_progit_flask_ui_plugins_progit_hook.py
index 4d3ecd2..e8a0265 100644
--- a/tests/test_progit_flask_ui_plugins_progit_hook.py
+++ b/tests/test_progit_flask_ui_plugins_progit_hook.py
@@ -62,7 +62,7 @@ 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.assertTrue('<h3>pagure</h3>' in output.data)
+            self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -75,7 +75,7 @@ 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.assertTrue('<h3>pagure</h3>' in output.data)
+            self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -93,15 +93,17 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/pagure', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure inactived</li>'
+                '</button>\n                      Hook pagure inactived'
                 in output.data)
 
             output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>pagure</h3>' in output.data)
+            self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -118,15 +120,17 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/pagure', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure activated</li>'
+                '</button>\n                      Hook pagure activated'
                 in output.data)
 
             output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>pagure</h3>' in output.data)
+            self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
@@ -139,15 +143,17 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
             output = self.app.post(
                 '/test/settings/pagure', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure inactived</li>'
+                '</button>\n                      Hook pagure inactived'
                 in output.data)
 
             output = self.app.get('/test/settings/pagure')
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>test project #1</p>' in output.data)
-            self.assertTrue('<h3>pagure</h3>' in output.data)
+            self.assertTrue('<h3>pagure settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
diff --git a/tests/test_progit_flask_ui_plugins_progit_request_hook.py b/tests/test_progit_flask_ui_plugins_progit_request_hook.py
index aa15828..e04d5eb 100644
--- a/tests/test_progit_flask_ui_plugins_progit_request_hook.py
+++ b/tests/test_progit_flask_ui_plugins_progit_request_hook.py
@@ -60,7 +60,7 @@ 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.assertTrue('<h3>pagure requests</h3>' in output.data)
+            self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -73,7 +73,7 @@ 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.assertTrue('<h3>pagure requests</h3>' in output.data)
+            self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -92,15 +92,17 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
                 '/test/settings/pagure requests', data=data,
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure requests inactived</li>'
+                '</button>\n                      Hook pagure requests inactived'
                 in output.data)
 
             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.assertTrue('<h3>pagure requests</h3>' in output.data)
+            self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -119,15 +121,17 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
                 '/test/settings/pagure requests', data=data,
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure requests activated</li>'
+                '</button>\n                      Hook pagure requests activated'
                 in output.data)
 
             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.assertTrue('<h3>pagure requests</h3>' in output.data)
+            self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
@@ -142,15 +146,17 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
                 '/test/settings/pagure requests', data=data,
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure requests inactived</li>'
+                '</button>\n                      Hook pagure requests inactived'
                 in output.data)
 
             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.assertTrue('<h3>pagure requests</h3>' in output.data)
+            self.assertTrue('<h3>pagure requests settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
diff --git a/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py b/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py
index 299455f..c8efa80 100644
--- a/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py
+++ b/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py
@@ -60,7 +60,7 @@ 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.assertTrue('<h3>pagure tickets</h3>' in output.data)
+            self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -73,7 +73,7 @@ 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.assertTrue('<h3>pagure tickets</h3>' in output.data)
+            self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -92,15 +92,17 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
                 '/test/settings/pagure tickets', data=data,
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure tickets inactived</li>'
+                '</button>\n                      Hook pagure tickets inactived'
                 in output.data)
 
             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.assertTrue('<h3>pagure tickets</h3>' in output.data)
+            self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" value="y">'
                 in output.data)
@@ -119,15 +121,17 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
                 '/test/settings/pagure tickets', data=data,
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure tickets activated</li>'
+                '</button>\n                      Hook pagure tickets activated'
                 in output.data)
 
             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.assertTrue('<h3>pagure tickets</h3>' in output.data)
+            self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input checked id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)
@@ -142,15 +146,17 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
                 '/test/settings/pagure tickets', data=data,
                 follow_redirects=True)
             self.assertEqual(output.status_code, 200)
-            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertIn(
+                '<section class="settings">\n  <h3>Settings for test</h3>',
+                output.data)
             self.assertTrue(
-                '<li class="message">Hook pagure tickets inactived</li>'
+                '</button>\n                      Hook pagure tickets inactived'
                 in output.data)
 
             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.assertTrue('<h3>pagure tickets</h3>' in output.data)
+            self.assertTrue('<h3>pagure tickets settings</h3>' in output.data)
             self.assertTrue(
                 '<input id="active" name="active" type="checkbox" '
                 'value="y">' in output.data)