diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 8a4925121..0f40f8279 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -1,9 +1,9 @@
 <div class="controls">
     <?= $tabs ?>
+    <h1><?= $this->translate('Roles') ?></h1>
 </div>
 <div class="content">
     <div>
-        <h1><?= $this->translate('Roles') ?></h1>
         <?php /** @var \Icinga\Application\Config $roles */ if ($roles->isEmpty()): ?>
             <?= $this->translate('No roles found.') ?>
         <?php else: ?>
diff --git a/application/views/scripts/roles/new.phtml b/application/views/scripts/roles/new.phtml
index d5f9e7e33..d7b277008 100644
--- a/application/views/scripts/roles/new.phtml
+++ b/application/views/scripts/roles/new.phtml
@@ -1,4 +1,6 @@
-<div class="content">
+<div class="controls">
     <h1><?= $this->translate('New Role') ?></h1>
+</div>
+<div class="content">
     <?= $form ?>
 </div>
diff --git a/application/views/scripts/roles/remove.phtml b/application/views/scripts/roles/remove.phtml
index a9360e78f..e2d01ed62 100644
--- a/application/views/scripts/roles/remove.phtml
+++ b/application/views/scripts/roles/remove.phtml
@@ -1,4 +1,6 @@
-<div class="content">
+<div class="controls">
     <h1><?= sprintf($this->translate('Remove Role %s'), $name) ?></h1>
+</div>
+<div class="content">
     <?= $form ?>
 </div>
diff --git a/application/views/scripts/roles/update.phtml b/application/views/scripts/roles/update.phtml
index 8cb235a59..44f756b06 100644
--- a/application/views/scripts/roles/update.phtml
+++ b/application/views/scripts/roles/update.phtml
@@ -1,4 +1,6 @@
-<div class="content">
+<div class="controls">
     <h1><?= sprintf($this->translate('Update Role %s'), $name) ?></h1>
+</div>
+<div class="content">
     <?= $form ?>
 </div>