diff --git a/application/views/scripts/config/authentication.phtml b/application/views/scripts/config/authentication.phtml
index 972f897e9..7d5cc1cd0 100644
--- a/application/views/scripts/config/authentication.phtml
+++ b/application/views/scripts/config/authentication.phtml
@@ -3,33 +3,33 @@ use Icinga\Web\Url;
 $createLdapBackend = $this->href('/config/createAuthenticationBackend', array('type' => 'ldap'));
 $createDbBackend = $this->href('/config/createAuthenticationBackend', array('type' => 'db'));
 ?>
-<div>
+<div class="controls">
 <?= $this->tabs->render($this); ?>
 </div>
 
-<div>
+<div class="content">
 <?php if (isset($this->messageBox)): ?>
   <?= $this->messageBox->render() ?>
 <?php endif ?>
 
-<div>
-  <div>
+<div class="panel panel-default">
+  <div class="panel-heading panel-title">
     Create Authentication Provider
   </div>
-  <div>
+  <div class="panel-body">
     <a href="<?= $createLdapBackend ?>"><i class="icinga-icon-create"></i> Create A New LDAP Authentication Backend</a><br/>
     <a href="<?= $createDbBackend ?>"><i class="icinga-icon-create"></i> Create A New DB Authentication Backend</a>
   </div>
 </div>
 
 <?php foreach ($this->backends as $backend): ?>
-<div>
-  <div>
+<div class="panel panel-default">
+  <div class="panel-heading panel-title">
     Backend <?= $this->escape($backend->name); ?>
     <br/>
     <?= $backend->reorderForm; ?>
   </div>
-  <div>
+  <div class="panel-body">
     <a href="<?= $this->href('config/editAuthenticationBackend', array('auth_backend' => $backend->name));?>">
         <i class="icinga-icon-edit"></i> Edit This Authentication Provider
     </a>
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index 3ac1947fa..dab0acc4f 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -1,8 +1,8 @@
-<div>
+<div class="controls">
 <?= $this->tabs->render($this); ?>
 </div>
 
-<div>
+<div class="content">
 <?php if (isset($this->messageBox)): ?>
   <?= $this->messageBox->render() ?>
 <?php endif ?>
diff --git a/application/views/scripts/config/logging.phtml b/application/views/scripts/config/logging.phtml
index 9a69f477e..da6d886cc 100644
--- a/application/views/scripts/config/logging.phtml
+++ b/application/views/scripts/config/logging.phtml
@@ -1,8 +1,8 @@
-<div>
+<div class="controls">
 <?= $this->tabs->render($this); ?>
 </div>
 
-<div>
+<div class="content">
 <?php $errors = $this->form->getErrorMessages(); ?>
 
 <?php if (isset($this->messageBox)): ?>
diff --git a/application/views/scripts/config/module/overview.phtml b/application/views/scripts/config/module/overview.phtml
index 404bf2a3d..c8bfbda3c 100644
--- a/application/views/scripts/config/module/overview.phtml
+++ b/application/views/scripts/config/module/overview.phtml
@@ -5,11 +5,11 @@ $this->modules->limit(10);
 $modules = $this->modules->paginate();
 
 ?>
-<div>
+<div class="controls">
 <?= $this->tabs->render($this); ?>
 </div>
 
-<div>
+<div class="content">
 <h3>Installed Modules</h3>
 
 <?php if (isset($this->messageBox)): ?>
@@ -20,7 +20,7 @@ $modules = $this->modules->paginate();
     'preserve' => $this->preserve
 ));
 ?>
-<table>
+<table class="action">
   <tbody>
   <? foreach ($modules as $module): ?>
     <?php
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 997479cbe..c9c48856f 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,32 +2,32 @@
 use Icinga\Web\Url;
 $createResource = $this->href('/config/createresource');
 ?>
-<div>
+<div class="controls">
 <?= $this->tabs->render($this); ?>
 </div>
 
-<div>
+<div class="content">
 <?php if (isset($this->messageBox)): ?>
   <?= $this->messageBox->render() ?>
 <?php endif ?>
 
-<div>
-  <div>
+<div class="panel panel-default">
+  <div class="panel-heading panel-title">
     Create Resource
   </div>
-  <div>
+  <div class="panel-body">
     <a href="<?= $createResource ?>"><i class="icinga-icon-create"></i> Create A New Resource</a><br/>
   </div>
 </div>
 
 <?php foreach ($this->resources as $name => $resource): ?>
-<div>
+<div class="panel panel-default">
 
-  <div>
+  <div class="panel-heading panel-title">
     <b>Resource: </b>  <?= $this->escape($name); ?>
     <br/>
   </div>
-  <div>
+  <div class="panel-body">
 
     <a href="<?= $this->href('config/editresource', array('resource' => $name));?>">
         <i class="icinga-icon-edit"></i> Edit This Resource