diff --git a/application/views/scripts/config/authentication.phtml b/application/views/scripts/config/authentication.phtml
index ab96e4f13..7d5cc1cd0 100644
--- a/application/views/scripts/config/authentication.phtml
+++ b/application/views/scripts/config/authentication.phtml
@@ -3,9 +3,11 @@ use Icinga\Web\Url;
 $createLdapBackend = $this->href('/config/createAuthenticationBackend', array('type' => 'ldap'));
 $createDbBackend = $this->href('/config/createAuthenticationBackend', array('type' => 'db'));
 ?>
-
+<div class="controls">
 <?= $this->tabs->render($this); ?>
+</div>
 
+<div class="content">
 <?php if (isset($this->messageBox)): ?>
   <?= $this->messageBox->render() ?>
 <?php endif ?>
@@ -40,4 +42,5 @@ $createDbBackend = $this->href('/config/createAuthenticationBackend', array('typ
     <?php endif; ?>
   </div>
 </div>
-<?php endforeach; ?>
\ No newline at end of file
+<?php endforeach; ?>
+</div>
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index d307c73eb..dab0acc4f 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -1,7 +1,11 @@
+<div class="controls">
 <?= $this->tabs->render($this); ?>
+</div>
 
+<div class="content">
 <?php if (isset($this->messageBox)): ?>
   <?= $this->messageBox->render() ?>
 <?php endif ?>
 
-<?= $this->form ?>
\ No newline at end of file
+<?= $this->form ?>
+</div>
diff --git a/application/views/scripts/config/logging.phtml b/application/views/scripts/config/logging.phtml
index d8129ff62..b37e704e5 100644
--- a/application/views/scripts/config/logging.phtml
+++ b/application/views/scripts/config/logging.phtml
@@ -1,5 +1,8 @@
+<div class="controls">
 <?= $this->tabs->render($this); ?>
+</div>
 
+<div class="content">
 <?php $errors = $this->form->getErrorMessages(); ?>
 
 <?php if (isset($this->messageBox)): ?>
@@ -27,4 +30,6 @@
 </div>
 
 <?php endif; ?>
-<?= $this->form ?>
\ No newline at end of file
+<?= $this->form ?>
+</div>
+
diff --git a/application/views/scripts/config/module/overview.phtml b/application/views/scripts/config/module/overview.phtml
index f50b2e30d..c8bfbda3c 100644
--- a/application/views/scripts/config/module/overview.phtml
+++ b/application/views/scripts/config/module/overview.phtml
@@ -5,8 +5,11 @@ $this->modules->limit(10);
 $modules = $this->modules->paginate();
 
 ?>
+<div class="controls">
 <?= $this->tabs->render($this); ?>
+</div>
 
+<div class="content">
 <h3>Installed Modules</h3>
 
 <?php if (isset($this->messageBox)): ?>
@@ -17,7 +20,7 @@ $modules = $this->modules->paginate();
     'preserve' => $this->preserve
 ));
 ?>
-<table class="table">
+<table class="action">
   <tbody>
   <? foreach ($modules as $module): ?>
     <?php
@@ -40,3 +43,4 @@ $modules = $this->modules->paginate();
   <? endforeach ?>
   </tbody>
 </table>
+</div>
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index cb6f9542c..c9c48856f 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,8 +2,11 @@
 use Icinga\Web\Url;
 $createResource = $this->href('/config/createresource');
 ?>
+<div class="controls">
 <?= $this->tabs->render($this); ?>
+</div>
 
+<div class="content">
 <?php if (isset($this->messageBox)): ?>
   <?= $this->messageBox->render() ?>
 <?php endif ?>
@@ -41,4 +44,6 @@ $createResource = $this->href('/config/createresource');
   </div>
 
 </div>
-<?php endforeach; ?>
\ No newline at end of file
+<?php endforeach; ?>
+</div>
+