diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index f10756f97..f710a58ae 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -119,12 +119,6 @@ class ConfigController extends Controller
             ->order('name');
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->modules);
-        // TODO: Not working
-        /*$this->setupSortControl(array(
-            'name'      => $this->translate('Modulename'),
-            'path'      => $this->translate('Installation Path'),
-            'enabled'   => $this->translate('State')
-        ));*/
     }
 
     public function moduleAction()
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 6c8eaa480..687998d6b 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -253,14 +253,6 @@ class DashboardController extends ActionController
                     $this->dashboard->getConfig()->saveIni();
                     $this->redirectNow(URL::fromRequest()->remove('remove'));
                 }
-                $this->view->tabs->add(
-                    'Add',
-                    array(
-                        'label' => '+',
-                        'title' => 'Add a dashlet to an existing or new dashboard',
-                        'url'   => Url::fromPath('dashboard/new-dashlet')
-                    )
-                );
                 $this->view->dashboard = $this->dashboard;
             }
         }
diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 949aa8fc6..c5f82e886 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -324,7 +324,6 @@ class GroupController extends AuthBackendController
             array(
                 'title'     => sprintf($this->translate('Show group %s'), $groupName),
                 'label'     => $this->translate('Group'),
-                'icon'      => 'users',
                 'url'       => Url::fromPath('group/show', array('backend' => $backendName, 'group' => $groupName))
             )
         );
@@ -355,7 +354,6 @@ class GroupController extends AuthBackendController
             array(
                 'title'     => $this->translate('List users of authentication backends'),
                 'label'     => $this->translate('Users'),
-                'icon'      => 'user',
                 'url'       => 'user/list'
             )
         );
@@ -364,7 +362,6 @@ class GroupController extends AuthBackendController
             array(
                 'title'     => $this->translate('List groups of user group backends'),
                 'label'     => $this->translate('User Groups'),
-                'icon'      => 'users',
                 'url'       => 'group/list'
             )
         );
diff --git a/application/controllers/RoleController.php b/application/controllers/RoleController.php
index 4e865aadb..64e15d89f 100644
--- a/application/controllers/RoleController.php
+++ b/application/controllers/RoleController.php
@@ -163,7 +163,6 @@ class RoleController extends AuthBackendController
             array(
                 'title'     => $this->translate('List users of authentication backends'),
                 'label'     => $this->translate('Users'),
-                'icon'      => 'user',
                 'url'       => 'user/list'
             )
         );
@@ -172,7 +171,6 @@ class RoleController extends AuthBackendController
             array(
                 'title'     => $this->translate('List groups of user group backends'),
                 'label'     => $this->translate('User Groups'),
-                'icon'      => 'users',
                 'url'       => 'group/list'
             )
         );
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index ae7cf841a..7f2c69667 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -290,7 +290,6 @@ class UserController extends AuthBackendController
             array(
                 'title'     => sprintf($this->translate('Show user %s'), $userName),
                 'label'     => $this->translate('User'),
-                'icon'      => 'user',
                 'url'       => Url::fromPath('user/show', array('backend' => $backendName, 'user' => $userName))
             )
         );
@@ -321,7 +320,6 @@ class UserController extends AuthBackendController
             array(
                 'title'     => $this->translate('List users of authentication backends'),
                 'label'     => $this->translate('Users'),
-                'icon'      => 'user',
                 'url'       => 'user/list'
             )
         );
@@ -330,7 +328,6 @@ class UserController extends AuthBackendController
             array(
                 'title'     => $this->translate('List groups of user group backends'),
                 'label'     => $this->translate('User Groups'),
-                'icon'      => 'users',
                 'url'       => 'group/list'
             )
         );
diff --git a/application/forms/Control/LimiterControlForm.php b/application/forms/Control/LimiterControlForm.php
new file mode 100644
index 000000000..e665ab21a
--- /dev/null
+++ b/application/forms/Control/LimiterControlForm.php
@@ -0,0 +1,113 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Control;
+
+use Icinga\Web\Form;
+
+/**
+ * Limiter control form
+ */
+class LimiterControlForm extends Form
+{
+    /**
+     * CSS class for the limiter control
+     *
+     * @var string
+     */
+    const CSS_CLASS_LIMITER = 'limiter-control';
+
+    /**
+     * Default limit
+     *
+     * @var int
+     */
+    const DEFAULT_LIMIT = 50;
+
+    /**
+     * Selectable limits
+     *
+     * @var int[]
+     */
+    public static $limits = array(
+        10  => '10',
+        25  => '25',
+        50  => '50',
+        100 => '100',
+        500 => '500'
+    );
+
+    /**
+     * Default limit for this instance
+     *
+     * @var int|null
+     */
+    protected $defaultLimit;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function init()
+    {
+        $this->setAttrib('class', static::CSS_CLASS_LIMITER);
+    }
+
+    /**
+     * Get the default limit
+     *
+     * @return int
+     */
+    public function getDefaultLimit()
+    {
+        return $this->defaultLimit !== null ? $this->defaultLimit : static::DEFAULT_LIMIT;
+    }
+
+    /**
+     * Set the default limit
+     *
+     * @param   int $defaultLimit
+     *
+     * @return  $this
+     */
+    public function setDefaultLimit($defaultLimit)
+    {
+        $this->defaultLimit = (int) $defaultLimit;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRedirectUrl()
+    {
+        return $this->getRequest()->getUrl()->setParam('limit', $this->getElement('limit')->getValue());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createElements(array $formData)
+    {
+        $this->addElement(
+            'select',
+            'limit',
+            array(
+                'autosubmit'    => true,
+                'escape'        => false,
+                'label'         => '#',
+                'multiOptions'  => static::$limits,
+                'value'         => $this->getRequest()->getUrl()->getParam('limit', $this->getDefaultLimit())
+            )
+        );
+    }
+
+    /**
+     * Limiter control is always successful
+     *
+     * @return bool
+     */
+    public function onSuccess()
+    {
+        return true;
+    }
+}
diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index d25001a23..ae8072cda 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -96,7 +96,7 @@ class DashletForm extends Form
                 array(
                     'required'      => true,
                     'label'         => $this->translate("New Dashboard Title"),
-                    'description'   => $this->translate('Enter a title for the new pane.')
+                    'description'   => $this->translate('Enter a title for the new dashboard')
                 )
             );
         } else {
@@ -107,7 +107,7 @@ class DashletForm extends Form
                     'required'      => true,
                     'label'         => $this->translate('Dashboard'),
                     'multiOptions'  => $panes,
-                    'description'   => $this->translate('Select a pane you want to add the dashlet.')
+                    'description'   => $this->translate('Select a dashboard you want to add the dashlet to')
                 )
             );
         }
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index e9aca1d26..d8ab9f2b1 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -41,7 +41,6 @@ class PreferenceForm extends Form
     public function init()
     {
         $this->setName('form_config_preferences');
-        $this->setTitle($this->translate('Preferences'));
     }
 
     /**
diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml
index 47b76a8d2..5e7c918da 100644
--- a/application/views/scripts/about/index.phtml
+++ b/application/views/scripts/about/index.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
     <?= $tabs ?>
 </div>
-<div class="content content-centered">
+<div id="about" class="content content-centered">
     <?= $this->img(
         'img/logo_icinga_big_dark.png',
         null,
@@ -35,7 +35,7 @@
             ) ?>
         </dd>
     </dl>
-    <div>
+    <div class="about-social">
         <?= $this->qlink(
             null,
             'https://www.twitter.com/icinga',
@@ -54,16 +54,25 @@
                 'icon'      => 'facebook-squared',
                 'title'     => $this->translate('Icinga on Facebook')
             )
+        ) ?> <?= $this->qlink(
+            null,
+            'https://plus.google.com/+icinga',
+            null,
+            array(
+                'target'    => '_blank',
+                'icon'      => 'google-plus-squared',
+                'title'     => $this->translate('Icinga on Google+')
+            )
         ) ?>
     </div>
-    <div>
+    <div class="about-links">
     <?= $this->qlink(
         null,
         'https://dev.icinga.org/projects/icingaweb2',
         null,
         array(
             'target'    => '_blank',
-            'img'       => 'img/bugreport.png',
+            'icon'       => 'bug',
             'title'     => $this->translate('Report a bug')
         )
     ) ?>
@@ -73,19 +82,17 @@
         null,
         array(
             'target'    => '_blank',
-            'img'       => 'img/support.png',
+            'icon'       => 'chat',
             'title'     => $this->translate('Support / Mailinglists')
         )
     ) ?>
-    </div>
-    <div>
         <?= $this->qlink(
             null,
             'https://wiki.icinga.org',
             null,
             array(
                 'target'    => '_blank',
-                'img'       => 'img/wiki.png',
+                'icon'       => 'lightbulb',
                 'title'     => $this->translate('Icinga Wiki')
             )
         ) ?>
@@ -95,13 +102,13 @@
             null,
             array(
                 'target'    => '_blank',
-                'img'       => 'img/docs.png',
+                'icon'       => 'doc-text',
                 'title'     => $this->translate('Icinga Documentation')
             )
         ) ?>
     </div>
     <h2><?= $this->translate('Loaded modules') ?></h2>
-    <table class="action-table listing-table" data-base-target="_next">
+    <table class="table-row-selectable common-table" data-base-target="_next">
     <thead>
         <tr>
             <th><?= $this->translate('Name') ?></th>
diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index 92ced57a2..d2fe2d6b2 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -1,48 +1,40 @@
 <?php if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs; ?>
-  <div class="grid dont-print">
-    <div class="col-1-3 text-left">
-      <?= $this->limiter ?>
-    </div>
-    <div class="col-1-3">
-      <?= $this->paginator ?>
-    </div>
-    <div class="col-1-3 text-right">
-      <?= $this->sortBox ?>
-    </div>
-  </div>
-  <?= $this->filterEditor; ?>
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
 </div>
 <?php endif ?>
 <div class="content">
-  <table class="action-table listing-table" data-base-target="_next">
+    <table class="table-row-selectable common-table" data-base-target="_next">
     <thead>
     <tr>
-      <th><?= $this->translate('Module') ?></th>
+        <th><?= $this->translate('Module') ?></th>
     </tr>
     </thead>
     <tbody>
     <?php foreach ($modules as $module): ?>
-      <tr>
-        <td>
-          <?php if ($module->enabled && $module->loaded) {
-            echo $this->icon('thumbs-up', sprintf($this->translate('Module %s is enabled'), $module->name));
-          } elseif (! $module->enabled) {
-            echo $this->icon('block', sprintf($this->translate('Module %s is disabled'), $module->name));
-          } else { // ! $module->loaded
-            echo $this->icon('block', sprintf($this->translate('Module %s has failed to load'), $module->name));
-          }
+        <tr>
+            <td>
+                <?php if ($module->enabled && $module->loaded) {
+                    echo $this->icon('thumbs-up', sprintf($this->translate('Module %s is enabled'), $module->name));
+                } elseif (! $module->enabled) {
+                    echo $this->icon('block', sprintf($this->translate('Module %s is disabled'), $module->name));
+                } else { // ! $module->loaded
+                    echo $this->icon('block', sprintf($this->translate('Module %s has failed to load'), $module->name));
+                }
 
-          echo $this->qlink(
-            $module->name,
-            'config/module/',
-            array('name' => $module->name),
-            array('title' => sprintf($this->translate('Show the overview of the %s module'), $module->name), 'class' => 'rowaction')
-          ); ?>
-        </td>
-      </tr>
+                echo $this->qlink(
+                    $module->name,
+                    'config/module/',
+                    array('name' => $module->name),
+                    array(
+                        'class' => 'rowaction',
+                        'title' => sprintf($this->translate('Show the overview of the %s module'), $module->name)
+                    )
+                ); ?>
+            </td>
+        </tr>
     <?php endforeach ?>
     </tbody>
-  </table>
+    </table>
 </div>
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 6a32cca67..ec9c0c7ea 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -13,7 +13,7 @@
             'title'             => $this->translate('Create a new resource')
         )
     ) ?>
-    <table class="action-table listing-table" data-base-target="_next">
+    <table class="table-row-selectable common-table" data-base-target="_next">
     <thead>
     <tr>
         <th><?= $this->translate('Resource') ?></th>
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 846184493..0e7800f0e 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -1,5 +1,5 @@
 <form id="<?= $form->getId() ?>" name="<?= $form->getName() ?>" enctype="<?= $form->getEncType() ?>" method="<?= $form->getMethod() ?>" action="<?= $form->getAction() ?>">
-  <table class="action-table listing-table" data-base-target="_next">
+  <table class="table-row-selectable common-table" data-base-target="_next">
     <thead>
       <th><?= $this->translate('Backend') ?></th>
       <th></th>
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index b2bc9b920..a3c597b00 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -47,7 +47,7 @@ if (! isset($backend)) {
 </div>
 <?php endif ?>
 
-    <table data-base-target="_next" class="action-table listing-table">
+    <table data-base-target="_next" class="table-row-selectable common-table">
         <thead>
             <tr>
                 <th><?= $this->translate('User Group'); ?></th>
@@ -95,4 +95,4 @@ if (! isset($backend)) {
         <?php endforeach ?>
         </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index fb850a2a5..a460c7ece 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -69,7 +69,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
 </div>
 <?php return; endif ?>
 
-    <table data-base-target="_next" class="action-table listing-table">
+    <table data-base-target="_next" class="table-row-selectable common-table">
         <thead>
             <tr>
                 <th><?= $this->translate('Username'); ?></th>
@@ -105,4 +105,4 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
         <?php endforeach ?>
         </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/application/views/scripts/list/applicationlog.phtml b/application/views/scripts/list/applicationlog.phtml
index 15fe9cef1..9d5e15bfa 100644
--- a/application/views/scripts/list/applicationlog.phtml
+++ b/application/views/scripts/list/applicationlog.phtml
@@ -1,37 +1,29 @@
 <?php if (! $this->compact): ?>
-<div class="controls">
-  <?= $this->tabs; ?>
-  <div class="grid dont-print">
-        <div class="col-1-3 text-left">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+<div class="controls separated">
+    <?= $this->tabs ?>
+    <div class="grid">
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
     </div>
-  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content">
-    <?php if ($this->logData !== null): ?>
+<?php if ($this->logData !== null): ?>
     <table class="action">
-        <tbody>
-            <?php foreach ($this->logData as $value): ?>
-                <?php $datetime = new Datetime($value->datetime); ?>
-                <tr class="state">
-                    <td style="width: 6em; text-align: center">
-                        <?= $this->escape($datetime->format('d.m. H:i')) ?><br />
-                        <?= $this->escape($value->loglevel) ?>
-                    </td>
-                    <td>
-                        <?= nl2br($this->escape($value->message), false) ?>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
+    <tbody>
+    <?php foreach ($this->logData as $value): ?>
+        <?php $datetime = new Datetime($value->datetime) ?>
+        <tr class="state">
+            <td style="width: 6em; text-align: center">
+                <?= $this->escape($datetime->format('d.m. H:i')) ?><br />
+                <?= $this->escape($value->loglevel) ?>
+            </td>
+            <td>
+                <?= nl2br($this->escape($value->message), false) ?>
+            </td>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
     </table>
-    <?php endif; ?>
+<?php endif ?>
 </div>
diff --git a/application/views/scripts/navigation/index.phtml b/application/views/scripts/navigation/index.phtml
index e24a3a59f..bf085629b 100644
--- a/application/views/scripts/navigation/index.phtml
+++ b/application/views/scripts/navigation/index.phtml
@@ -1,16 +1,8 @@
 <?php if (! $this->compact): ?>
-<div class="controls">
+<div class="controls separated">
     <?= $this->tabs ?>
-    <div class="grid dont-print">
-        <div class="col-1-3 text-left">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+    <div class="grid">
+        <?= $this->sortBox ?>
     </div>
     <?= $this->filterEditor ?>
 </div>
@@ -31,7 +23,7 @@
     <p><?= $this->translate('You did not create any navigation item yet.') ?></p>
 </div>
 <?php return; endif ?>
-    <table class="action-table listing-table" data-base-target="_next">
+    <table class="table-row-selectable common-table" data-base-target="_next">
     <thead>
     <tr>
         <th><?= $this->translate('Navigation') ?></th>
diff --git a/application/views/scripts/navigation/shared.phtml b/application/views/scripts/navigation/shared.phtml
index aae7fa552..c23abc628 100644
--- a/application/views/scripts/navigation/shared.phtml
+++ b/application/views/scripts/navigation/shared.phtml
@@ -3,27 +3,18 @@
 use Icinga\Web\Url;
 
 if (! $this->compact): ?>
-<div class="controls">
+<div class="controls separated">
     <?= $this->tabs; ?>
-    <div class="grid dont-print">
-        <div class="col-1-3 text-left">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+    <div class="grid">
+        <?= $this->sortBox ?>
     </div>
-    <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content" data-base-target="_next">
 <?php if (count($items) === 0): ?>
     <p><?= $this->translate('There are currently no navigation items being shared'); ?></p>
 <?php else: ?>
-    <table class="action alternating">
+    <table class="table-row-selectable common-table">
         <thead>
             <th><?= $this->translate('Shared Navigation'); ?></th>
             <th style="width: 10em"><?= $this->translate('Type'); ?></th>
@@ -74,4 +65,4 @@ if (! $this->compact): ?>
         </tbody>
     </table>
 <?php endif ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/application/views/scripts/role/list.phtml b/application/views/scripts/role/list.phtml
index 00b9c7579..9d047b4d7 100644
--- a/application/views/scripts/role/list.phtml
+++ b/application/views/scripts/role/list.phtml
@@ -16,7 +16,7 @@
 <?php /** @var \Icinga\Application\Config $roles */ if ($roles->isEmpty()): ?>
     <p><?= $this->translate('No roles found.') ?></p>
 <?php return; endif ?>
-    <table class="action-table listing-table" data-base-target="_next">
+    <table class="table-row-selectable common-table" data-base-target="_next">
     <thead>
     <tr>
         <th><?= $this->translate('Name') ?></th>
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 26114d657..b085881ef 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -47,7 +47,7 @@ if (! isset($backend)) {
 </div>
 <?php return; endif ?>
 
-    <table data-base-target="_next" class="action-table listing-table">
+    <table data-base-target="_next" class="table-row-selectable common-table">
     <thead>
         <tr>
             <th><?= $this->translate('Username') ?></th>
@@ -89,4 +89,4 @@ if (! isset($backend)) {
     <?php endforeach ?>
     </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 2fbdab551..2fc476bed 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -72,7 +72,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 </div>
 <?php return; endif ?>
 
-    <table data-base-target="_next" class="action-table listing-table">
+    <table data-base-target="_next" class="table-row-selectable common-table">
         <thead>
             <tr>
                 <th><?= $this->translate('Group'); ?></th>
@@ -108,4 +108,4 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
         <?php endforeach ?>
         </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/application/views/scripts/usergroupbackend/list.phtml b/application/views/scripts/usergroupbackend/list.phtml
index fd688d80d..5ce1df90f 100644
--- a/application/views/scripts/usergroupbackend/list.phtml
+++ b/application/views/scripts/usergroupbackend/list.phtml
@@ -14,7 +14,7 @@
         )
     ) ?>
 <?php if (! count($backendNames)) { return; } ?>
-    <table class="action-table listing-table" data-base-target="_next">
+    <table class="table-row-selectable common-table" data-base-target="_next">
     <thead>
     <tr>
         <th><?= $this->translate('Backend') ?></th>
diff --git a/doc/installation.md b/doc/installation.md
index 156c26af7..c26f5a504 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -53,7 +53,7 @@ add-apt-repository 'deb http://packages.icinga.org/ubuntu icinga-trusty main'
 apt-get update
 ````
 
-For other Ubuntu versions just replace trusty with your distribution's code name.
+For other Ubuntu versions just replace trusty with your distribution\'s code name.
 
 **RHEL and CentOS**:
 ````
@@ -171,10 +171,10 @@ Adopt the package requirements to your needs (e.g. adding ldap for authenticatio
 
 Example for RHEL/CentOS/Fedora:
 
-````
-# yum install httpd mysql-server
-# yum install php php-gd php-intl php-ZendFramework php-ZendFramework-Db-Adapter-Pdo-Mysql
-````
+```
+yum install httpd mysql-server
+yum install php php-gd php-intl php-ZendFramework php-ZendFramework-Db-Adapter-Pdo-Mysql
+```
 
 The setup wizard will check the pre-requisites later on.
 
@@ -311,13 +311,13 @@ Puppet, Ansible, Chef, etc. modules.
 Create the database and add a new user as shown below for MySQL:
 
 ````
-# sudo mysql -p
+sudo mysql -p
 
 CREATE DATABASE icingaweb2;
 GRANT SELECT, INSERT, UPDATE, DELETE, DROP, CREATE VIEW, INDEX, EXECUTE ON icingaweb2.* TO 'icingaweb2'@'localhost' IDENTIFIED BY 'icingaweb2';
 quit
 
-# mysql -p icingaweb2 < /usr/share/icingaweb2/etc/schema/mysql.schema.sql
+mysql -p icingaweb2 < /usr/share/icingaweb2/etc/schema/mysql.schema.sql
 ````
 
 
@@ -325,7 +325,7 @@ Then generate a new password hash as described in the [authentication docs](auth
 and use it to insert a new user called `icingaadmin` into the database.
 
 ````
-# mysql -p icingaweb2
+mysql -p icingaweb2
 
 INSERT INTO icingaweb_user (name, active, password_hash) VALUES ('icingaadmin', 1, '$1$EzxLOFDr$giVx3bGhVm4lDUAw6srGX1');
 quit
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index c46aa3a27..d19e6cde3 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -348,29 +348,24 @@ abstract class ApplicationBootstrap
         require $this->libDir . '/Icinga/Application/ClassLoader.php';
 
         $this->loader = new ClassLoader();
-        $this->loader->registerNamespace('Icinga', $this->libDir. '/Icinga');
+        $this->loader->registerNamespace('Icinga', $this->libDir . '/Icinga');
+        $this->loader->registerNamespace('Icinga', $this->libDir . '/Icinga', $this->appDir);
         $this->loader->register();
 
         return $this;
     }
 
     /**
-     * Register the Zend Autoloader
+     * Register the Zend Autoloader - compat only - does nothing
      *
+     * @deprecated
      * @return $this
      */
     public function setupZendAutoloader()
     {
-        require_once 'Zend/Loader/Autoloader.php';
-
-        \Zend_Loader_Autoloader::getInstance();
-
-        \Zend_Paginator::addScrollingStylePrefixPath(
-            'Icinga_Web_Paginator_ScrollingStyle_', $this->libDir . '/Icinga/Web/Paginator/ScrollingStyle'
-        );
-
         return $this;
     }
+
     /**
      * Setup module manager
      *
diff --git a/library/Icinga/Application/ClassLoader.php b/library/Icinga/Application/ClassLoader.php
index 3247d3250..28dd633fe 100644
--- a/library/Icinga/Application/ClassLoader.php
+++ b/library/Icinga/Application/ClassLoader.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Application;
 
+use Zend_Loader_Autoloader;
+
 /**
  * PSR-4 class loader
  */
@@ -13,6 +15,40 @@ class ClassLoader
      */
     const NAMESPACE_SEPARATOR = '\\';
 
+    /**
+     * Icinga Web 2 module namespace prefix
+     */
+    const MODULE_PREFIX = 'Icinga\\Module\\';
+
+    /**
+     * Icinga Web 2 module namespace prefix length
+     *
+     * Helps to make substr/strpos operations even faster
+     */
+    const MODULE_PREFIX_LENGTH = 14;
+
+    /**
+     * A hardcoded class/subdir map for application ns prefixes
+     *
+     * When a module registers with an application directory, those
+     * namespace prefixes (after the module prefix) will be looked up
+     * in the corresponding application subdirectories
+     *
+     * @var array
+     */
+    protected $applicationPrefixes = array(
+        'Clicommands' => 'clicommands',
+        'Controllers' => 'controllers',
+        'Forms'       => 'forms'
+    );
+
+    /**
+     * Whether we already instantiated the ZF autoloader
+     *
+     * @var boolean
+     */
+    protected $gotZend = false;
+
     /**
      * Namespaces
      *
@@ -20,18 +56,33 @@ class ClassLoader
      */
     private $namespaces = array();
 
+    /**
+     * Application directories
+     *
+     * @var array
+     */
+    private $applicationDirectories = array();
+
     /**
      * Register a base directory for a namespace prefix
      *
+     * Application directory is optional and provides additional lookup
+     * logic for hardcoded namespaces like "Forms"
+     *
      * @param   string  $namespace
      * @param   string  $directory
+     * @param   string  $appDirectory
      *
      * @return  $this
      */
-    public function registerNamespace($namespace, $directory)
+    public function registerNamespace($namespace, $directory, $appDirectory = null)
     {
         $this->namespaces[$namespace] = $directory;
 
+        if ($appDirectory !== null) {
+            $this->applicationDirectories[$namespace] = $appDirectory;
+        }
+
         return $this;
     }
 
@@ -56,21 +107,177 @@ class ClassLoader
      */
     public function getSourceFile($class)
     {
+        if ($file = $this->getModuleSourceFile($class)) {
+            return $file;
+        }
+
         foreach ($this->namespaces as $namespace => $dir) {
             if ($class === strstr($class, $namespace)) {
-                $classPath = str_replace(
-                    self::NAMESPACE_SEPARATOR,
-                    DIRECTORY_SEPARATOR,
-                    substr($class, strlen($namespace))
-                ) . '.php';
-                if (file_exists($file = $dir . $classPath)) {
-                    return $file;
-                }
+                return $this->buildClassFilename($class, $namespace);
             }
         }
+
         return null;
     }
 
+    /**
+     * Get the source file of the given module class or interface
+     *
+     * @param   string      $class Module class or interface name
+     *
+     * @return  string|null
+     */
+    protected function getModuleSourceFile($class)
+    {
+        if (! $this->classBelongsToModule($class)) {
+            return null;
+        }
+
+        $modules = Icinga::app()->getModuleManager();
+        $namespace = $this->extractModuleNamespace($class);
+
+        if ($this->hasNamespace($namespace)) {
+
+            return $this->buildClassFilename($class, $namespace);
+
+        } elseif (! $modules->loadedAllEnabledModules()) {
+
+            $moduleName = $this->extractModuleName($class);
+
+            if ($modules->hasEnabled($moduleName)) {
+                $modules->loadModule($moduleName);
+
+                return $this->buildClassFilename($class, $namespace);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Extract the Icinga module namespace from a given namespaced class name
+     *
+     * Does no validation, prefix must have been checked before
+     *
+     * @return string
+     */
+    protected function extractModuleNamespace($class)
+    {
+        return substr(
+            $class,
+            0,
+            strpos($class, self::NAMESPACE_SEPARATOR, self::MODULE_PREFIX_LENGTH + 1)
+        );
+    }
+
+    /**
+     * Extract the Icinga module name from a given namespaced class name
+     *
+     * Does no validation, prefix must have been checked before
+     *
+     * @return string
+     */
+    protected function extractModuleName($class)
+    {
+        return lcfirst(
+            substr(
+                $class,
+                self::MODULE_PREFIX_LENGTH,
+                strpos(
+                    $class,
+                    self::NAMESPACE_SEPARATOR,
+                    self::MODULE_PREFIX_LENGTH + 1
+                ) - self::MODULE_PREFIX_LENGTH
+            )
+        );
+    }
+
+    /**
+     * Whether the given class name belongs to a module namespace
+     *
+     * @return boolean
+     */
+    protected function classBelongsToModule($class)
+    {
+        return substr($class, 0, self::MODULE_PREFIX_LENGTH) === self::MODULE_PREFIX;
+    }
+
+    /**
+     * Prepare a filename string for the given class
+     *
+     * Expects the given namespace to be registered with a path name
+     *
+     * @return string
+     */
+    protected function buildClassFilename($class, $namespace)
+    {
+        $relNs = substr($class, strlen($namespace) + 1);
+
+        if ($this->namespaceHasApplictionDirectory($namespace)) {
+            $prefixSeparator = strpos($relNs, self::NAMESPACE_SEPARATOR);
+            $prefix = substr($relNs, 0, $prefixSeparator);
+
+            if ($this->isApplicationPrefix($prefix)) {
+                return $this->applicationDirectories[$namespace]
+                    . DIRECTORY_SEPARATOR
+                    . $this->applicationPrefixes[$prefix]
+                    . $this->classToRelativePhpFilename(substr($relNs, $prefixSeparator));
+            }
+        }
+
+        return $this->namespaces[$namespace] . DIRECTORY_SEPARATOR . $this->classToRelativePhpFilename($relNs);
+    }
+
+    /**
+     * Return the relative file name for the given (namespaces) class
+     *
+     * @param  string $class
+     *
+     * @return string
+     */
+    protected function classToRelativePhpFilename($class)
+    {
+        return str_replace(
+            self::NAMESPACE_SEPARATOR,
+            DIRECTORY_SEPARATOR,
+            $class
+        ) . '.php';
+    }
+
+    /**
+     * Whether given prefix (Forms, Controllers...) makes part of "application"
+     *
+     * @param  string $prefix 
+     *
+     * @return boolean
+     */
+    protected function isApplicationPrefix($prefix)
+    {
+        return array_key_exists($prefix, $this->applicationPrefixes);
+    }
+
+    /**
+     * Whether the given namespace registered an application directory
+     *
+     * @return boolean
+     */
+    protected function namespaceHasApplictionDirectory($namespace)
+    {
+        return array_key_exists($namespace, $this->applicationDirectories);
+    }
+
+    /**
+     * Require ZF autoloader
+     *
+     * @return Zend_Loader_Autoloader
+     */
+    protected function requireZendAutoloader()
+    {
+        require_once 'Zend/Loader/Autoloader.php';
+        $this->gotZend = true;
+        return Zend_Loader_Autoloader::getInstance();
+    }
+
     /**
      * Load the given class or interface
      *
@@ -80,10 +287,22 @@ class ClassLoader
      */
     public function loadClass($class)
     {
-        if ($file = $this->getSourceFile($class)) {
-            require $file;
-            return true;
+        // We are aware of the Zend_ prefix and lazyload it's autoloader.
+        // Return as fast as possible if we already did so.
+        if (substr($class, 0, 5) === 'Zend_') {
+            if (! $this->gotZend) {
+                $this->requireZendAutoloader();
+            }
+            return false;
         }
+
+        if ($file = $this->getSourceFile($class)) {
+            if (file_exists($file)) {
+                require $file;
+                return true;
+            }
+        }
+
         return false;
     }
 
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index f3bf4e016..b6947c833 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -73,6 +73,13 @@ class Manager
      */
     private $modulePaths        = array();
 
+    /**
+     * Whether we loaded all enabled modules
+     *
+     * @var bool
+     */
+    private $loadedAllEnabledModules = false;
+
     /**
      *  Create a new instance of the module manager
      *
@@ -177,12 +184,28 @@ class Manager
      */
     public function loadEnabledModules()
     {
-        foreach ($this->listEnabledModules() as $name) {
-            $this->loadModule($name);
+        if (! $this->loadedAllEnabledModules) {
+            foreach ($this->listEnabledModules() as $name) {
+                $this->loadModule($name);
+            }
+
+            $this->loadedAllEnabledModules = true;
         }
+
         return $this;
     }
 
+    /**
+     * Whether we loaded all enabled modules
+     *
+     * @return bool
+     */
+    public function loadedAllEnabledModules()
+    {
+        return $this->loadedAllEnabledModules;
+    }
+
+
     /**
      * Try to load the module and register it in the application
      *
@@ -245,6 +268,8 @@ class Manager
             );
         }
 
+        $this->loadedAllEnabledModules = false;
+
         if (file_exists($link) && is_link($link)) {
             return $this;
         }
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 842a581a9..737e5265e 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -51,6 +51,13 @@ class Module
      */
     private $cssdir;
 
+    /**
+     * Base application directory
+     *
+     * @var string
+     */
+    private $appdir;
+
     /**
      * Library directory
      *
@@ -244,6 +251,7 @@ class Module
         $this->jsdir          = $basedir . '/public/js';
         $this->libdir         = $basedir . '/library';
         $this->configdir      = $app->getConfigDir('modules/' . $name);
+        $this->appdir         = $basedir . '/application';
         $this->localedir      = $basedir . '/application/locale';
         $this->formdir        = $basedir . '/application/forms';
         $this->controllerdir  = $basedir . '/application/controllers';
@@ -739,6 +747,16 @@ class Module
         return $this->basedir;
     }
 
+    /**
+     * Get the module's application directory
+     *
+     * @return string
+     */
+    public function getApplicationDir()
+    {
+        return $this->appdir;
+    }
+
     /**
      * Get the module's library directory
      *
@@ -1043,18 +1061,13 @@ class Module
             return $this;
         }
 
-        $loader = $this->app->getLoader();
         $moduleName = ucfirst($this->getName());
 
-        $moduleLibraryDir = $this->getLibDir(). '/'. $moduleName;
-        if (is_dir($moduleLibraryDir)) {
-            $loader->registerNamespace('Icinga\\Module\\' . $moduleName, $moduleLibraryDir);
-        }
-
-        $moduleFormDir = $this->getFormDir();
-        if (is_dir($moduleFormDir)) {
-            $loader->registerNamespace('Icinga\\Module\\' . $moduleName. '\\Forms', $moduleFormDir);
-        }
+        $this->app->getLoader()->registerNamespace(
+            'Icinga\\Module\\' . $moduleName,
+            $this->getLibDir() . '/'. $moduleName,
+            $this->getApplicationDir()
+        );
 
         $this->registeredAutoloader = true;
 
@@ -1118,21 +1131,10 @@ class Module
         if (! $this->app->isWeb()) {
             return $this;
         }
-        $moduleControllerDir = $this->getControllerDir();
-        if (is_dir($moduleControllerDir)) {
-            $this->app->getfrontController()->addControllerDirectory(
-                $moduleControllerDir,
-                $this->getName()
-            );
-            $this->app->getLoader()->registerNamespace(
-                'Icinga\\Module\\' . ucfirst($this->getName()) . '\\' . Dispatcher::CONTROLLER_NAMESPACE,
-                $moduleControllerDir
-            );
-        }
-        $this
+
+        return $this
             ->registerLocales()
             ->registerRoutes();
-        return $this;
     }
 
     /**
@@ -1143,6 +1145,13 @@ class Module
     protected function registerRoutes()
     {
         $router = $this->app->getFrontController()->getRouter();
+
+        // TODO: We should not be required to do this. Please check dispatch()
+        $this->app->getfrontController()->addControllerDirectory(
+            $this->getControllerDir(),
+            $this->getName()
+        );
+
         /** @var \Zend_Controller_Router_Rewrite $router */
         foreach ($this->routes as $name => $route) {
             $router->addRoute($name, $route);
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 24b7e641d..ce69dbb0a 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -91,7 +91,6 @@ class Web extends EmbeddedWeb
             ->setupLogger()
             ->setupInternationalization()
             ->setupZendMvc()
-            ->setupNamespaces()
             ->setupModuleManager()
             ->loadSetupModuleIfNecessary()
             ->loadEnabledModules()
@@ -140,19 +139,37 @@ class Web extends EmbeddedWeb
         return $this->viewRenderer;
     }
 
-    private function hasAccessToSharedNavigationItem(& $config)
+    private function hasAccessToSharedNavigationItem(& $config, Config $navConfig)
     {
         // TODO: Provide a more sophisticated solution
 
         if (isset($config['owner']) && $config['owner'] === $this->user->getUsername()) {
             unset($config['owner']);
+            unset($config['users']);
+            unset($config['groups']);
             return true;
         }
 
+        if (isset($config['parent']) && $navConfig->hasSection($config['parent'])) {
+            unset($config['owner']);
+            if (isset($this->accessibleMenuItems[$config['parent']])) {
+                return $this->accessibleMenuItems[$config['parent']];
+            }
+
+            $parentConfig = $navConfig->getSection($config['parent']);
+            $this->accessibleMenuItems[$config['parent']] = $this->hasAccessToSharedNavigationItem(
+                $parentConfig,
+                $navConfig
+            );
+            return $this->accessibleMenuItems[$config['parent']];
+        }
+
         if (isset($config['users'])) {
             $users = array_map('trim', explode(',', strtolower($config['users'])));
             if (in_array('*', $users, true) || in_array($this->user->getUsername(), $users, true)) {
+                unset($config['owner']);
                 unset($config['users']);
+                unset($config['groups']);
                 return true;
             }
         }
@@ -160,6 +177,8 @@ class Web extends EmbeddedWeb
         if (isset($config['groups'])) {
             $groups = array_map('trim', explode(',', strtolower($config['groups'])));
             if (in_array('*', $groups, true)) {
+                unset($config['owner']);
+                unset($config['users']);
                 unset($config['groups']);
                 return true;
             }
@@ -167,6 +186,8 @@ class Web extends EmbeddedWeb
             $userGroups = array_map('strtolower', $this->user->getGroups());
             $matches = array_intersect($userGroups, $groups);
             if (! empty($matches)) {
+                unset($config['owner']);
+                unset($config['users']);
                 unset($config['groups']);
                 return true;
             }
@@ -208,8 +229,17 @@ class Web extends EmbeddedWeb
         } else {
             $items = array();
             foreach ($config as $name => $typeConfig) {
-                if ($this->hasAccessToSharedNavigationItem($typeConfig)) {
-                    $items[$name] = $typeConfig;
+                if (isset($this->accessibleMenuItems[$name])) {
+                    if ($this->accessibleMenuItems[$name]) {
+                        $items[$name] = $typeConfig;
+                    }
+                } else {
+                    if ($this->hasAccessToSharedNavigationItem($typeConfig, $config)) {
+                        $this->accessibleMenuItems[$name] = true;
+                        $items[$name] = $typeConfig;
+                    } else {
+                        $this->accessibleMenuItems[$name] = false;
+                    }
                 }
             }
 
@@ -292,22 +322,20 @@ class Web extends EmbeddedWeb
                     'cssClass'  => 'user-nav-item',
                     'label'     => $this->user->getUsername(),
                     'icon'      => 'user',
-                    'url'       => 'preference',
                     'priority'  => 900,
-                    'renderer'  => array(
-                        'UserNavigationItemRenderer'
-                    ),
-                ),
-                'logout' => array(
-                    'cssClass'  => 'user-nav-item',
-                    'label'     => t('Logout'),
-                    'icon'	=> 'starttime',
-                    'priority'  => 990,
-                    'renderer'  => array(
-                        'LogoutNavigationItemRenderer',
-                        'target' => '_self'
-                    ),
-                    'url'       => 'authentication/logout'
+                    'children'  => array(
+                        'preferences' => array(
+                            'label'     => t('Preferences'),
+                            'priority'  => 100,
+                            'url'       => 'preference'
+                        ),
+                        'logout' => array(
+                            'label'     => t('Logout'),
+                            'priority'  => 200,
+                            'target'    => '_self',
+                            'url'       => 'authentication/logout'
+                        )
+                    )
                 )
             );
 
@@ -346,6 +374,7 @@ class Web extends EmbeddedWeb
                 'layoutPath' => $this->getApplicationDir('/layouts/scripts')
             )
         );
+
         $this->setupFrontController();
         $this->setupViewRenderer();
         return $this;
@@ -492,24 +521,4 @@ class Web extends EmbeddedWeb
         }
         return Translator::DEFAULT_LOCALE;
     }
-
-    /**
-     * Setup class loader namespaces for Icinga\Controllers and Icinga\Forms
-     *
-     * @return $this
-     */
-    private function setupNamespaces()
-    {
-        $this
-            ->getLoader()
-            ->registerNamespace(
-                'Icinga\\' . Dispatcher::CONTROLLER_NAMESPACE,
-                $this->getApplicationDir('controllers')
-            )
-            ->registerNamespace(
-                'Icinga\\Forms',
-                $this->getApplicationDir('forms')
-            );
-        return $this;
-    }
 }
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index ca087bfcf..c747a0908 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1171,10 +1171,9 @@ class Form extends Zend_Form
                         $this->getView()->layout()->redirectUrl = $this->getRedirectUrl()->getAbsoluteUrl();
                     }
                 } elseif ($this->getIsApiTarget()) {
-                    $this->getResponse()->sendJson(array(
-                        'status'    => 'fail',
-                        'data'      => array_merge($this->getMessages(), $this->getErrorMessages())
-                    ));
+                    $this->getResponse()->json()->setFailData(
+                        array_merge($this->getMessages(), $this->getErrorMessages())
+                    )->sendResponse();
                 }
             } elseif ($this->getValidatePartial()) {
                 // The form can't be processed but we may want to show validation errors though
diff --git a/library/Icinga/Web/Form/Decorator/FormHints.php b/library/Icinga/Web/Form/Decorator/FormHints.php
index f16a07318..c6a63f8dd 100644
--- a/library/Icinga/Web/Form/Decorator/FormHints.php
+++ b/library/Icinga/Web/Form/Decorator/FormHints.php
@@ -58,7 +58,7 @@ class FormHints extends Zend_Form_Decorator_Abstract
         $hints = $this->recurseForm($form, $entirelyRequired);
         if ($entirelyRequired !== null) {
             $hints[] = $form->getView()->translate(sprintf(
-                'Required fields are marked with %s and must be filled in to complete the form.',
+                '%s Required field',
                 $form->getRequiredCue()
             ));
         }
diff --git a/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
index 5160d5d66..3ff98bec0 100644
--- a/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
+++ b/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
@@ -94,7 +94,22 @@ abstract class BadgeNavigationItemRenderer extends NavigationItemRenderer
      */
     public function render(NavigationItem $item = null)
     {
-        return '<div class="clearfix">' . $this->renderBadge() . parent::render($item) . '</div>';
+        if ($item === null) {
+            $item = $this->getItem();
+        }
+        $item->setCssClass('badge-nav-item');
+        $this->setEscapeLabel(false);
+        $label = $this->view()->escape($item->getLabel());
+        if (($icon = $item->getIcon()) !== null) {
+            $label = $this->view()->icon($icon) . $label;
+            $item->setIcon(null);
+        }
+        $item->setLabel($this->renderBadge() . $label);
+        $html = parent::render($item);
+        if ($icon) {
+            $item->setIcon(true);
+        }
+        return $html;
     }
 
     /**
@@ -107,7 +122,7 @@ abstract class BadgeNavigationItemRenderer extends NavigationItemRenderer
         if ($count = $this->getCount()) {
             $view = $this->view();
             return sprintf(
-                '<span title="%s" class="badge pull-right state-%s">%s</span>',
+                '<span title="%s" class="badge state-%s">%s</span>',
                 $view->escape($this->getTitle()),
                 $view->escape($this->getState()),
                 $count
diff --git a/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php
deleted file mode 100644
index 1dad7c434..000000000
--- a/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Web\Navigation\Renderer;
-
-use Icinga\Web\Navigation\NavigationItem;
-
-class LogoutNavigationItemRenderer extends NavigationItemRenderer
-{
-    public function render(NavigationItem $item = null)
-    {
-        return parent::render($item);
-    }
-}
diff --git a/library/Icinga/Web/Navigation/Renderer/NavigationRenderer.php b/library/Icinga/Web/Navigation/Renderer/NavigationRenderer.php
index ac7ee99c7..7dc9da387 100644
--- a/library/Icinga/Web/Navigation/Renderer/NavigationRenderer.php
+++ b/library/Icinga/Web/Navigation/Renderer/NavigationRenderer.php
@@ -271,9 +271,11 @@ class NavigationRenderer implements RecursiveIterator, NavigationRendererInterfa
     /**
      * Return the opening markup for multiple navigation items
      *
+     * @param   int $level
+     *
      * @return  string
      */
-    public function beginChildrenMarkup()
+    public function beginChildrenMarkup($level = 1)
     {
         $cssClass = array(static::CSS_CLASS_NAV);
         if ($this->navigation->getLayout() === Navigation::LAYOUT_TABS) {
@@ -282,6 +284,8 @@ class NavigationRenderer implements RecursiveIterator, NavigationRendererInterfa
             $cssClass[] = static::CSS_CLASS_NAV_DROPDOWN;
         }
 
+        $cssClass[] = 'nav-level-' . $level;
+
         return '<ul class="' . join(' ', $cssClass) . '">';
     }
 
@@ -352,8 +356,9 @@ class NavigationRenderer implements RecursiveIterator, NavigationRendererInterfa
         foreach ($this as $item) {
             /** @var NavigationItem $item */
             if ($item->shouldRender()) {
+                $content = $item->render();
                 $this->content[] = $this->beginItemMarkup($item);
-                $this->content[] = $item->render();
+                $this->content[] = $content;
                 $this->content[] = $this->endItemMarkup();
             }
         }
diff --git a/library/Icinga/Web/Navigation/Renderer/RecursiveNavigationRenderer.php b/library/Icinga/Web/Navigation/Renderer/RecursiveNavigationRenderer.php
index 740df5602..e14402363 100644
--- a/library/Icinga/Web/Navigation/Renderer/RecursiveNavigationRenderer.php
+++ b/library/Icinga/Web/Navigation/Renderer/RecursiveNavigationRenderer.php
@@ -142,7 +142,7 @@ class RecursiveNavigationRenderer extends RecursiveIteratorIterator implements N
      */
     public function beginChildren()
     {
-        $this->content[] = $this->getInnerIterator()->beginChildrenMarkup();
+        $this->content[] = $this->getInnerIterator()->beginChildrenMarkup($this->getDepth() + 1);
     }
 
     /**
@@ -162,14 +162,15 @@ class RecursiveNavigationRenderer extends RecursiveIteratorIterator implements N
         foreach ($this as $item) {
             /** @var NavigationItem $item */
             if ($item->shouldRender()) {
-                $this->content[] = $this->getInnerIterator()->beginItemMarkup($item);
-
                 if ($this->getUseStandardItemRenderer()) {
                     $renderer = new NavigationItemRenderer();
-                    $this->content[] = $renderer->render($item);
+                    $content = $renderer->render($item);
                 } else {
-                    $this->content[] = $item->render();
+                    $content = $item->render();
                 }
+                $this->content[] = $this->getInnerIterator()->beginItemMarkup($item);
+
+                $this->content[] = $content;
 
                 if (! $item->hasChildren()) {
                     $this->content[] = $this->getInnerIterator()->endItemMarkup();
diff --git a/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php
deleted file mode 100644
index 5168253d2..000000000
--- a/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Web\Navigation\Renderer;
-
-use Icinga\Web\Navigation\NavigationItem;
-
-class UserNavigationItemRenderer extends NavigationItemRenderer
-{
-    public function getAvatar()
-    {
-        // Temporarily disabled as of layout issues. Should be fixed once
-        // we have avatars
-        return '';
-
-        return '<img class="pull-left user-avatar"
-                     src="/icingaweb2/static/gravatar?email=icinga%40localhost"
-                     alt="Avatar"
-                     aria-hidden="true">';
-    }
-
-    public function render(NavigationItem $item = null)
-    {
-        return '<div class="clearfix">' . $this->getAvatar() . parent::render($item) . '</div>';
-    }
-}
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index f66444785..5ce438e74 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -13,15 +13,13 @@ class StyleSheet
         '../application/fonts/fontello-ifont/css/ifont-embedded.css',
         'css/vendor/normalize.css',
         'css/vendor/tipsy.css',
-        'css/icinga/themes/icinga.less',
+        'css/icinga/base.less',
         'css/icinga/colors.less',
         'css/icinga/badges.less',
         'css/icinga/mixins.less',
         'css/icinga/grid.less',
-        'css/icinga/base.less',
         'css/icinga/nav.less',
         'css/icinga/main.less',
-        'css/icinga/limiter.less',
         'css/icinga/animation.less',
         'css/icinga/layout-colors.less',
         'css/icinga/layout-structure.less',
@@ -33,14 +31,13 @@ class StyleSheet
         'css/icinga/forms.less',
         'css/icinga/setup.less',
         'css/icinga/widgets.less',
-        'css/icinga/pagination.less',
-        'css/icinga/selection-toolbar.less',
         'css/icinga/login.less',
+        'css/icinga/about.less',
         'css/icinga/controls.less',
         'css/icinga/dev.less',
 //        'css/icinga/logo.less',
         'css/icinga/spinner.less',
-        'css/icinga/compat.less',
+        'css/icinga/compat.less'
     );
 
     public static function compileForPdf()
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index e3c179036..724d91b31 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -43,7 +43,7 @@ $this->addHelperFunction('timeAgo', function ($time, $timeOnly = false) {
         return '';
     }
     return sprintf(
-        '<span class="text-small time-ago" title="%s">%s</span>',
+        '<span class="relative-time time-ago" title="%s">%s</span>',
         DateFormatter::formatDateTime($time),
         DateFormatter::timeAgo($time, $timeOnly)
     );
@@ -54,7 +54,7 @@ $this->addHelperFunction('timeSince', function ($time, $timeOnly = false) {
         return '';
     }
     return sprintf(
-        '<span class="text-small time-since" title="%s">%s</span>',
+        '<span class="relative-time time-since" title="%s">%s</span>',
         DateFormatter::formatDateTime($time),
         DateFormatter::timeSince($time, $timeOnly)
     );
@@ -65,7 +65,7 @@ $this->addHelperFunction('timeUntil', function ($time, $timeOnly = false) {
         return '';
     }
     return sprintf(
-        '<span class="text-small time-until" title="%s">%s</span>',
+        '<span class="relative-time time-until" title="%s">%s</span>',
         DateFormatter::formatDateTime($time),
         DateFormatter::timeUntil($time, $timeOnly)
     );
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 70aadf666..cb5ff670b 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -74,7 +74,7 @@ class InlinePie extends AbstractWidget
      * @var string
      */
     private $template =<<<'EOD'
-<span sparkType="pie" class="sparkline {class}" {title} sparkWidth={size} sparkHeight={size} sparkSliceColors="[{colors}]" values="{data}">
+<span sparkType="pie" class="sparkline {class}" {title} sparkSliceColors="[{colors}]" values="{data}">
 </span>
 {noscript}
 EOD;
diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index 365e54058..b4df83865 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -3,41 +3,13 @@
 
 namespace Icinga\Web\Widget;
 
-use Icinga\Web\Navigation\Navigation;
-use Icinga\Web\Url;
+use Icinga\Forms\Control\LimiterControlForm;
 
 /**
- * Limiter control
+ * Limiter control widget
  */
 class Limiter extends AbstractWidget
 {
-    /**
-     * CSS class for the limiter widget
-     *
-     * @var string
-     */
-    const CSS_CLASS_LIMITER = 'limiter-control';
-
-    /**
-     * Default limit
-     *
-     * @var int
-     */
-    const DEFAULT_LIMIT = 50;
-
-    /**
-     * Selectable limits
-     *
-     * @var int[]
-     */
-    public static $limits = array(
-        10  => '10',
-        25  => '25',
-        50  => '50',
-        100 => '100',
-        500 => '500'
-    );
-
     /**
      * Default limit for this instance
      *
@@ -48,11 +20,11 @@ class Limiter extends AbstractWidget
     /**
      * Get the default limit
      *
-     * @return int
+     * @return int|null
      */
     public function getDefaultLimit()
     {
-        return $this->defaultLimit !== null ? $this->defaultLimit : static::DEFAULT_LIMIT;
+        return $this->defaultLimit;
     }
 
     /**
@@ -73,39 +45,10 @@ class Limiter extends AbstractWidget
      */
     public function render()
     {
-        $url = Url::fromRequest();
-        $activeLimit = (int) $url->getParam('limit', $this->getDefaultLimit());
-        $navigation = new Navigation();
-        $navigation->setLayout(Navigation::LAYOUT_TABS);
-        foreach (static::$limits as $limit => $label) {
-            $navigation->addItem(
-                'limit_' . $limit,
-                array(
-                    'priority'  => $limit,
-                    'label'     => $label,
-                    'active'    => $activeLimit === $limit,
-                    'url'       => $url->with(array('limit' => $limit)),
-                    'title'     => sprintf(t('Show %u rows on this page'), $limit)
-                )
-            );
-        }
-
-        if ($activeLimit === 0) {
-            $navigation->addItem(
-                'limit_0',
-                array(
-                    'active'    => true,
-                    'label'     => t('all'),
-                    'title'     => t('Show all items on this page'),
-                    'priority'  => max(array_keys(static::$limits)) + 1
-                )
-            );
-        }
-
-        return $navigation
-            ->getRenderer()
-            ->setCssClass(static::CSS_CLASS_LIMITER)
-            ->setHeading(t('Limiter'))
-            ->render();
+        $control = new LimiterControlForm();
+        $control
+            ->setDefaultLimit($this->defaultLimit)
+            ->handleRequest();
+        return (string)$control;
     }
 }
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index f6b2cad2c..1e7beceab 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -22,7 +22,7 @@ class DashboardSettings implements Tabextension
             'dashboard_add',
             array(
                 'icon'      => 'img/icons/dashboard.png',
-                'label'     => t('Add New Pane Or Dashlet'),
+                'label'     => t('Add Dashlet'),
                 'url'       => Url::fromPath('dashboard/new-dashlet')
             )
         );
diff --git a/modules/doc/application/views/scripts/chapter.phtml b/modules/doc/application/views/scripts/chapter.phtml
index fc5b3073b..9147eed06 100644
--- a/modules/doc/application/views/scripts/chapter.phtml
+++ b/modules/doc/application/views/scripts/chapter.phtml
@@ -1,5 +1,5 @@
 <div class="controls">
-    <?= /** @var \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
+<?= $this->tabs ?>
 </div>
 <div class="content">
     <?= /** @var \Icinga\Module\Doc\Renderer\DocSectionRenderer $section */ $section ?>
diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml
index d80e05cb3..e8c4ecf6e 100644
--- a/modules/doc/application/views/scripts/module/index.phtml
+++ b/modules/doc/application/views/scripts/module/index.phtml
@@ -1,7 +1,8 @@
 <div class="controls">
-    <?= /** @var \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
+    <?= $this->tabs ?>
     <h1><?= $this->translate('Module documentations'); ?></h1>
 </div>
+
 <div class="content">
     <ul>
     <?php foreach ($modules as $module): /** @var \Icinga\Application\Modules\Module $module */ ?>
diff --git a/modules/doc/application/views/scripts/style/guide.phtml b/modules/doc/application/views/scripts/style/guide.phtml
index 3cfcc1ca9..1e2bae663 100644
--- a/modules/doc/application/views/scripts/style/guide.phtml
+++ b/modules/doc/application/views/scripts/style/guide.phtml
@@ -2,7 +2,7 @@
 <?= $this->tabs ?>
 </div>
 
-<div class="content">
+<div class="content styleguide">
 <h1>Header h1</h1>
 <h2>Header h2</h2>
 <h3>Header h3</h3>
diff --git a/modules/doc/library/Doc/Renderer/DocTocRenderer.php b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
index b0f78d3eb..20b8a5c64 100644
--- a/modules/doc/library/Doc/Renderer/DocTocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
@@ -86,7 +86,9 @@ class DocTocRenderer extends DocRenderer
             );
             $url = $view->url($path);
             /** @var \Icinga\Web\Url $url */
-            $url->setAnchor($this->encodeAnchor($section->getId()));
+            if ($this->getDepth() > 0) {
+                $url->setAnchor($this->encodeAnchor($section->getId()));
+            }
             $urlAttributes = array(
                 'data-base-target'  => '_next',
                 'title'             => sprintf(
diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index 1ab230c2e..65b8d61c0 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -25,6 +25,10 @@ table {
   width: 100%;
 }
 
+a[name]:focus {
+  outline: 0;
+}
+
 th, td {
   padding: 0.25rem;
   text-align: left;
diff --git a/modules/doc/public/js/module.js b/modules/doc/public/js/module.js
new file mode 100644
index 000000000..c33e35ecf
--- /dev/null
+++ b/modules/doc/public/js/module.js
@@ -0,0 +1,29 @@
+
+(function(Icinga) {
+
+    var Doc = function(module) {
+        this.module = module;
+        this.initialize();
+        this.module.icinga.logger.debug('Doc module loaded');
+    };
+
+    Doc.prototype = {
+
+        initialize: function()
+        {
+            this.module.on('rendered',     this.rendered);
+            this.module.icinga.logger.debug('Doc module initialized');
+        },
+
+        rendered: function(event) {
+            var $container = $(event.currentTarget);
+            if ($('> .content.styleguide', $container).length) {
+                $container.removeClass('module-doc');
+            }
+        }
+    };
+
+    Icinga.availableModules.doc = Doc;
+
+}(Icinga));
+
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index bffbecc05..571e8ed88 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -37,13 +37,12 @@ class HostsController extends Controller
         $this->getTabs()->add(
             'show',
             array(
+                'label' => $this->translate('Hosts') . sprintf(' (%d)', count($this->hostList)),
                 'title' => sprintf(
                     $this->translate('Show summarized information for %u hosts'),
                     count($this->hostList)
                 ),
-                'label' => $this->translate('Hosts') . sprintf(' (%d)', count($this->hostList)),
-                'url'   => Url::fromRequest(),
-                'icon'  => 'host'
+                'url'   => Url::fromRequest()
             )
         )->extend(new DashboardAction())->extend(new MenuAction())->activate('show');
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
@@ -52,21 +51,18 @@ class HostsController extends Controller
     protected function handleCommandForm(ObjectsCommandForm $form)
     {
         $this->hostList->setColumns(array(
-            'host_icon_image',
-            'host_icon_image_alt',
-            'host_name',
-            'host_address',
-            'host_address6',
-            'host_state',
-            'host_problem',
-            'host_handled',
             'host_acknowledged',
+            'host_active_checks_enabled',
+            'host_display_name',
+            'host_handled',
             'host_in_downtime',
             'host_is_flapping',
-            'host_output',
+            'host_last_state_change',
+            'host_name',
             'host_notifications_enabled',
-            'host_active_checks_enabled',
-            'host_passive_checks_enabled'
+            'host_passive_checks_enabled',
+            'host_problem',
+            'host_state'
         ));
 
         $form
@@ -90,24 +86,18 @@ class HostsController extends Controller
             ->handleRequest();
         $this->view->checkNowForm = $checkNowForm;
         $this->hostList->setColumns(array(
-            'host_icon_image',
-            'host_icon_image_alt',
-            'host_name',
-            'host_address',
-            'host_address6',
-            'host_state',
-            'host_problem',
-            'host_handled',
             'host_acknowledged',
+            'host_active_checks_enabled',
+            'host_display_name',
+            'host_handled',
             'host_in_downtime',
             'host_is_flapping',
-            'host_output',
+            'host_last_state_change',
+            'host_name',
             'host_notifications_enabled',
-            'host_active_checks_enabled',
-            'host_passive_checks_enabled'
-            /*'host_event_handler_enabled',
-            'host_flap_detection_enabled',
-            'host_obsessing'*/
+            'host_passive_checks_enabled',
+            'host_problem',
+            'host_state'
         ));
 
         $acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index bb51a2108..798362fe4 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -39,13 +39,12 @@ class ServicesController extends Controller
         $this->getTabs()->add(
             'show',
             array(
+                'label' => $this->translate('Services') . sprintf(' (%d)', count($this->serviceList)),
                 'title' => sprintf(
                     $this->translate('Show summarized information for %u services'),
                     count($this->serviceList)
                 ),
-                'label' => $this->translate('Services') . sprintf(' (%d)', count($this->serviceList)),
-                'url'   => Url::fromRequest(),
-                'icon'  => 'services'
+                'url'   => Url::fromRequest()
             )
         )->extend(new DashboardAction())->extend(new MenuAction())->activate('show');
     }
@@ -53,28 +52,23 @@ class ServicesController extends Controller
     protected function handleCommandForm(ObjectsCommandForm $form)
     {
         $this->serviceList->setColumns(array(
-            'host_icon_image',
-            'host_icon_image_alt',
-            'host_name',
-            'host_address',
-            'host_address6',
-            'host_output',
-            'host_state',
-            'host_problem',
+            'host_display_name',
             'host_handled',
-            'service_icon_image',
-            'service_icon_image_alt',
-            'service_description',
-            'service_state',
-            'service_problem',
-            'service_handled',
+            'host_name',
+            'host_problem',
+            'host_state',
             'service_acknowledged',
+            'service_active_checks_enabled',
+            'service_description',
+            'service_display_name',
+            'service_handled',
             'service_in_downtime',
             'service_is_flapping',
-            'service_output',
+            'service_last_state_change',
             'service_notifications_enabled',
-            'service_active_checks_enabled',
-            'service_passive_checks_enabled'
+            'service_passive_checks_enabled',
+            'service_problem',
+            'service_state'
         ));
 
         $form
@@ -99,32 +93,23 @@ class ServicesController extends Controller
             ->handleRequest();
         $this->view->checkNowForm = $checkNowForm;
         $this->serviceList->setColumns(array(
-            'host_icon_image',
-            'host_icon_image_alt',
-            'host_name',
-            'host_address',
-            'host_address6',
-            'host_output',
-            'host_state',
-            'host_problem',
+            'host_display_name',
             'host_handled',
-            'service_icon_image',
-            'service_icon_image_alt',
-            'service_output',
-            'service_description',
-            'service_state',
-            'service_problem',
-            'service_handled',
+            'host_name',
+            'host_problem',
+            'host_state',
             'service_acknowledged',
+            'service_active_checks_enabled',
+            'service_description',
+            'service_display_name',
+            'service_handled',
             'service_in_downtime',
             'service_is_flapping',
+            'service_last_state_change',
             'service_notifications_enabled',
-            'service_active_checks_enabled',
-            'service_passive_checks_enabled'
-            /*
-            'service_event_handler_enabled',
-            'service_flap_detection_enabled',
-            'service_obsessing'*/
+            'service_passive_checks_enabled',
+            'service_problem',
+            'service_state'
         ));
 
         $acknowledgedObjects = $this->serviceList->getAcknowledgedObjects();
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 03c293d7c..0ac9d3fb5 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -262,7 +262,7 @@ class BackendConfigForm extends ConfigForm
             array(
                 'decorators'    => array(
                     'FormElements',
-                    array('HtmlTag', array('tag' => 'div', 'class' => 'element'))
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
                 )
             )
         );
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index fcbba2662..e4aa8fa68 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -52,7 +52,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
     public function service($service, $serviceLinkText, $host, $hostLinkText, $class = null)
     {
         return sprintf(
-            '%s: %s',
+            '%s&#58; %s',
             $this->host($host, $hostLinkText),
             $this->view->qlink(
                 $serviceLinkText,
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 090aff03e..0ed5ccb95 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -61,14 +61,14 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 $headers[$column] = $labels[$column];
             }
         }
-        $table = array('<td><b>' . implode('</b></td><td><b>', $headers) . '<b></td>');
+        $table = array('<thead><tr><th>' . implode('</th><th>', $headers) . '</th></tr></thead><tbody>');
         foreach ($pieChartData as $perfdata) {
             if ($compact && $perfdata->isVisualizable()) {
                 $results[] = $perfdata->asInlinePie($color)->render();
             } else {
                 $data = array();
                 if ($perfdata->isVisualizable()) {
-                    $data []= $perfdata->asInlinePie($color)->render() . '&nbsp;';
+                    $data []= $perfdata->asInlinePie($color)->render();
                 } elseif (isset($columns[''])) {
                     $data []= '';
                 }
@@ -85,9 +85,10 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                         );
                     }
                 }
-                $table []= '<tr><td>' . implode('</td><td>', $data) . '</td></tr>';
+                $table []= '<tr><td class="sparkline-col">' . implode('</td><td>', $data) . '</td></tr>';
             }
         }
+        $table[] = '</tbody>';
         if ($limit > 0) {
             $count = $compact ? count($results) : count($table);
             if ($count > $limit) {
@@ -107,8 +108,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 return '';
             }
             return sprintf(
-                '<table class="perfdata %s">%s</table>',
-                isset($columns['']) ? 'perfdata-piecharts' : '',
+                '<table class="performance-data-table">%s</table>',
                 implode("\n", $table)
             );
         }
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index dec3ca504..da33a5efd 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -40,6 +40,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 '<table style="font-size: 0.75em"',
                 $this->getPurifier()->purify($output)
             );
+            $isHtml = true;
         } else {
             // Plaintext
             $output = preg_replace(
@@ -47,11 +48,17 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 self::$txtReplacements,
                 $this->view->escape($output)
             );
-        }
-        if (! $raw) {
-            $output = '<pre class="plugin-output">' . $output . '</pre>';
+            $isHtml = false;
         }
         $output = $this->fixLinks($output);
+
+        if (! $raw) {
+            if ($isHtml) {
+                $output = '<div class="pluginoutput">' . $output . '</div>';
+            } else {
+                $output = '<div class="pluginoutput preformatted">' . $output . '</div>';
+            }
+        }
         return $output;
     }
 
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index 80882b59f..091aaf70f 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -10,12 +10,12 @@
         'monitoring/config/createbackend',
         null,
         array(
-            'class'   => 'button action-link',
+            'class'   => 'button-link',
             'icon'    => 'plus',
             'title'   => $this->translate('Create a new monitoring backend')
         )
     ) ?>
-    <table class="action-table listing-table">
+    <table class="table-row-selectable common-table">
         <thead>
         <tr>
             <th><?= $this->translate('Monitoring Backend') ?></th>
@@ -35,7 +35,7 @@
                             'title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)
                         )
                     ) ?>
-                    <span class="text-small">&#40;<?= sprintf(
+                    <span class="config-label-meta">&#40;<?= sprintf(
                         $this->translate('Type: %s'),
                         $this->escape($config->type === 'ido' ? 'IDO' : ucfirst($config->type))
                     ) ?>&#41;
@@ -65,12 +65,12 @@
         'monitoring/config/createtransport',
         null,
         array(
-            'class'   => 'button action-link',
+            'class'   => 'button-link',
             'icon'    => 'plus',
             'title'   => $this->translate('Create a new command transport')
         )
     ) ?>
-    <table class="action-table listing-table">
+    <table class="table-row-selectable common-table">
     <thead>
     <tr>
         <th><?= $this->translate('Transport') ?></th>
@@ -90,7 +90,7 @@
                         'title' => sprintf($this->translate('Edit command transport %s'), $transportName)
                     )
                 ); ?>
-                <span class="text-small">&#40;<?= sprintf(
+                <span class="config-label-meta">&#40;<?= sprintf(
                     $this->translate('Type: %s'),
                     $config->host !== null ? $this->translate('Remote') : $this->translate('Local')
                 ) ?>&#41;
diff --git a/modules/monitoring/application/views/scripts/host/history.phtml b/modules/monitoring/application/views/scripts/host/history.phtml
deleted file mode 100644
index 6b4093b98..000000000
--- a/modules/monitoring/application/views/scripts/host/history.phtml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
-
-function contactsLink($match, $view) {
-    $links = array();
-    foreach (preg_split('/,\s/', $match[1]) as $contact) {
-        $links[] = $view->qlink(
-            $contact,
-            'monitoring/show/contact',
-            array('contact_name' => $contact),
-            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
-        );
-    }
-    return '[' . implode(', ', $links) . ']';
-}
-
-$self = $this;
-
-$url = $this->url();
-$limit = (int) $url->getParam('limit', 25);
-if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
-    $page = 1;
-}
-
-$history->limit($limit * $page);
-
-if (! $this->compact): ?>
-<div class="controls">
-  <?= $this->tabs; ?>
-  <?= $this->render('partials/object/host-header.phtml'); ?>
-  <h1><?= $this->translate('This Host\'s Event History'); ?></h1>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <a href="#load-more">
-    <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
-  </a>
-  <?= $this->filterEditor; ?>
-</div>
-<?php endif ?>
-<div class="content">
-  <table data-base-target="_next" class="action objecthistory">
-    <tbody>
-    <?php foreach ($history->peekAhead() as $event): ?>
-    <?php
-      $stateClass = 'invalid';
-      $msg = $this->escape($event->output);
-      $isService = isset($event->service_description);
-      switch ($event->type) {
-        case 'notify':
-          $icon = 'notification';
-          $title = $this->translate('Notification');
-          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-
-          $msg = $msg ? preg_replace_callback(
-              '/^\[([^\]]+)\]/',
-              function($match) use ($self) { return contactsLink($match, $self); },
-              $msg
-          ) : $this->translate('This notification was not sent out to any contact.');
-          break;
-        case 'comment':
-          $icon = 'comment';
-          $title = $this->translate('Comment');
-          break;
-        case 'comment_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Comment deleted');
-          break;
-        case 'ack':
-          $icon = 'acknowledgement';
-          $title = $this->translate('Acknowledge');
-          break;
-        case 'ack_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Ack removed');
-          break;
-        case 'dt_comment':
-          $icon = 'in_downtime';
-          $title = $this->translate('In Downtime');
-          break;
-        case 'dt_comment_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Downtime removed');
-          break;
-        case 'flapping':
-          $icon = 'flapping';
-          $title = $this->translate('Flapping');
-          break;
-        case 'flapping_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Flapping stopped');
-          break;
-        case 'hard_state':
-          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $icon = 'attention-alt';
-          $title = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          break;
-        case 'soft_state':
-          $icon = 'spinner';
-          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $title = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          break;
-        case 'dt_start':
-          $icon = 'downtime_start';
-          $title = $this->translate('Downtime Start');
-          break;
-        case 'dt_end':
-          $icon = 'downtime_end';
-          $title = $this->translate('Downtime End');
-          break;
-      }
-    ?>
-      <tr>
-        <td class="state-col state-<?= $stateClass; ?>">
-        <?php if ($history->getIteratorPosition() % $limit === 0): ?>
-          <a id="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
-        <?php endif ?>
-          <strong><?= $this->escape($title); ?></strong>
-          <p><?= date('d.m. H:i', $event->timestamp); ?></p>
-        </td>
-        <td>
-        <?php if ($isService): ?>
-          <?= sprintf(
-              $this->translate('%s on %s', 'Service running on host'),
-              $this->qlink(
-                  $event->service_display_name,
-                  'monitoring/service/show',
-                  array(
-                      'host' => $event->host_name,
-                      'service' => $event->service_description
-                  ),
-                  array('title' => sprintf(
-                      $this->translate('Show detailed information for service %s on host %s'),
-                      $event->service_display_name,
-                      $event->host_display_name
-                  ))
-              ),
-              $event->host_display_name
-          ) ?>
-        <?php else: ?>
-          <?= $this->escape($event->host_name); ?>
-        <?php endif ?>
-          <p class="plugin-output">
-            <?= $this->icon($icon, $title); ?> <?= $this->createTicketLinks($msg) ?>
-          </p>
-        </td>
-      </tr>
-    <?php endforeach; ?>
-    </tbody>
-  </table>
-<?php if (! $history->hasResult()): ?>
-  <?= $this->translate('No history events found matching the filter'); ?>
-<?php elseif ($history->hasMore()): ?>
-  <?= $this->qlink(
-    $this->translate('Load More'),
-    $url->setAnchor('page-' . ($page + 1)),
-    array(
-      'page'    => $page + 1,
-    ),
-    array(
-      'id'      => 'load-more',
-      'class'   => 'pull-right action-link'
-    )
-  ); ?>
-<?php endif ?>
-</div>
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index e496ced29..45849a524 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -12,7 +12,7 @@
 <?php endif ?>
 <div class="content">
   <table data-base-target="_next"
-         class="action-table multiselect"
+         class="table-row-selectable common-table multiselect"
          data-icinga-multiselect-url="<?= $this->href('monitoring/comments/show'); ?>"
          data-icinga-multiselect-related="<?= $this->href("monitoring/comments") ?>"
          data-icinga-multiselect-data="comment_id">
diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index ab1695765..688fafc0f 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -8,16 +8,16 @@ if (! $stats instanceof stdClass) {
 }
 ?>
 <div class="hosts-summary">
-<?= $this->qlink(
-    sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total),
-    // @TODO(el): Fix that
-    Url::fromPath('monitoring/list/hosts')->setParams(isset($baseFilter) ? $baseFilter->getUrlParams() : array()),
-    null,
-    array('title' => sprintf(
-        $this->translatePlural('List %u host', 'List all %u hosts', $stats->hosts_total),
-        $stats->hosts_total
-    ))
-) ?>&#58;
+    <span class="hosts-link"><?= $this->qlink(
+        sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total),
+        // @TODO(el): Fix that
+        Url::fromPath('monitoring/list/hosts')->setParams(isset($baseFilter) ? $baseFilter->getUrlParams() : array()),
+        null,
+        array('title' => sprintf(
+            $this->translatePlural('List %u host', 'List all %u hosts', $stats->hosts_total),
+            $stats->hosts_total
+        ))
+    ) ?>&#58;</span>
 <?php
 $stateBadges = new StateBadges();
 $stateBadges
diff --git a/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml b/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml
index b86aad7a7..ec0fb85d1 100644
--- a/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml
@@ -1,6 +1,15 @@
 <?php
-$helpMessage = $this->translate('Press and hold the Ctrl key while clicking on rows to select multiple rows or press and hold the Shift key to select a range of rows.', 'multiselection');
+$helpMessage = $this->translate(
+    'Press and hold the Ctrl key while clicking on rows to select multiple rows or press and hold the Shift key to'
+    .' select a range of rows',
+    'Multi-selection help'
+);
 ?>
-<div class="selection-info text-small" title="<?= $this->escape($helpMessage) ?>">
-    <span class="selection-info-count">0</span> <?= $this->translate('row(s) selected', 'multiselection') ?>
+<div class="selection-info" title="<?= $this->escape($helpMessage) ?>">
+    <?= sprintf(
+        /// TRANSLATORS: Please leave %s as it is because the selection counter is wrapped in a span tag for updating
+        /// the counter via JavaScript
+        $this->translate('%s row(s) selected', 'Multi-selection count'),
+        '<span class="selection-info-count">0</span>'
+    ) ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index b8b61aebe..a56c33c33 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -8,19 +8,19 @@ if (! $stats instanceof stdClass) {
 }
 ?>
 <div class="services-summary">
-<?= $this->qlink(
-    sprintf($this->translatePlural(
-        '%u Service', '%u Services', $stats->services_total),
-        $stats->services_total
-    ),
-    // @TODO(el): Fix that
-    Url::fromPath('monitoring/list/services')->setParams(isset($baseFilter) ? $baseFilter->getUrlParams() : array()),
-    null,
-    array('title' => sprintf(
-        $this->translatePlural('List %u service', 'List all %u services', $stats->services_total),
-        $stats->services_total
-    ))
-) ?>&#58;
+    <span class="services-link"><?= $this->qlink(
+        sprintf($this->translatePlural(
+            '%u Service', '%u Services', $stats->services_total),
+            $stats->services_total
+        ),
+        // @TODO(el): Fix that
+        Url::fromPath('monitoring/list/services')->setParams(isset($baseFilter) ? $baseFilter->getUrlParams() : array()),
+        null,
+        array('title' => sprintf(
+            $this->translatePlural('List %u service', 'List all %u services', $stats->services_total),
+            $stats->services_total
+        ))
+    ) ?>&#58;</span>
 <?php
 $stateBadges = new StateBadges();
 $stateBadges
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index a377ebacc..e0be423d7 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -18,7 +18,7 @@ if (count($groupData) === 0) {
     return;
 }
 ?>
-    <table class="action action-table listing-table" data-base-target="_next">
+    <table class="action table-row-selectable common-table" data-base-target="_next">
         <thead>
         <tr>
             <th></th>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 6ece9e8df..5517f4fc3 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -11,7 +11,7 @@
 <?php endif ?>
 <div class="content">
 <?php if ($contacts->hasResult()): ?>
-    <table class="action action-table listing-table" data-base-target="_next">
+    <table class="action table-row-selectable common-table" data-base-target="_next">
         <thead>
         <tr>
             <th><?= $this->translate('Name') ?></th>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index f6023f421..56be44ffd 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -16,7 +16,7 @@ if (! $this->compact): ?>
 <?php endif ?>
 <div class="content">
   <table data-base-target="_next"
-         class="action action-table multiselect"
+         class="table-row-selectable state-table multiselect"
          data-icinga-multiselect-url="<?= $this->href('monitoring/downtimes/show'); ?>"
          data-icinga-multiselect-controllers="<?= $this->href("monitoring/downtimes") ?>"
          data-icinga-multiselect-data="downtime_id">
@@ -30,7 +30,6 @@ if (! $this->compact): ?>
           $this->stateName = Host::getStateText($downtime->host_state);
       }
       $this->downtime = $downtime;
-      $this->displayComment = true;
     ?>
     <tr href="<?= $this->href('monitoring/downtime/show', array('downtime_id' => $downtime->id)) ?>">
       <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index cddad22fd..4923f2079 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -1,140 +1,17 @@
 <?php
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
-
-$url = $this->url();
-$limit = (int) $url->getParam('limit', 25);
-if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
-    $page = 1;
-}
-
-$history->limit($limit * $page);
 
 if (! $this->compact): ?>
 <div class="controls dont-print separated">
-  <?= $this->tabs; ?>
-  <div class="grid">
-    <div class="col-1-3 text-left">
-      <?= $this->limiter ?>
+    <?= $this->tabs ?>
+    <div class="grid">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
     </div>
-    <div class="col-1-3">
-      <a class="action-link" href="#load-more">
-        <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
-      </a>
-    </div>
-    <div class="col-1-3 text-right">
-      <?= $this->sortBox ?>
-    </div>
-  </div>
-  <?= $this->filterEditor; ?>
+    <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
-<div class="content">
-  <table data-base-target="_next" class="action action-table">
-    <tbody>
-    <?php foreach ($history->peekAhead() as $event): ?>
-    <?php
-      $icon = 'help';
-      $msg = $event->output;
-      $title = $event->type;
-      $stateName = 'invalid';
-      $isService = isset($event->service_description);
-      switch ($event->type) {
-        case 'notify':
-          $icon = 'bell';
-          $title = $this->translate('Notification');
-          $msg = $msg ?: $this->translate('This notification was not sent out to any contact.');
-          break;
-        case 'comment':
-          $icon = 'comment';
-          $title = $this->translate('Comment');
-          break;
-        case 'ack':
-          $icon = 'ok';
-          $title = $this->translate('Acknowledgement');
-          break;
-        case 'dt_comment':
-          $icon = 'plug';
-          $title = $this->translate('In Downtime');
-          break;
-        case 'flapping':
-          $icon = 'flapping';
-          $title = $this->translate('Flapping');
-          break;
-        case 'flapping_deleted':
-          $icon = 'ok';
-          $title = $this->translate('Flapping Stopped');
-          break;
-        case 'hard_state':
-          $icon = $isService ? 'service' : 'host';
-          $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $title = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
-          break;
-        case 'soft_state':
-          $icon = 'lightbulb';
-          $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $title = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
-          break;
-        case 'dt_start':
-          $icon = 'starttime';
-          $title = $this->translate('Downtime Start');
-          break;
-        case 'dt_end':
-          $icon = 'endtime';
-          $title = $this->translate('Downtime End');
-          break;
-        }
-      ?>
-      <tr>
-        <td class="state-col state-<?= $stateName; ?>">
-        <?php if ($history->getIteratorPosition() % $limit === 0): ?>
-          <a id="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
-        <?php endif ?>
-          <strong><?= $this->escape($title); ?></strong>
-          <p><?= $this->timeAgo($event->timestamp, $this->compact); ?></p>
-        </td>
-        <td>
-          <?= $this->icon($icon, $title); ?>
-          <?php if ($isService): ?>
-          <?= $this->link()->service(
-              $event->service_description, $event->service_display_name, $event->host_name, $event->host_display_name, 'rowaction'
-          ) ?>
-        <?php else: ?>
-          <?= $this->link()->host($event->host_name, $event->host_display_name) ?>
-        <?php endif ?>
-          <p class="plugin-output">
-            <?= empty($msg) ? '' : $this->escape($msg) ?>
-          </p>
-        </td>
-      </tr>
-    <?php endforeach ?>
-    </tbody>
-  </table>
-<?php if (! $history->hasResult()): ?>
-  <?= $this->translate('No history events found matching the filter'); ?>
-<?php elseif ($history->hasMore()): ?>
- <?php if ($this->compact): ?>
-  <?= $this->qlink(
-    $this->translate('Show More'),
-    $url->without(array('view', 'limit')),
-    null,
-    array(
-      'data-base-target'    => '_next',
-      'class'               => 'pull-right action-link'
-    )
-  ); ?>
- <?php else: ?>
-  <?= $this->qlink(
-    $this->translate('Load More'),
-    $url->setAnchor('page-' . ($page + 1)),
-    array(
-      'page'    => $page + 1,
-    ),
-    array(
-      'id'      => 'load-more',
-      'class'   => 'pull-right action-link'
-    )
-  ); ?>
- <?php endif ?>
-<?php endif ?>
-</div>
+<?= $this->partial(
+    'partials/event-history.phtml',
+    array('compact' => $this->compact, 'history' => $history, 'isOverview' => true, 'tableCssClass' => 'table-row-selectable')
+) ?>
+
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 4d6d235bc..1eb5e754d 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -18,7 +18,7 @@ if (! $this->compact): ?>
     <p><?= $this->translate('No host groups found matching the filter.') ?></p>
 </div>
 <?php return; endif ?>
-<table class="action-table listing-table" data-base-target="_next">
+<table class="table-row-selectable common-table" data-base-target="_next">
 <thead>
 <tr>
     <th></th>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 9c955ef66..53b543625 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -22,7 +22,7 @@ if (! $this->compact): ?>
     </div>
 <?php return; endif ?>
     <table data-base-target="_next"
-           class="action-table multiselect"
+           class="table-row-selectable state-table multiselect"
            data-icinga-multiselect-url="<?= $this->href('monitoring/hosts/show') ?>"
            data-icinga-multiselect-controllers="<?= $this->href("monitoring/hosts") ?>"
            data-icinga-multiselect-data="host">
@@ -32,61 +32,63 @@ if (! $this->compact): ?>
         $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name)); ?>
         <tr>
             <td class="state-col state-<?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
-                <p>
-                    <span class="state-label"><?= Host::getStateText($host->host_state, true) ?></span>
+                <div class="state-label"><?= Host::getStateText($host->host_state, true) ?></div>
                 <?php if ((int) $host->host_state !== 99): ?>
-                    <br>
-                    <?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
-                <?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?>
-                    <br>
-                    <span class="text-small">Soft <?= $host->host_attempt ?></span>
+                    <div class="state-meta">
+                        <?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
+                    <?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?>
+                        <div><?= $this->translate('Soft', 'Soft state') ?> <?= $host->host_attempt ?></div>
+                    <?php endif ?>
+                    </div>
                 <?php endif ?>
-                <?php endif ?>
-                </p>
             </td>
-            <td class="clearfix">
-                <?= $this->iconImage()->host($host) ?>
-                <span class="pull-right"><?= implode(' ', $this->hostFlags($host)) ?></span>
-                <?= $this->qlink(
-                    $host->host_display_name,
-                    $hostLink,
-                    null,
-                    array(
-                        'title' => sprintf(
-                            $this->translate('Show detailed information for host %s'),
-                            $host->host_display_name
-                        ),
-                        'class' => 'rowaction'
-                    )
-                ) ?>
-            <?php if (isset($summary[$host->host_name])): ?>
-                <span class="text-small"> (<?= $this->qlink(
-                      sprintf(
-                          $this->translatePlural(
-                              '%u unhandled service', '%u unhandled services', $summary[$host->host_name]
-                          ),
-                          $summary[$host->host_name]
-                      ),
-                      'monitoring/list/services',
-                      array(
-                          'host'               => $host->host_name,
-                          'service_problem'    => 1,
-                          'service_handled'    => 0
-                      ),
-                      array(
-                          'title' => sprintf(
+            <td>
+                <div class="state-header">
+                    <?= $this->iconImage()->host($host) ?>
+                    <?= $this->qlink(
+                        $host->host_display_name,
+                        $hostLink,
+                        null,
+                        array(
+                            'title' => sprintf(
+                                $this->translate('Show detailed information for host %s'),
+                                $host->host_display_name
+                            ),
+                            'class' => 'rowaction'
+                        )
+                    ) ?>
+                <?php if (isset($summary[$host->host_name])): ?>
+                    <span class="host-services-incidents"> &#40;<?= $this->qlink(
+                          sprintf(
                               $this->translatePlural(
-                                  'List %s unhandled service problem on host %s',
-                                  'List %s unhandled service problems on host %s',
-                                  $summary[$host->host_name]
+                                  '%u unhandled service', '%u unhandled services', $summary[$host->host_name]
                               ),
-                              $summary[$host->host_name],
-                              $host->host_name
+                              $summary[$host->host_name]
+                          ),
+                          'monitoring/list/services',
+                          array(
+                              'host'               => $host->host_name,
+                              'service_problem'    => 1,
+                              'service_handled'    => 0
+                          ),
+                          array(
+                              'title' => sprintf(
+                                  $this->translatePlural(
+                                      'List %s unhandled service problem on host %s',
+                                      'List %s unhandled service problems on host %s',
+                                      $summary[$host->host_name]
+                                  ),
+                                  $summary[$host->host_name],
+                                  $host->host_name
+                              )
                           )
-                      )
-                ) ?>)</span>
-            <?php endif ?>
-                <p class="plugin-output"><?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?></p>
+                    ) ?>&#41;</span>
+                <?php endif ?>
+                    <span class="state-icons"><?= implode(' ', $this->hostFlags($host)) ?></span>
+                </div>
+                <p class="overview-plugin-output">
+                    <?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?>
+                </p>
             </td>
         <?php foreach($this->addColumns as $col): ?>
             <td><?= $this->escape($host->$col) ?></td>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 85255cded..a70eb6932 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -2,8 +2,6 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-$notifications->peekAhead($this->compact);
-
 if (! $this->compact): ?>
 <div class="controls separated dont-print">
     <?= $tabs ?>
@@ -16,22 +14,32 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-    <table data-base-target="_next" class="action action-table">
+<?php if (! $notifications->hasResult()): ?>
+    <p><?= $this->translate('No notifications found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table data-base-target="_next" class="table-row-selectable state-table">
     <tbody>
-    <?php foreach ($notifications as $notification):
+    <?php foreach ($notifications->peekAhead($this->compact) as $notification):
         if (isset($notification->service_description)) {
             $isService = true;
+            $stateLabel = Service::getStateText($notification->notification_state, true);
             $stateName = Service::getStateText($notification->notification_state);
         } else {
             $isService = false;
+            $stateLabel = Host::getStateText($notification->notification_state, true);
             $stateName = Host::getStateText($notification->notification_state);
         }
     ?>
         <tr>
             <td class="state-col state-<?= $stateName ?>">
-                <?= $this->timeAgo($notification->notification_start_time, $this->compact) ?>
+                <div class="state-label"><?= $stateLabel ?></div>
+                <div class="state-meta">
+                    <?= $this->timeAgo($notification->notification_start_time, $this->compact) ?>
+                </div>
             </td>
             <td>
+                <div class="state-header">
                 <?php if ($isService): ?>
                     <?= $this->icon('service', $this->translate('Service')); ?>
                     <?= $this->link()->service(
@@ -45,24 +53,24 @@ if (! $this->compact): ?>
                     <?= $this->icon('host', $this->translate('Host')); ?>
                     <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
                 <?php endif ?>
-
                 <?php if (! $this->contact): ?>
-                    <span class="pull-right text-small">
-                        <?php if ($notification->notification_contact_name): ?>
-                            <?= sprintf(
-                                $this->translate('Sent to %s'),
-                                $this->qlink(
-                                    $notification->notification_contact_name,
-                                    'monitoring/show/contact',
-                                    array('contact_name' => $notification->notification_contact_name)
-                                )
-                            ) ?>
-                        <?php else: ?>
-                            <?= $this->translate('This notification was not sent out to any contact.'); ?>
-                        <?php endif ?>
-                    </span>
+                    <div class="notification-recipient">
+                    <?php if ($notification->notification_contact_name): ?>
+                        <?= sprintf(
+                            $this->translate('Sent to %s'),
+                            $this->qlink(
+                                $notification->notification_contact_name,
+                                'monitoring/show/contact',
+                                array('contact_name' => $notification->notification_contact_name)
+                            )
+                        ) ?>
+                    <?php else: ?>
+                        <?= $this->translate('Sent out to any contact') ?>
+                    <?php endif ?>
+                    </div>
                 <?php endif ?>
-                <p class="plugin-output">
+                </div>
+                <p class="overview-plugin-output">
                     <?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
                 </p>
             </td>
@@ -70,17 +78,17 @@ if (! $this->compact): ?>
     <?php endforeach ?>
     </tbody>
     </table>
-<?php if (! $notifications->hasResult()): ?>
-  <?= $this->translate('No notifications found matching the filter'); ?>
-<?php elseif ($notifications->hasMore()): ?>
-  <?= $this->qlink(
-    $this->translate('Show More'),
-    $this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('view', 'limit')),
-    null,
-    array(
-      'data-base-target'    => '_next',
-      'class'               => 'pull-right action-link'
-    )
-  ); ?>
+<?php if ($notifications->hasMore()): ?>
+    <div class="text-right">
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('view', 'limit')),
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_next'
+            )
+        ); ?>
+    </div>
 <?php endif ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index b51bb3baf..3fdefcbe8 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -3,32 +3,20 @@ use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Web\Url;
 
 if (! $this->compact): ?>
-<div class="controls separated">
-  <?= $this->tabs; ?>
-  <div class="grid dont-print">
-    <div class="col-1-3 text-left">
-      <?= $this->limiter ?>
-    </div>
-    <div class="col-1-3">
-      <?= $this->paginator ?>
-    </div>
-    <div class="col-1-3 text-right">
-      <?= $this->sortBox ?>
-    </div>
-  </div>
-  <?= $this->filterEditor; ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->sortBox ?>
+    <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
 <div class="content" data-base-target="_next">
-<?php
-if (empty($pivotData)) {
-    echo $this->translate('No services found matching the filter') . '</div>';
-    return;
-}
+<?php if (empty($pivotData)): ?>
+    <p><?= $this->translate('No services found matching the filter.') ?></p>
+</div>
+<?php return; endif;
 $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . ')';
 ?>
-
-<table class="service-grid-table">
+    <table class="service-grid-table">
     <thead>
         <tr>
             <th><?= $this->partial(
@@ -38,7 +26,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
                     'xAxisPaginator' => $horizontalPaginator,
                     'yAxisPaginator' => $verticalPaginator
                 )
-            ); ?></th>
+            ) ?></th>
         <?php foreach ($pivotHeader['cols'] as $serviceDescription => $serviceDisplayName): ?>
             <th class="rotate-45"><div><span><?= $this->qlink(
                 $this->ellipsis($serviceDisplayName, 18),
@@ -55,7 +43,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
     </thead>
     <tbody>
 
-    <?php $i = 0; ?>
+    <?php $i = 0 ?>
     <?php foreach ($pivotHeader['rows'] as $hostName => $hostDisplayName): ?>
         <tr>
             <th><?php
@@ -79,24 +67,24 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
                 <span class="sr-only" id="<?= $ariaDescribedById ?>">
                     <?= $this->escape($service->service_output) ?>
                 </span>
-              <?= $this->qlink(
-                  '',
-                  'monitoring/service/show',
-                  array(
-                      'host'    => $hostName,
-                      'service' => $serviceDescription
-                  ),
-                array(
-                    'aria-describedby'    => $ariaDescribedById,
-                    'class'               => 'bg-color-' . Service::getStateText($service->service_state) . ($service->service_handled ? ' handled' : ''),
-                    'title'               => $this->escape($service->service_output),
-                    'aria-label'          => sprintf(
-                        $this->translate('Show detailed information for service %s on host %s'),
-                        $service->service_display_name,
-                        $service->host_display_name
+                <?= $this->qlink(
+                    '',
+                    'monitoring/service/show',
+                    array(
+                        'host'    => $hostName,
+                        'service' => $serviceDescription
+                    ),
+                    array(
+                        'aria-describedby'    => $ariaDescribedById,
+                        'aria-label'          => sprintf(
+                            $this->translate('Show detailed information for service %s on host %s'),
+                            $service->service_display_name,
+                            $service->host_display_name
+                        ),
+                        'class'               => 'bg-color-' . Service::getStateText($service->service_state) . ($service->service_handled ? ' handled' : ''),
+                        'title'               => $this->escape($service->service_output)
                     )
-                )
-            ); ?>
+                ) ?>
             </td>
         <?php endforeach ?>
         <?php if (! $this->compact && $this->horizontalPaginator->getPages()->pageCount > 1): ?>
@@ -110,16 +98,16 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
                              .  $this->verticalPaginator->getItemCountPerPage()
                     ),
                     array(
-                        'data-base-target'  => '_self',
-                        'class'             => 'action-link'
+                        'class'             => 'action-link',
+                        'data-base-target'  => '_self'
                     )
                 ) ?>
                 <?= ++$i === (int) (count($pivotHeader['rows']) / 2) ? $expandLink : '' ?>
             </td>
-        <?php endif;?>
+        <?php endif ?>
         </tr>
     <?php endforeach ?>
-    <?php if (! $this->compact && $this->verticalPaginator->getPages()->pageCount > 1): ;?>
+    <?php if (! $this->compact && $this->verticalPaginator->getPages()->pageCount > 1): ?>
         <tr>
             <td colspan="<?= count($pivotHeader['cols']) + 1?>" class="service-grid-table-more">
                 <?php echo $this->qlink(
@@ -130,13 +118,13 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
                             ($this->verticalPaginator->getItemCountPerPage() + 20)
                     ),
                     array(
-                        'data-base-target'  => '_self',
-                        'class'             => 'action-link'
+                        'class'             => 'action-link',
+                        'data-base-target'  => '_self'
                     )
                 ) ?>
             </td>
         </tr>
-    <?php endif;?>
+    <?php endif ?>
     </tbody>
-</table>
+    </table>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 5e9500bea..ca7dfc325 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -16,7 +16,7 @@ if (! $this->compact): ?>
     <p><?= $this->translate('No service groups found matching the filter.') ?></p>
 </div>
 <?php return; endif ?>
-<table class="action-table listing-table" data-base-target="_next">
+<table class="table-row-selectable common-table" data-base-target="_next">
 <thead>
     <th></th>
     <th><?= $this->translate('Service Group') ?></th>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index fc9421795..b0e75c267 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -23,7 +23,7 @@ if (! $this->compact): ?>
 </div>
 <?php return; endif ?>
     <table data-base-target="_next"
-           class="action-table multiselect<?php if ($this->compact): ?> compact<?php endif ?>"
+           class="table-row-selectable state-table multiselect<?php if ($this->compact): ?> compact<?php endif ?>"
            data-icinga-multiselect-url="<?= $this->href('monitoring/services/show') ?>"
            data-icinga-multiselect-controllers="<?= $this->href('monitoring/services') ?>"
            data-icinga-multiselect-data="service,host">
@@ -45,51 +45,55 @@ if (! $this->compact): ?>
         $serviceStateName = Service::getStateText($service->service_state); ?>
         <tr>
             <td class="state-col state-<?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
-                <p>
-                    <span class="state-label"><?= Service::getStateText($service->service_state, true) ?></span>
-                <?php if ((int) $service->service_state !== 99): ?>
-                    <br>
+                <div class="state-label"><?= Service::getStateText($service->service_state, true) ?></div>
+            <?php if ((int) $service->service_state !== 99): ?>
+                <div class="state-meta">
                     <?= $this->timeSince($service->service_last_state_change, $this->compact) ?>
                 <?php if ((int) $service->service_state > 0 && (int) $service->service_state_type === 0): ?>
-                    <br>
-                    <span class="text-small">Soft <?= $service->service_attempt ?></span>
+                    <div><?= $this->translate('Soft', 'Soft state') ?> <?= $service->service_attempt ?></div>
                 <?php endif ?>
-                <?php endif ?>
-                </p>
+                </div>
+            <?php endif ?>
             </td>
 
-            <td class="clearfix">
-                <?= $this->iconImage()->service($service) ?>
-                <span class="pull-right"><?= implode(' ', $this->serviceFlags($service)) ?></span>
-                <?php if ($this->showHost): ?><?= $this->qlink(
-                    $service->host_display_name
-                    . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''),
-                    $hostLink,
-                    null,
-                    array(
-                        'title' => sprintf(
-                            $this->translate('Show detailed information for host %s'),
-                            $service->host_display_name
+            <td>
+                <div class="state-header">
+                    <?= $this->iconImage()->service($service) ?>
+                    <?php if ($this->showHost): ?><?= $this->qlink(
+                        $service->host_display_name
+                        . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''),
+                        $hostLink,
+                        null,
+                        array(
+                            'title' => sprintf(
+                                $this->translate('Show detailed information for host %s'),
+                                $service->host_display_name
+                            )
                         )
-                    )
-                ) ?>:
-                <?php endif ?><?= $this->qlink(
-                    $service->service_display_name,
-                    $serviceLink,
-                    null,
-                    array(
-                        'title' => sprintf(
-                            $this->translate('Show detailed information for service %s on host %s'),
-                            $service->service_display_name,
-                            $service->host_display_name
-                        ),
-                        'class' => 'rowaction'
-                    )
-                ) ?><br />
-                <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div>
-                <p class="plugin-output">
-                    <?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true) ?>
-                </p>
+                    ) ?>&#58;
+                    <?php endif ?><?= $this->qlink(
+                        $service->service_display_name,
+                        $serviceLink,
+                        null,
+                        array(
+                            'title' => sprintf(
+                                $this->translate('Show detailed information for service %s on host %s'),
+                                $service->service_display_name,
+                                $service->host_display_name
+                            ),
+                            'class' => 'rowaction'
+                        )
+                    ) ?>
+                    <span class="state-icons"><?= implode(' ', $this->serviceFlags($service)) ?></span>
+                </div>
+                <div class="overview-plugin-output-container">
+                    <div class="overview-performance-data">
+                        <?= $this->perfdata($service->service_perfdata, true, 5) ?>
+                    </div>
+                    <p class="overview-plugin-output">
+                        <?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true) ?>
+                    </p>
+                </div>
             </td>
         <?php foreach($this->addColumns as $col): ?>
             <td><?= $this->escape($service->$col) ?></td>
diff --git a/modules/monitoring/application/views/scripts/object/detail-history.phtml b/modules/monitoring/application/views/scripts/object/detail-history.phtml
new file mode 100644
index 000000000..692d3e4ee
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/object/detail-history.phtml
@@ -0,0 +1,13 @@
+<?php
+
+if (! $this->compact): ?>
+<div class="controls separated">
+    <?= $this->tabs ?>
+<?php if ($object->type === 'service') {
+    echo $this->render('partials/object/service-header.phtml');
+} else {
+    echo $this->render('partials/object/host-header.phtml');
+} ?>
+</div>
+<?php endif ?>
+<?= $this->render('partials/event-history.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
index cfd4421f3..f35680cab 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
@@ -21,4 +21,4 @@ switch ($comment->type) {
         $tooltip = $this->translate('Comment was caused by an acknowledgement');
         break;
 }
-echo $this->icon($icon, $tooltip, array('class' => 'big-icon'));
+echo $this->icon($icon, $tooltip, array('class' => 'large-icon'));
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index 695c71901..2d4f32792 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -1,4 +1,4 @@
-<span class="comment-header">
+<div class="comment-header">
 <?php if ($comment->objecttype === 'service'): ?>
     <?= $this->icon('service', $this->translate('Service')) ?> <?= $this->qlink(
         $comment->host_display_name . ': ' . $comment->service_display_name,
@@ -28,27 +28,31 @@
         )
     ) ?>
 <?php endif ?>
-    <?= $this->translate('by') ?>
-    <?= $this->escape($comment->author) ?>
-    <?= $this->timeAgo($comment->timestamp) ?>
-    <span class="pull-right" data-base-target="_self">
-        <?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?>
-        <?= $comment->expiration ? $this->icon('clock', sprintf(
-            $this->translate('This comment expires %s.'),
-            $this->timeUntil($comment->expiration)
-        )) : '' ?>
-    <?php if (isset($delCommentForm)) {
-        $delCommentForm = clone $delCommentForm;
-        $delCommentForm->populate(
-            array(
-                'comment_id'            => $comment->id,
-                'comment_is_service'    => isset($comment->service_description)
-            )
-        );
-        echo $delCommentForm;
-    } ?>
+    <span class="comment-meta">
+        <?= $this->translate('by') ?>
+        <?= $this->escape($comment->author) ?>
+        <?= $this->timeAgo($comment->timestamp) ?>
+        <span class="meta-icons" data-base-target="_self">
+            <?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?>
+            <?= $comment->expiration ? $this->icon('clock', sprintf(
+                $this->translate('This comment expires %s.'),
+                $this->timeUntil($comment->expiration)
+            )) : '' ?>
+        <?php if (isset($delCommentForm)) {
+            $deleteButton = clone $delCommentForm;
+            /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */
+            $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
+            $deleteButton->populate(
+                array(
+                    'comment_id'            => $comment->id,
+                    'comment_is_service'    => isset($comment->service_description)
+                )
+            );
+            echo $deleteButton;
+        } ?>
+        </span>
     </span>
-</span>
+</div>
 <p class="comment-text">
     <?= $this->escape($comment->comment) ?>
 </p>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
index 3dcb479cd..44724796a 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
@@ -1,6 +1,6 @@
 <table>
   <tr>
-    <td class="comment-col">
+    <td class="icon-col">
         <?= $this->render('partials/comment/comment-description.phtml') ?>
     </td>
     <td>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
index 68cc1f958..c4c92daaf 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
@@ -2,12 +2,12 @@
     <tbody>
     <?php
     foreach ($comments as $i => $comment):
-        if ($i > 5) {
+        if ($i === 5) {
             break;
         }
     ?>
     <tr>
-        <td class="comment-col">
+        <td class="icon-col">
             <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)) ?>
         </td>
         <td>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 9c7f7af19..cc5c79d9a 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -1,14 +1,14 @@
 <td class="state-col state-<?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
   <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
-      <strong><?= $this->translate('Ends'); ?></strong>
-      <p><?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?></p>
+      <div class="state-label"><?= $this->translate('ENDS', 'Downtime status'); ?></div>
+      <div class="state-meta"><?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?></div>
   <?php else: ?>
-      <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
-      <p><?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?></p>
+      <div class="state-label"><?= $downtime->is_in_effect ? $this->translate('EXPIRES', 'Downtime status') : $this->translate('STARTS', 'Downtime status'); ?></div>
+      <div class="state-meta"><?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?></div>
   <?php endif; ?>
 </td>
 <td>
-  <span class="comment-header">
+  <div class="comment-header">
     <?php if ($isService): ?>
         <?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink(
             $downtime->host_display_name . ': ' . $downtime->service_display_name,
@@ -38,11 +38,10 @@
             )
         ); ?>
     <?php endif ?>
-
-    <?= $this->translate('by') ?>
-    <?= $this->escape($downtime->author_name) ?>
-
-    <span class="pull-right">
+    <span class="comment-meta">
+        <?= $this->translate('by') ?>
+        <?= $this->escape($downtime->author_name) ?>
+        <span class="meta-icons">
           <?php if ($downtime->is_flexible): ?>
               <?= $this->icon('magic', $this->translate('This downtime is flexible')); ?>
           <?php endif ?>
@@ -52,22 +51,23 @@
           <?php endif ?>
 
           <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
-          <?php
-          $delDowntimeForm = clone $delDowntimeForm;
-          $delDowntimeForm->populate(
-              array(
-                  'downtime_id' => $downtime->id,
-                  'downtime_is_service' => isset($downtime->service_description)
-              )
-          );
-          echo $delDowntimeForm;
-          ?>
+              <?php
+              $deleteButton = clone $delDowntimeForm;
+              /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm $deleteButton */
+              $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
+              $deleteButton->populate(
+                  array(
+                      'downtime_id'         => $downtime->id,
+                      'downtime_is_service' => isset($downtime->service_description)
+                  )
+              );
+              echo $deleteButton;
+              ?>
           <?php endif ?>
+        </span>
     </span>
-  </span>
-  <?php if (isset ($displayComment) && $displayComment): ?>
-    <p class="comment-text">
-      <?= $this->escape($downtime->comment) ?>
-    </p>
-  <?php endif ?>
+  </div>
+  <p class="comment-text">
+    <?= $this->escape($downtime->comment) ?>
+  </p>
 </td>
diff --git a/modules/monitoring/application/views/scripts/partials/event-history.phtml b/modules/monitoring/application/views/scripts/partials/event-history.phtml
new file mode 100644
index 000000000..e7ae0e034
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/event-history.phtml
@@ -0,0 +1,179 @@
+<?php
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
+function contactsLink($match, $view) {
+    $links = array();
+    foreach (preg_split('/,\s/', $match[1]) as $contact) {
+        $links[] = $view->qlink(
+            $contact,
+            'monitoring/show/contact',
+            array('contact_name' => $contact),
+            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
+        );
+    }
+    return '[' . implode(', ', $links) . ']';
+}
+
+$self = $this;
+
+$url = $this->url();
+$limit = (int) $url->getParam('limit', 25);
+if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
+    $page = 1;
+}
+
+/** @var \Icinga\Module\Monitoring\DataView\EventHistory $history */
+$history->limit($limit * $page);
+?>
+<div class="content">
+<?php if (! $history->hasResult()): ?>
+    <p><?= $this->translate('No historical events found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table class="state-table" data-base-target="_next"<?php if (isset($tableCssClass)): ?> class="<?=$tableCssClass ?>"<?php endif ?>>
+    <tbody>
+    <?php foreach ($history->peekAhead() as $event):
+        $icon = '';
+        $iconCssClass = '';
+        $isService = isset($event->service_description);
+        $msg = $event->output;
+        $stateName = 'no-state';
+        switch ($event->type) {
+            case 'notify':
+                $icon = 'bell-alt';
+                $label = $this->translate('NOTIFICATION');
+                $msg = $msg ? preg_replace_callback(
+                    '/^\[([^\]]+)\]/',
+                    function($match) use ($self) { return contactsLink($match, $self); },
+                    $msg
+                ) : $this->translate('This notification was not sent out to any contact.');
+                $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+                break;
+            case 'comment':
+                $icon = 'comment';
+                $label = $this->translate('COMMENT');
+                break;
+            case 'comment_deleted':
+                $icon = 'cancel';
+                $label = $this->translate('COMMENT DELETED');
+                break;
+            case 'ack':
+                $icon = 'ok';
+                $label = $this->translate('ACKNOWLEDGED');
+                break;
+            case 'ack_deleted':
+                $icon = 'ok';
+                $iconCssClass = 'icon-strikethrough';
+                $label = $this->translate('ACKNOWLEDGEMENT REMOVED');
+                break;
+            case 'dt_comment':
+                // TODO(el): Does not appear in history
+                $icon = 'plug';
+                $label = $this->translate('SCHEDULED DOWNTIME');
+                break;
+            case 'dt_comment_deleted':
+                // TODO(el): Does not appear in history
+                $icon = 'plug';
+                $iconCssClass = 'icon-strikethrough';
+                $label = $this->translate('DOWNTIME DELETED');
+                break;
+            case 'flapping':
+                // TODO(el): Icon
+                $label = $this->translate('FLAPPING');
+                break;
+            case 'flapping_deleted':
+                // TODO(el): Icon
+                $label = $this->translate('FLAPPING STOPPED');
+                break;
+            case 'hard_state':
+                $label = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
+                $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+                break;
+            case 'soft_state':
+                $label = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
+                $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+                break;
+            case 'dt_start':
+                $icon = 'plug';
+                $label = $this->translate('DOWNTIME START');
+                break;
+            case 'dt_end':
+                $icon = 'plug';
+                $iconCssClass = 'icon-strikethrough';
+                $label = $this->translate('DOWNTIME END');
+                break;
+        } ?>
+        <tr>
+            <td class="state-col state-<?= $stateName ?>">
+            <?php if ($history->getIteratorPosition() % $limit === 0): ?>
+                <a id="page-<?= $history->getIteratorPosition() / $limit + 1 ?>"></a>
+            <?php endif ?>
+                <div class="state-label"><?= $this->escape($label) ?></div>
+                <div class="state-meta"><?= $this->timeAgo($event->timestamp, $this->compact) ?></div>
+            </td>
+            <td>
+                <?php if ($this->isOverview): ?>
+                    <?= $this->qlink(
+                        $event->host_display_name,
+                        'monitoring/host/show',
+                        array(
+                            'host' => $event->host_name,
+                        ),
+                        array('title' => sprintf(
+                            $this->translate('Show detailed information for host %s'),
+                            $event->host_display_name
+                        ))
+                    ) ?><?php if ($isService): ?>&#58;
+                        <?= $this->qlink(
+                            $event->service_display_name,
+                            'monitoring/service/show',
+                            array(
+                                'host'      => $event->host_name,
+                                'service'   => $event->service_description
+                            ),
+                            array(
+                                'class' => 'rowaction',
+                                'title' => sprintf(
+                                    $this->translate('Show detailed information for service %s on host %s'),
+                                    $event->service_display_name,
+                                    $event->host_display_name
+                                )
+                            )
+                        ) ?>
+                    <?php endif ?>
+                <?php endif ?>
+                <p class="overview-plugin-output">
+                    <?php if ($icon) {
+                        echo $this->icon($icon, null, $iconCssClass ? array('class' => $iconCssClass) : array());
+                    } ?>
+                    <?= nl2br($this->createTicketLinks($this->escape($msg)), false) ?>
+                </p>
+            </td>
+        </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
+<?php if ($history->hasMore()): ?>
+    <div class="action-links">
+    <?php if ($this->compact) {
+        echo $this->qlink(
+            $this->translate('Show More'),
+            $url->without(array('view', 'limit')),
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_next'
+            )
+        );
+    } else {
+        echo $this->qlink(
+            $this->translate('Load More'),
+            $url->setAnchor('page-' . ($page + 1)),
+            array('page' => $page + 1,),
+            array('class' => 'action-link')
+        );
+    } ?>
+    </div>
+<?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 0a3fdbaf6..731ba1cf8 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -1,48 +1,41 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
 
-$i = 0;
-?>
-
-<?php if (($hostCount = count($objects)) > 0): ?>
-    <table class="action state statesummary">
-        <tbody>
-        <?php foreach ($objects as $host): /** @var Host $host */ ?>
-            <?php
-            if (++ $i > 5) {
-                continue;
-            }
-            ?>
-
-            <tr>
-                <td class="state-col state-<?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
-                    <?= Host::getStateText($host->host_state, true); ?>
-                    <br />
-                </td>
-                <td>
-                <?= $this->iconImage()->host($host) ?>
-                <?= implode(' ', $this->hostFlags($host)) ?>
-                <b><?= $this->escape($host->getName()); ?></b><br>
-                <?= $this->escape($host->host_output) ?>
-                </td>
-            </tr>
-        <?php endforeach ?>
-    </tbody>
-    </table>
-    <div class="hbox-item multi-commands">
-        <?php if ($i > 5): ?>
-        <?=
-        $this->qlink(
-            sprintf($this->translate('show all %d hosts'), $i),
-            $listAllLink,
-            null,
-            array(
-                'icon' => 'down-open',
-                'data-base-target' => '_next'
-            )
-        );
-        ?>
-        <?php endif ?>
-    </div>
+if (! ($hostCount = count($objects))): return; endif ?>
+<table class="state-table host-detail-state">
+<tbody>
+<?php foreach ($objects as $i => $host): /** @var Host $host */
+    if ($i === 5) {
+        break;
+    } ?>
+    <tr>
+        <td class="state-col state-<?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
+            <span class="sr-only"><?= Host::getStateText($host->host_state) ?></span>
+            <div class="state-meta">
+                <?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
+            </div>
+        </td>
+        <td>
+            <?= $this->link()->host(
+                $host->host_name,
+                $host->host_display_name
+            ) ?>
+            <?= implode(' ', $this->hostFlags($host)) ?>
+        </td>
+    </tr>
+<?php endforeach ?>
+</tbody>
+</table>
+<?php if ($hostCount > 5): ?>
+<div class="hosts-link">
+    <?= $this->qlink(
+        sprintf($this->translate('List all %d hosts'), $hostCount),
+        $this->url()->setPath('monitoring/list/hosts'),
+        null,
+        array(
+            'data-base-target'  => '_next',
+            'icon'              => 'forward'
+        )
+    ) ?>
+</div>
 <?php endif ?>
-
diff --git a/modules/monitoring/application/views/scripts/partials/object/host-header.phtml b/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
index 35f17489a..8bc7b6c64 100644
--- a/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
@@ -2,36 +2,34 @@
 use Icinga\Module\Monitoring\Object\Host;
 /** @var Host $object */
 ?>
-<table>
+<table class="state-table host-detail-state">
     <tr>
         <td class="state-col state-<?= Host::getStateText($object->host_state) ?><?= $object->host_handled ? ' handled' : '' ?>">
-            <p>
-                <?= Host::getStateText($object->host_state, true) ?>
-                <br>
+            <div class="state-header"><?= Host::getStateText($object->host_state, true) ?></div>
+            <div class="state-meta">
                 <?= $this->timeSince($object->host_last_state_change) ?>
-            </p>
+            <?php if ((int) $object->host_state > 0 && (int) $object->host_state_type === 0): ?>
+                <div><?= $this->translate('Soft', 'Soft state') ?> <?= $object->host_attempt ?></div>
+            <?php endif ?>
+            </div>
         </td>
         <td>
-            <p>
-                <?= $this->iconImage()->host($object) ?>
-                <span class="selectable"><?= $this->escape($object->host_display_name) ?></span>
-            <?php if ($object->host_display_name !== $object->host_name): ?>
-                <span class="selectable text-small">&#40;<?= $this->escape($object->host_name) ?>&#41;</span>
-            <?php endif ?>
-            <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
-                <br>
-                <span class="selectable text-small" title="<?= $this->translate('IPv6 address') ?>">
-                    <?= $this->escape($object->host_address6) ?>
-                </span>
-            <?php endif ?>
-            <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
-                <br>
-                <span class="selectable text-small" title="<?= $this->translate('IPv4 address') ?>">
-                    <?= $this->escape($object->host_address) ?>
-                </span>
-            <?php endif ?>
-                <?= $this->render('partials/host/statusicons.phtml') ?>
-            </p>
+            <?= $this->iconImage()->host($object) ?>
+            <span class="selectable"><?= $this->escape($object->host_display_name) ?></span>
+        <?php if ($object->host_display_name !== $object->host_name): ?>
+            <span class="selectable host-meta">&#40;<?= $this->escape($object->host_name) ?>&#41;</span>
+        <?php endif ?>
+            <?= $this->render('partials/host/statusicons.phtml') ?>
+        <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
+            <div class="selectable host-meta" title="<?= $this->translate('IPv6 address') ?>">
+                <?= $this->escape($object->host_address6) ?>
+            </div>
+        <?php endif ?>
+        <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
+            <div class="selectable host-meta" title="<?= $this->translate('IPv4 address') ?>">
+                <?= $this->escape($object->host_address) ?>
+            </div>
+        <?php endif ?>
         </td>
     </tr>
 </table>
diff --git a/modules/monitoring/application/views/scripts/partials/object/service-header.phtml b/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
index 4a34113fe..93eb41f94 100644
--- a/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
@@ -3,55 +3,53 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 ?>
-<table>
+<table class="state-table service-detail-state">
     <tr>
         <td class="state-col state-<?= Host::getStateText($object->host_state) ?><?= $object->host_handled ? ' handled' : '' ?>">
-            <p>
-                <?= Host::getStateText($object->host_state, true) ?>
-                <br>
+            <div class="state-label"><?= Host::getStateText($object->host_state, true) ?></div>
+            <div class="state-meta">
                 <?= $this->timeSince($object->host_last_state_change) ?>
-            </p>
+            <?php if ((int) $object->host_state > 0 && (int) $object->host_state_type === 0): ?>
+                <div><?= $this->translate('Soft', 'Soft state') ?> <?= $object->host_attempt ?></div>
+            <?php endif ?>
+            </div>
         </td>
         <td>
-            <p>
-                <?= $this->iconImage()->service($object) ?>
-                <span class="selectable"><?= $this->escape($object->host_display_name) ?></span>
-            <?php if ($object->host_display_name !== $object->host_name): ?>
-                <span class="selectable text-small">&#40;<?= $this->escape($object->host_name) ?>&#41;</span>
-            <?php endif ?>
-            <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
-                <br>
-                <span class="selectable text-small" title="<?= $this->translate('IPv6 address') ?>">
-                <?= $this->escape($object->host_address6) ?>
-            </span>
-            <?php endif ?>
-            <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
-                <br>
-                <span class="selectable text-small" title="<?= $this->translate('IPv4 address') ?>">
-                <?= $this->escape($object->host_address) ?>
-            </span>
-            <?php endif ?>
+            <?= $this->iconImage()->host($object) ?>
+            <span class="selectable"><?= $this->escape($object->host_display_name) ?></span>
+        <?php if ($object->host_display_name !== $object->host_name): ?>
+            <span class="selectable host-meta">&#40;<?= $this->escape($object->host_name) ?>&#41;</span>
+        <?php endif ?>
             <?= $this->render('partials/host/statusicons.phtml') ?>
-            </p>
+        <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
+            <div class="selectable host-meta" title="<?= $this->translate('IPv6 address') ?>">
+                <?= $this->escape($object->host_address6) ?>
+            </div>
+        <?php endif ?>
+        <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
+            <div class="selectable host-meta" title="<?= $this->translate('IPv4 address') ?>">
+                <?= $this->escape($object->host_address) ?>
+            </div>
+        <?php endif ?>
         </td>
     </tr>
     <tr>
         <td class="state-col state-<?= Service::getStateText($object->service_state) ?><?= $object->service_handled ? ' handled' : '' ?>">
-            <p>
-                <?= Service::getStateText($object->service_state, true) ?>
-                <br>
+            <div class="state-label"><?= Service::getStateText($object->service_state, true) ?></div>
+            <div class="state-meta">
                 <?= $this->timeSince($object->service_last_state_change) ?>
-            </p>
+            <?php if ((int) $object->service_state > 0 && (int) $object->service_state_type === 0): ?>
+                <div><?= $this->translate('Soft', 'Soft state') ?> <?= $object->service_attempt ?></div>
+            <?php endif ?>
+            </div>
         </td>
         <td>
-            <p>
-                <?= $this->iconImage()->host($object) ?>
-                <?= $this->translate('Service') ?>&#58; <span class="selectable"><?= $this->escape($object->service_display_name) ?></span>
+            <?= $this->iconImage()->service($object) ?>
+            <?= $this->translate('Service') ?>&#58; <span class="selectable"><?= $this->escape($object->service_display_name) ?></span>
             <?php if ($object->service_display_name !== $object->service_description): ?>
-                <span class="selectable text-small">&#40;<?= $this->escape($object->service_description) ?>&#41;</span>
+                <span class="selectable service-meta">&#40;<?= $this->escape($object->service_description) ?>&#41;</span>
             <?php endif ?>
-                <?= $this->render('partials/service/statusicons.phtml') ?>
-            </p>
+            <?= $this->render('partials/service/statusicons.phtml') ?>
         </td>
     </tr>
 </table>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index d75de6029..7512a3042 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -1,46 +1,45 @@
 <?php
+use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-$i = 0;
-?>
-<?php if (($serviceCount = count($objects)) > 0): ?>
-    <table class='action state statesummary'>
-    <tbody>
-    <?php foreach ($objects as $service): /** @var Service $service */ ?>
-        <?php
-        if (++ $i > 5) {
-            continue;
-        }
-        ?>
-        <tr>
-            <td class="state-col state-<?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>"?>
-                <?= Service::getStateText($service->service_state, true); ?><br />
-            </td>
-            <td>
-            <?= $this->iconImage()->service($service) ?>
+if (! ($serviceCount = count($objects))): return; endif ?>
+<table class="state-table service-detail-state">
+<tbody>
+<?php foreach ($objects as $i => $service): /** @var Service $service */
+    if ($i === 5) {
+        break;
+    } ?>
+    <tr>
+        <td class="state-col state-<?= Service::getStateText($service->service_state) ?><?= $service->service_handled ? ' handled' : '' ?>">
+            <span class="sr-only"><?= Service::getStateText($service->service_state) ?></span>
+            <div class="state-meta">
+                <?= $this->timeSince($service->service_last_state_change, $this->compact) ?>
+            </div>
+        </td>
+        <td>
+            <?= $this->link()->service(
+                $service->service_description,
+                $service->service_display_name,
+                $service->host_name,
+                $service->host_display_name
+                    . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : '')
+            ) ?>
             <?= implode(' ', $this->serviceFlags($service)) ?>
-            <b>
-               <?= $this->escape($service->getHost()->getName()); ?>:
-               <?= $this->escape($service->getName()); ?> <br>
-            </b>
-            <?= $this->escape($service->service_output) ?>
-            </td>
-        </tr>
-    <?php endforeach ?>
-    </tbody>
-    </table>
-    <div class="hbox-item multi-commands">
-        <?php if ($i > 5): ?>
-        <?= $this->qlink(
-            sprintf($this->translate('List all %d services'), $i),
-            $listAllLink,
-            null,
-            array(
-                'icon' => 'down-open',
-                'data-base-target' => '_next'
-            )
-        );
-        ?>
-        <?php endif ?>
-    </div>
+        </td>
+    </tr>
+<?php endforeach ?>
+</tbody>
+</table>
+<?php if ($serviceCount > 5): ?>
+<div class="services-link">
+    <?= $this->qlink(
+        sprintf($this->translate('List all %d services'), $serviceCount),
+        $this->url()->setPath('monitoring/list/services'),
+        null,
+        array(
+            'data-base-target'  => '_next',
+            'icon'              => 'forward'
+        )
+    ) ?>
+</div>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/service/history.phtml b/modules/monitoring/application/views/scripts/service/history.phtml
deleted file mode 100644
index db4625c0a..000000000
--- a/modules/monitoring/application/views/scripts/service/history.phtml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-use Icinga\Module\Monitoring\Object\Service;
-
-function contactsLink($match, $view) {
-    $links = array();
-    foreach (preg_split('/,\s/', $match[1]) as $contact) {
-        $links[] = $view->qlink(
-            $contact,
-            'monitoring/show/contact',
-            array('contact_name' => $contact),
-            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
-        );
-    }
-    return '[' . implode(', ', $links) . ']';
-}
-
-$self = $this;
-
-$url = $this->url();
-$limit = (int) $url->getParam('limit', 25);
-if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
-    $page = 1;
-}
-
-$history->limit($limit * $page);
-
-if (! $this->compact): ?>
-<div class="controls">
-  <?= $this->tabs; ?>
-  <?= $this->render('partials/object/service-header.phtml'); ?>
-  <h1><?= $this->translate('This Service\'s Event History'); ?></h1>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <a href="#load-more">
-    <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
-  </a>
-  <?= $this->filterEditor; ?>
-</div>
-<?php endif ?>
-<div class="content">
-  <table data-base-target="_next" class="action objecthistory">
-    <tbody>
-    <?php foreach ($history->peekAhead() as $event): ?>
-    <?php
-      $stateClass = 'invalid';
-      $msg = $this->escape($event->output);
-      switch ($event->type) {
-        case 'notify':
-          $icon = 'notification';
-          $title = $this->translate('Notification');
-          $stateClass = Service::getStateText($event->state);
-
-          $msg = $msg ? preg_replace_callback(
-              '/^\[([^\]]+)\]/',
-              function($match) use ($self) { return contactsLink($match, $self); },
-              $msg
-          ) : $this->translate('This notification was not sent out to any contact.');
-          break;
-        case 'comment':
-          $icon = 'comment';
-          $title = $this->translate('Comment');
-          break;
-        case 'comment_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Comment deleted');
-          break;
-        case 'ack':
-          $icon = 'acknowledgement';
-          $title = $this->translate('Acknowledge');
-          break;
-        case 'ack_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Ack removed');
-          break;
-        case 'dt_comment':
-          $icon = 'in_downtime';
-          $title = $this->translate('In Downtime');
-          break;
-        case 'dt_comment_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Downtime removed');
-          break;
-        case 'flapping':
-          $icon = 'flapping';
-          $title = $this->translate('Flapping');
-          break;
-        case 'flapping_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Flapping stopped');
-          break;
-        case 'hard_state':
-          $stateClass = Service::getStateText($event->state);
-          $icon = 'attention-alt';
-          $title = Service::getStateText($event->state);
-          break;
-        case 'soft_state':
-          $icon = 'spinner';
-          $stateClass = Service::getStateText($event->state);
-          $title = Service::getStateText($event->state);
-          break;
-        case 'dt_start':
-          $icon = 'downtime_start';
-          $title = $this->translate('Downtime Start');
-          break;
-        case 'dt_end':
-          $icon = 'downtime_end';
-          $title = $this->translate('Downtime End');
-          break;
-      }
-    ?>
-      <tr class="state <?= $stateClass; ?>">
-        <td class="state">
-        <?php if ($history->getIteratorPosition() % $limit === 0): ?>
-          <a id="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
-        <?php endif ?>
-          <strong><?= $this->escape($title); ?></strong>
-          <br>
-          <?= date('d.m. H:i', $event->timestamp); ?>
-        </td>
-        <td>
-          <?= sprintf(
-              $this->translate('%s on %s', 'Service running on host'),
-              $this->escape($event->service_display_name),
-              $event->host_display_name
-          ) ?>
-          <br>
-          <div>
-            <?= $this->icon($icon, $title); ?> <?= $this->createTicketLinks($msg) ?>
-          </div>
-        </td>
-      </tr>
-    <?php endforeach; ?>
-    </tbody>
-  </table>
-<?php if (! $history->hasResult()): ?>
-  <?= $this->translate('No history events found matching the filter'); ?>
-<?php elseif ($history->hasMore()): ?>
-  <?= $this->qlink(
-    $this->translate('Load More'),
-    $url->setAnchor('page-' . ($page + 1)),
-    array(
-      'page'    => $page + 1,
-    ),
-    array(
-      'id'      => 'load-more',
-      'class'   => 'pull-right action-link'
-    )
-  ); ?>
-<?php endif ?>
-</div>
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 5582cf084..77d99f69f 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -7,86 +7,87 @@ if (in_array((int) $object->state, array(0, 99))) {
     return;
 }
 
-if ($object->acknowledged): ?>
-    <?php
-    $acknowledgement = $object->acknowledgement;
-    /** @var \Icinga\Module\Monitoring\Object\Acknowledgement $acknowledgement */
-    ?>
-    <tr>
-        <th><?= $this->translate('Acknowledged') ?></th>
-        <td data-base-target="_self">
-            <dl class="feed-list">
-                <dt class="feed-author clearfix">
-                    <?= $this->escape($acknowledgement->getAuthor()) ?>
-                    <span class="text-small"><?= $this->translate('acknowledged') ?></span>
+if ($object->acknowledged):
+$acknowledgement = $object->acknowledgement;
+/** @var \Icinga\Module\Monitoring\Object\Acknowledgement $acknowledgement */
+?>
+<tr>
+    <th><?= $this->translate('Acknowledged') ?></th>
+    <td data-base-target="_self">
+        <dl class="comment-list">
+            <dt class="comment-header">
+                <?= $this->escape($acknowledgement->getAuthor()) ?>
+                <span class="comment-meta">
+                    <?= $this->translate('acknowledged') ?>
                     <?= $this->timeAgo($acknowledgement->getEntryTime()) ?>
-                    <?php
-                    if ($acknowledgement->getSticky()) {
-                        echo $this->icon('pin', sprintf(
-                            $this->translate(
-                                'Acknowledgement remains until the %1$s recovers even if the %1$s changes state'
-                            ),
-                            $object->getType(true)
-                        ));
-                    }
-                    if (isset($removeAckForm)) {
-                        $removeAckForm->setAttrib('class', $removeAckForm->getAttrib('class') . ' pull-right');
-                        // Form is unset if the current user lacks the respective permission
-                        echo $removeAckForm;
-                    }
-                    ?>
-                </dt>
-                <dd class="comment-text">
-                    <?= nl2br($this->createTicketLinks($acknowledgement->getComment()), false) ?>
-                </dd>
-            <?php if ($acknowledgement->expires()): ?>
-                <dd class="text-small">
+                <?php if ($acknowledgement->expires()): ?>
+                    <span aria-hidden="true">&#448;</span>
                     <?= sprintf(
                         $this->translate('Expires %s'),
                         $this->timeUntil($acknowledgement->getExpirationTime())
                     ) ?>
-                </dd>
-            <?php endif ?>
-            </dl>
-        </td>
-    </tr>
+                <?php endif ?>
+                <?php if ($acknowledgement->getSticky()): ?>
+                    <?= $this->icon('pin', sprintf(
+                        $this->translate(
+                            'Acknowledgement remains until the %1$s recovers even if the %1$s changes state'
+                        ),
+                        $object->getType(true)
+                    )) ?>
+                <?php endif ?>
+                <?php if (isset($removeAckForm)): // Form is unset if the current user lacks the respective permission ?>
+                    <span class="meta-icons">
+                        <?php
+                        $removeAckForm->setAttrib('class', $removeAckForm->getAttrib('class') . ' remove-action');
+                        echo $removeAckForm;
+                        ?>
+                    </span>
+                <?php endif ?>
+                </span>
+            </dt>
+            <dd class="comment-text">
+                <p><?= nl2br($this->createTicketLinks($this->escape($acknowledgement->getComment())), false) ?></p>
+            </dd>
+        </dl>
+    </td>
+</tr>
 <?php else: ?>
-    <tr>
-        <th><?= $this->translate('Not acknowledged') ?></th>
-        <td>
-            <?php if ($this->hasPermission('monitoring/command/acknowledge-problem')) {
-                if ($object->getType() === $object::TYPE_HOST) {
-                    $ackLink = $this->href(
-                        'monitoring/host/acknowledge-problem',
-                        array('host' => $object->getName()),
-                        null,
-                        array('class' => 'action-link')
-                    );
-                } else {
-                    $ackLink = $this->href(
-                        'monitoring/service/acknowledge-problem',
-                        array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
-                        null,
-                        array('class' => 'action-link')
-                    );
-                }
-            ?>
-            <?= $this->qlink(
-                $this->translate('Acknowledge'),
-                $ackLink,
+<tr>
+    <th><?= $this->translate('Not acknowledged') ?></th>
+    <td>
+    <?php if ($this->hasPermission('monitoring/command/acknowledge-problem')) {
+        if ($object->getType() === $object::TYPE_HOST) {
+            $ackLink = $this->href(
+                'monitoring/host/acknowledge-problem',
+                array('host' => $object->getName()),
                 null,
-                array(
-                    'class'             => 'action-link',
-                    'data-base-target'  => '_self',
-                    'icon'              => 'ok',
-                    'title'             => $this->translate(
-                        'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
-                    )
+                array('class' => 'action-link')
+            );
+        } else {
+            $ackLink = $this->href(
+                'monitoring/service/acknowledge-problem',
+                array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                null,
+                array('class' => 'action-link')
+            );
+        }
+    ?>
+        <?= $this->qlink(
+            $this->translate('Acknowledge'),
+            $ackLink,
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_self',
+                'icon'              => 'ok',
+                'title'             => $this->translate(
+                    'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
                 )
-            ); ?>
-            <?php } else {
-                echo '&#45;';
-            } // endif ?>
-        </td>
-    </tr>
+            )
+        ); ?>
+    <?php } else {
+        echo '&#45;';
+    } // endif ?>
+    </td>
+</tr>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/checksource.phtml b/modules/monitoring/application/views/scripts/show/components/checksource.phtml
index 5405e0d22..5e65e9d33 100644
--- a/modules/monitoring/application/views/scripts/show/components/checksource.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checksource.phtml
@@ -4,19 +4,17 @@
         <?= $this->translate('Check Source') ?>
     </th>
     <td>
-        <p>
-            <?php if ($object->is_reachable !== null) {
-                if ((bool) $object->is_reachable) {
-                    echo $this->icon('circle', $this->translate('Is reachable'), array('class' => 'fg-color-ok'));
-                } else {
-                    echo $this->icon('circle', $this->translate('Not reachable'), array('class' => 'fg-color-critical'));
-                }
-            } ?>
-            <?= $this->escape($object->check_source) ?>
-        <?php if ($object->is_reachable !== null): ?>
-            <span class="text-small"><?= (bool) $object->is_reachable ? $this->translate('is reachable') : $this->translate('is not reachable') ?></span>
-        <?php endif ?>
-        </p>
+        <?php if ($object->is_reachable !== null) {
+            if ((bool) $object->is_reachable) {
+                echo $this->icon('circle', $this->translate('Is reachable'), array('class' => 'fg-color-ok'));
+            } else {
+                echo $this->icon('circle', $this->translate('Not reachable'), array('class' => 'fg-color-critical'));
+            }
+        } ?>
+        <?= $this->escape($object->check_source) ?>
+    <?php if ($object->is_reachable !== null): ?>
+        <span class="check-source-meta"><?= (bool) $object->is_reachable ? $this->translate('is reachable') : $this->translate('is not reachable') ?></span>
+    <?php endif ?>
     </td>
 </tr>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index a0a88fa72..7d0874366 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -36,40 +36,40 @@ if (empty($object->comments) && ! $addLink) {
     <th><?php
     echo $this->translate('Comments');
     if (! empty($object->comments) && $addLink) {
-        echo '<br />' . $addLink;
+        echo '<br>' . $addLink;
     }
     ?></th>
     <td data-base-target="_self">
     <?php if (empty($object->comments)):
         echo $addLink;
     else: ?>
-        <dl class="feed-list">
-        <?php foreach ($object->comments as $comment):
-            // Form is unset if the current user lacks the respective permission
-            if (isset($delCommentForm)) {
-                $deleteButton = clone($delCommentForm);
-                /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */
-                $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' pull-right');
-                $deleteButton->populate(
-                    array(
-                        'comment_id'            => $comment->id,
-                        'comment_is_service'    => isset($comment->service_description)
-                    )
-                );
-            } else {
-                $deleteButton = '';
-            }
-            ?>
-            <dt class="feed-author clearfix">
+        <dl class="comment-list">
+        <?php foreach ($object->comments as $comment): ?>
+            <dt class="comment-header">
                 <?= $this->escape($comment->author) ?>
-                <span class="text-small"><?= $this->translate('commented') ?></span>
-                <?= $this->timeAgo($comment->timestamp) ?>
-            <?php if ($deleteButton): ?>
-                    <?= $deleteButton ?>
-            <?php endif ?>
+                <span class="comment-meta">
+                    <?= $this->translate('commented') ?>
+                    <?= $this->timeAgo($comment->timestamp) ?>
+                <?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?>
+                    <span class="meta-icons">
+                    <?php
+                        $deleteButton = clone($delCommentForm);
+                        /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */
+                        $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
+                        $deleteButton->populate(
+                            array(
+                                'comment_id'            => $comment->id,
+                                'comment_is_service'    => isset($comment->service_description)
+                            )
+                        );
+                        echo $deleteButton;
+                    ?>
+                    </span>
+                <?php endif ?>
+                </span>
             </dt>
             <dd class="comment-text">
-                <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?>
+                <p><?= nl2br($this->createTicketLinks($this->escape($comment->comment)), false) ?></p>
             </dd>
         <?php endforeach ?>
         </dl>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 489547c6e..184fcc44e 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -40,14 +40,14 @@ if (empty($object->comments) && ! $addLink) {
     <th><?php
     echo $this->translate('Downtimes');
     if (! empty($object->downtimes) && $addLink) {
-        echo '<br />' . $addLink;
+        echo '<br>' . $addLink;
     }
     ?></th>
     <td data-base-target="_self">
     <?php if (empty($object->downtimes)):
         echo $addLink;
     else: ?>
-        <dl class="feed-list">
+        <dl class="comment-list">
         <?php foreach ($object->downtimes as $downtime):
             if ((bool) $downtime->is_in_effect) {
                 $state = sprintf(
@@ -72,30 +72,34 @@ if (empty($object->comments) && ! $addLink) {
                     );
                 }
             }
-            // Form is unset if the current user lacks the respective permission
-            if (isset($delDowntimeForm)) {
-                $deleteButton = clone($delDowntimeForm);
-                $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' pull-right');
-                $deleteButton->populate(
-                    array(
-                        'downtime_id'           => $downtime->id,
-                        'downtime_is_service'   => $object->getType() === $object::TYPE_SERVICE
-                    )
-                );
-            } else {
-                $deleteButton = '';
-            }
-            ?>
-            <dt class="clearfix feed-author">
-                <span class="author"><?= $this->escape($downtime->author_name) ?></span>
-                <?= $this->timeAgo($downtime->entry_time) ?>
-                <?= $deleteButton ?>
-             </dt>
-             <dd class="comment-text">
-                    <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($downtime->comment)) ?>
-            </dd>
-            <dd class="text-small">
-                <?= $state ?>
+        ?>
+            <dt class="comment-header">
+                <?= $this->escape($downtime->author_name) ?>
+                <span class="comment-meta">
+                    <?= $this->translate('created') ?>
+                    <?= $this->timeAgo($downtime->entry_time) ?>
+                    <span aria-hidden="true">&#448;</span>
+                    <?= $state ?>
+                <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
+                    <span class="meta-icons">
+                    <?php
+                        $deleteButton = clone($delDowntimeForm);
+                        /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm $deleteButton */
+                        $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
+                        $deleteButton->populate(
+                            array(
+                                'downtime_id'           => $downtime->id,
+                                'downtime_is_service'   => $object->getType() === $object::TYPE_SERVICE
+                            )
+                        );
+                        echo $deleteButton;
+                    ?>
+                    </span>
+                <?php endif ?>
+                </span>
+            </dt>
+            <dd class="comment-text">
+                <p><?= nl2br($this->createTicketLinks($this->escape($downtime->comment)), false) ?></p>
             </dd>
         <?php endforeach ?>
         </dl>
diff --git a/modules/monitoring/application/views/scripts/show/components/output.phtml b/modules/monitoring/application/views/scripts/show/components/output.phtml
index 82230beae..e4c0fd0a8 100644
--- a/modules/monitoring/application/views/scripts/show/components/output.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/output.phtml
@@ -1,5 +1,3 @@
-<div class="pluginoutput">
-  <h2><?= $this->translate('Plugin Output') ?></h2>
-  <?= $this->pluginOutput($object->output) ?>
-  <?= $this->pluginOutput($object->long_output) ?>
-</div>
+<h2><?= $this->translate('Plugin Output') ?></h2>
+<?= $this->pluginOutput($object->output) ?>
+<?= $this->pluginOutput($object->long_output) ?>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
index ab6961ebb..05ffd290d 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
@@ -49,7 +49,6 @@ $service_problems = (
     </div>
 <?php if ($service_problems || $this->statusSummary->hosts_down || $this->statusSummary->hosts_unreachable): ?>
     <div class="box contents">
-        <strong><?= $this->translate('Services'); ?></strong>
         <?= $this->partial(
             'tactical/components/parts/servicestatesummarybyhoststate.phtml',
             array(
diff --git a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
index f06170c7a..6374ff83d 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
@@ -47,7 +47,6 @@
     <?php endif ?>
     </div>
     <div class="box contents">
-        <strong><?= $this->translate('Services'); ?></strong>
         <?= $this->partial(
             'tactical/components/parts/servicestatesummarybyhoststate.phtml',
             array(
diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml
index b23872960..6639b0c1b 100644
--- a/modules/monitoring/application/views/scripts/tactical/index.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/index.phtml
@@ -11,7 +11,5 @@
 <?php if ($this->statusSummary->hosts_up || $this->statusSummary->hosts_pending): ?>
         <?= $this->render('tactical/components/ok_hosts.phtml'); ?>
 <?php endif ?>
-        <?= $this->render('tactical/components/monitoringfeatures.phtml'); ?>
-        <?= $this->render('tactical/components/hostservicechecks.phtml'); ?>
     </div>
 </div>
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index f8101d996..359af6457 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -353,6 +353,5 @@ $dashboard->add(
 /*
  * CSS
  */
-$this->provideCssFile('plugin-output.less');
 $this->provideCssFile('service-grid.less');
 $this->provideCssFile('tables.less');
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index ee75706ea..e2f017186 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -107,6 +107,7 @@ class Service extends MonitoredObject
     {
         return $this->backend->select()->from('servicestatus', array(
             'instance_name',
+            'host_attempt',
             'host_icon_image',
             'host_icon_image_alt',
             'host_acknowledged',
@@ -122,6 +123,7 @@ class Service extends MonitoredObject
             'host_notifications_enabled',
             'host_passive_checks_enabled',
             'host_state',
+            'host_state_type',
             'service_icon_image',
             'service_icon_image_alt',
             'service_acknowledged',
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index 3bcebdbf6..34a6cb30f 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -400,7 +400,6 @@ class Perfdata
         $data = $this->calculatePieChartData();
         $pieChart = new InlinePie($data, $this);
         $pieChart->setColors(array('#44bb77', '#ffaa44', '#ff5566', '#ddccdd'));
-        $pieChart->setSparklineClass('sparkline-perfdata');
 
         if (Zend_Controller_Front::getInstance()->getRequest()->isXmlHttpRequest()) {
             $pieChart->disableNoScript();
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 9fdaff259..eac9ef293 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -108,6 +108,7 @@ abstract class MonitoredObjectController extends Controller
         $this->setupLimitControl(50);
         $this->setupPaginationControl($this->view->history, 50);
         $this->view->object = $this->object;
+        $this->render('object/detail-history', null, true);
     }
 
     /**
@@ -180,7 +181,6 @@ abstract class MonitoredObjectController extends Controller
                     $isService ? $object->getHost()->getName() : $object->getName()
                 ),
                 'label'     => $this->translate('Host'),
-                'icon'      => 'host',
                 'url'       => 'monitoring/host/show',
                 'urlParams' => $params
             )
@@ -195,7 +195,6 @@ abstract class MonitoredObjectController extends Controller
                         $isService ? $object->getHost()->getName() : $object->getName()
                     ),
                     'label'     => $this->translate('Service'),
-                    'icon'      => 'service',
                     'url'       => 'monitoring/service/show',
                     'urlParams' => $params
                 )
@@ -209,7 +208,6 @@ abstract class MonitoredObjectController extends Controller
                     $isService ? $object->getHost()->getName() : $object->getName()
                 ),
                 'label'     => $this->translate('Services'),
-                'icon'      => 'services',
                 'url'       => 'monitoring/host/services',
                 'urlParams' => $params
             )
@@ -227,7 +225,6 @@ abstract class MonitoredObjectController extends Controller
                         : sprintf($this->translate('Show all event records of host %s'), $object->getName())
                     ,
                     'label'     => $this->translate('History'),
-                    'icon'      => 'rewind',
                     'url'       => $isService ? 'monitoring/service/history' : 'monitoring/host/history',
                     'urlParams' => $params
                 )
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index a0dbb0d8f..154dc1a4e 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,10 +1,17 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+// Show more and load more links in overviews
+.action-links {
+  text-align: right;
+}
+
+// State summary badges
 .state-badges {
   display: inline-block;
+  vertical-align: middle;
 
   > ul > li {
-    padding-right: 5px;
+    padding-right: @vertical-padding;
 
     &:last-child {
       padding-right: 0;
@@ -12,16 +19,47 @@
   }
 }
 
+// Multi-selection info
+.selection-info {
+  float: right;
+  font-size: @font-size-small;
+  padding: @vertical-padding / 2 0;
+
+  &:hover {
+    cursor: help;
+  }
+}
+
+// Performance data pie charts
+.sparkline {
+  height: 1em;
+  margin-right: 0.1em;
+  position: relative;
+  top: 0.1em;
+  width: 1em;
+}
+
+// Host and service summaries in detail and list views
 .hosts-summary,
 .services-summary {
-  .v-center();
-  margin-top: @horizontal-padding;
+  margin-bottom: 0.5em;
+
+  > .hosts-link,
+  > .services-link,
+  > .state-badges {
+    vertical-align: middle;
+  }
+}
+
+// State table in the host and service multi-selection and detail views
+.host-detail-state,
+.service-detail-state {
+  margin-bottom: 0.5em;
 }
 
 .grid {
   .hosts-summary,
   .services-summary {
-    margin: 0;
     .pull-left();
   }
 }
@@ -64,8 +102,6 @@
 }
 
 .boxview  div.box.badge {
-  border-radius: 3px;
-  margin: 5px;
   padding: 5px;
 }
 
@@ -79,26 +115,41 @@
 /* Tactical overview element styles */
 
 .tactical > .boxview > div.box {
-  min-height: 30em;
+  min-height: 45em;
+  padding: 0px;
 }
 
 .tactical div.box.header {
-  min-height: 5em;
-  border-bottom:1px solid @gray-lighter;
+  margin: 10px;
+  min-height: 8em;
+  color: @text-color-inverted;
+  font-size: @font-size-dashboard;
+}
+
+.tactical div.box.badge {
+  border-radius: 0.0em;
 }
 
 div.box.ok_hosts.state_up {
-  border: 1px solid @gray-lighter;
-  border-left: 15px solid @color-ok;
+  background-color: @color-ok;
+  border: 1px solid white;
 }
 
 div.box.problem_hosts.state_down {
-  border: 1px solid @gray-lighter;
-  border-left: 15px solid @color-critical;
+  background-color: @color-critical;
+  border: 1px solid white;
 }
 
 div.box.ok_hosts div.box.entry, div.box.problem_hosts div.box.entry {
-  min-width: 11.1em;
+  min-width: 8em;
+  min-height: 4em;
+}
+
+.tactical div.box.contents {
+  background-color: white;
+  min-height: 13em;
+  font-size: @font-size-dashboard-small;
+  text-align: left;
 }
 
 div.box.monitoringfeatures {
@@ -347,23 +398,36 @@ form.instance-features span.description, form.object-features span.description {
   text-align: left;
 }
 
-form.object-features .control-label-group {
-  text-align: left;
-  width: 150px;
+.object-features {
+  .control-label-group {
+    text-align: left;
+    padding: @table-column-padding;
+    padding-left: 0;
+    width: @name-value-table-name-width;
+
+    label {
+      font-size: inherit;
+    }
+  }
+
+  input[type="checkbox"] {
+    margin: @table-column-padding;
+  }
 }
 
-form.object-features .control-label {
-  margin-left: 7px;
-  line-height: 25px;
+div.pluginoutput {
+  border-left: 5px solid @gray-lighter;
+  padding: 0.66em 0.33em;
 }
 
-.custom-variables ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  padding-left: @vertical-padding;
-}
+.go-ahead > a {
+   border-bottom: 1px @gray-light dotted;
 
+  &:hover {
+    border-bottom: 1px @gray-light solid;
+    text-decoration: none;
+  }
+}
 
 //p.pluginoutput {
 //  width: 100%;
diff --git a/modules/monitoring/public/css/plugin-output.less b/modules/monitoring/public/css/plugin-output.less
deleted file mode 100644
index faa5110bf..000000000
--- a/modules/monitoring/public/css/plugin-output.less
+++ /dev/null
@@ -1,13 +0,0 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-p.plugin-output {
-  .text-small();
-  font-family: @font-family-fixed;
-  line-height: @line-height-small;
-}
-
-pre.plugin-output {
-  .text-small();
-  line-height: @line-height-small;
-  white-space: pre-wrap;
-}
diff --git a/modules/monitoring/public/css/service-grid.less b/modules/monitoring/public/css/service-grid.less
index 54565ab8d..6fee13252 100644
--- a/modules/monitoring/public/css/service-grid.less
+++ b/modules/monitoring/public/css/service-grid.less
@@ -1,6 +1,6 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-table.service-grid-table {
+.service-grid-table {
   width: 0;
   white-space: nowrap;
 
@@ -25,7 +25,7 @@ table.service-grid-table {
     }
   }
 
-  th.rotate-45 {
+  .rotate-45 {
     height: 6em;
 
     div {
@@ -34,10 +34,14 @@ table.service-grid-table {
     }
   }
 
-  td.service-grid-table-more {
+  .service-grid-table-more {
     text-align: center;
     a {
       display: inline;
     }
   }
 }
+
+.joystick-pagination a {
+  color: @text-color;
+}
diff --git a/modules/monitoring/public/css/tables.less b/modules/monitoring/public/css/tables.less
index 07413ae02..5efedf50a 100644
--- a/modules/monitoring/public/css/tables.less
+++ b/modules/monitoring/public/css/tables.less
@@ -2,10 +2,99 @@
 
 @border-left-width: 6px;
 
-.count-col {
-  width: 60px;
+// Check source reachable information in the host and service detail views
+.check-source-meta {
+  font-size: @font-size-small;
 }
 
+// Type information for backends in the monitoring config
+.config-label-meta {
+  font-size: @font-size-small;
+}
+
+// Column for counts, e.g. host group members
+.count-col {
+  width: 4em;
+}
+
+// Custom variables in the host and service detail view
+.custom-variables > ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0 0 0 @vertical-padding;
+
+  &:first-child {
+    padding: 0;
+  }
+}
+
+// Host name and IP addresses in the host and service detail view
+.host-meta {
+  color: @text-color-light;
+  font-size: @font-size-small;
+}
+
+// Link to unhandled services in the hosts overview
+.host-services-incidents {
+  color: @color-critical;
+  font-family: @font-family-wide;
+  font-size: @font-size-small;
+}
+
+// Notification recipient in the notifications overview
+.notification-recipient {
+  color: @text-color-light;
+  float: right;
+  font-size: @font-size-small;
+}
+
+
+// Container for plugin output and performance data in overviews
+.overview-plugin-output-container {
+  .clearfix();
+}
+
+// Performance data pies in overviews
+.overview-performance-data {
+  float: right;
+  font-size: @font-size-small;
+}
+
+// Plugin output in overviews
+.overview-plugin-output {
+  color: @text-color-light;
+  font-family: @font-family-fixed;
+  font-size: @font-size-small;
+  margin: 0;
+}
+
+// Table for performance data in detail views
+.performance-data-table {
+  width: 100%;
+
+  > thead > tr > th {
+    text-align: left;
+  }
+
+  > thead > tr > th:first-child,
+  > tbody > tr > td:first-child {
+    // Reset base padding
+    padding-left: 0;
+  }
+}
+
+// Performance data table column for sparkline pie charts in detail views
+.sparkline-col {
+  width: 2em;
+}
+
+// Service description if in the service detail view
+.service-meta {
+  color: @text-color-light;
+  font-size: @font-size-small;
+}
+
+// State column for label and duration in overviews
 .state-col {
   &.state-ok,
   &.state-up {
@@ -18,71 +107,97 @@
 
   &.state-critical,
   &.state-down {
-    .bg-color-critical();
-    .fg-color-inverted();
+    background-color: @color-critical;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-critical-handled;
     }
   }
 
   &.state-warning {
-    .bg-color-warning();
-    .fg-color-inverted();
+    background-color: @color-warning;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-warning-handled;
     }
   }
 
   &.state-unknown {
-    .bg-color-unknown();
-    .fg-color-inverted();
+    background-color: @color-unknown;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-unknown-handled;
     }
   }
 
   &.state-unreachable {
-    .bg-color-unreachable();
-    .fg-color-inverted();
+    background-color: @color-unreachable;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-unreachable-handled;
     }
   }
 
+  // State class for history events
+  &.state-no-state {
+    border-left: @border-left-width solid @text-color-light;
+  }
+
   * {
     color: inherit;
   }
 
   text-align: center;
-  width: 100px;
+  width: 8em;
 }
 
-.comment-col {
-  padding-top: 0.5em;
-  vertical-align: top;
-  width: 3em;
+// Wraps links, icons and meta in overviews
+.state-header {
+  .clearfix();
 }
 
-.comment-content {
-  line-height: 1.5em;
-  padding-top: 0.4em;
-  padding-bottom: 0.7em;
-  max-width: 15em;
-  color: @text-color-light;
+// State icons, e.g. acknowledged in overviews
+.state-icons {
+  float: right;
 }
 
-.comment-header {
-  line-height: 1.8em;
+// State labels in overviews
+.state-label {
+  font-family: @font-family-wide;
+  font-size: @font-size-small;
+  letter-spacing: 1px;
+}
+
+// State duration and state type information in overviews
+.state-meta {
+  font-size: @font-size-small;
+}
+
+.state-table {
+  border-collapse: separate;
+  border-spacing: 0 1px;
+  width: 100%;
+
+  tr[href] {
+    &.active {
+      background-color: @gray-lighter;
+    }
+
+    &:hover {
+      background-color: @gray-lightest;
+      cursor: pointer;
+    }
+  }
 }
diff --git a/public/css/icinga/about.less b/public/css/icinga/about.less
new file mode 100644
index 000000000..fd9352884
--- /dev/null
+++ b/public/css/icinga/about.less
@@ -0,0 +1,28 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+#about {
+  .about-social i {
+    font-size: 1.7em;
+    color: @text-color;
+  }
+
+  .about-social i:hover { 
+    color: @icinga-blue;
+  }
+
+  .about-links {
+    margin-top: 2.5em;
+    margin-bottom: 2.5em;
+  }
+
+  .about-links i { 
+    margin: 0.5em;
+    padding: 0;
+    font-size: 5em;
+    color: @text-color;
+  }
+
+  .about-links i:hover { 
+    color: @icinga-blue;
+  }
+}
diff --git a/public/css/icinga/badges.less b/public/css/icinga/badges.less
index a2451198a..46a99969b 100644
--- a/public/css/icinga/badges.less
+++ b/public/css/icinga/badges.less
@@ -1,15 +1,21 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+@badge-line-height: 1.2;
+@badge-padding: 0.25em;
+
 .badge {
-  min-width: 25px;
-  font-family: tahoma, verdana, sans-serif;
-  font-weight: @font-weight-bold;
-  font-size: 11px;
-  text-align: center;
-  color: @text-color-inverted;
-  padding-left: 5px;
-  padding-right: 5px;
-  padding-top: 2px;
-  padding-bottom: 2px;
+  .rounded-corners();
   background-color: @gray-light;
+  color: @text-color-inverted;
+  display: inline-block;
+  font-family: @font-family-wide;
+  font-size: @font-size-small;
+  line-height: @badge-line-height;
+  min-width: 2em;
+  padding: @badge-padding;
+  text-align: center;
+  vertical-align: middle;
+  white-space: nowrap;
 
   &.state-ok {
     .bg-color-ok();
diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less
index e00cf3db2..595618022 100644
--- a/public/css/icinga/base.less
+++ b/public/css/icinga/base.less
@@ -1,5 +1,56 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+// Gray colors
+@gray: #7F7F7F;
+@gray-light: #C9C9C9;
+@gray-lighter: #EEEEEE;
+@gray-lightest: #F7F7F7;
+
+// Icinga colors
+@icinga-blue: #0095BF;
+@icinga-blue-dark: #AA95BF;
+@color-ok: #44bb77;
+@color-warning: #ffaa44;
+@color-warning-handled: #ffcc66;
+@color-critical: #ff5566;
+@color-critical-handled: #ff99aa;
+@color-unknown: #aa44ff;
+@color-unknown-handled: #cc77ff;
+@color-unreachable: #aa44ff;
+@color-unreachable-handled: #cc77ff;
+@color-pending: #77aaff;
+
+// Background color for <body>
+@body-bg-color: #fff;
+
+// Text colors
+@text-color: #535353;
+@text-color-inverted: @body-bg-color;
+@text-color-light: @gray;
+
+// Text color on <a>
+@link-color: @text-color;
+
+// Font families
+@font-family: Calibri, Helvetica, sans-serif;
+@font-family-fixed: "Liberation Mono", "Lucida Console", Courier, monospace;
+@font-family-wide: Tahoma, Verdana, sans-serif;
+
+// Font sizes
+@font-size: 0.750em; // 12px
+@font-size-small: 0.917em; // 11px
+@font-size-dashboard: 3.5em; // 56px
+@font-size-dashboard-small: 1.1em; // 17px
+@font-weight-bold: 600;
+
+// Set line-height w/o unit so that the line-height is dynamically calculated as font-size * line-height
+@line-height: 1.5;
+
+@table-column-padding: 0.333em; // 4px
+
+@vertical-padding: 0.5em; // 6px
+@horizontal-padding: 1em; // 12px
+
 // Make padding not affect the final computed width of an element
 html {
   box-sizing: border-box;
@@ -13,71 +64,93 @@ html {
 a {
   // Reset defaults
   color: inherit;
-  font-weight: @font-weight-bold;
   text-decoration: none;
 
+  &:focus {
+    outline-color: @icinga-blue;
+  }
+
   &:hover {
     text-decoration: underline;
   }
 }
 
-blockquote {
-  border-left: 6px solid @gray-light;
-  color: @text-color-light;
-  // Reset default margin
-  margin: 0;
-  font-family: @font-family-fixed;
-  padding: @vertical-padding @horizontal-padding;
+// Default margin for block text
+blockquote, p, pre {
+  margin: 0 0 1em 0;
 }
 
-body {
-  background-color: @body-bg-color;
-  color: @text-color;
-  font-family: @font-family;
-  font-size: @font-size;
+blockquote {
+  border-left: 5px solid @gray-lighter;
+  padding: 0.667em 0.333em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-weight: @font-weight-bold;
+  margin: 0.556em 0 0.333em;
 }
 
 h1 {
-  border-bottom: 1px solid @gray-lightest;
-  font-size: 18px;
-  font-weight: normal;
-  line-height: 22px;
+  border-bottom: 1px solid @gray-lighter;
+  font-size: 1.333em;
 }
 
 h2 {
-  border-bottom: 1px solid @gray-lightest;
-  font-size: 16px;
-  font-weight: normal;
-  line-height: 19px;
+  font-size: 1.333em;
 }
 
-p {
-  color: @text-color;
-  font-size: @font-size;
-  line-height: @line-height;
-  // Remove default margin
-  margin: 0;
+h3 {
+  font-size: 1.167em;
+}
+
+h4 {
+  font-size: 1em;
+}
+
+h5 {
+  font-size: @font-size-small;
+}
+
+h6 {
+  font-size: @font-size-small;
+  font-weight: normal;
 }
 
 pre {
   background-color: @gray-lightest;
-  color: @text-color-light;
   font-family: @font-family-fixed;
+  font-size: @font-size-small;
   padding: @vertical-padding @horizontal-padding;
+  white-space: pre-wrap;
 }
 
-table {
-  border-collapse: separate;
-  border-spacing: 0 1px;
-  width: 100%;
+td, th {
+  padding: @table-column-padding;
 }
 
-td {
-  padding: @vertical-padding / 2 @horizontal-padding / 2;
+[class^="icon-"], [class*=" icon-"] {
+  // Smooth icons; ifont claims to have it, but it does not work in :before
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  &:before {
+    margin-left: 0;
+  }
+}
+
+#layout {
+  background-color: @body-bg-color;
+  color: @text-color;
+  font-family: @font-family;
+}
+
+#main > .container, #menu, #header {
+  font-size: @font-size;
+  line-height: @line-height;
 }
 
 @media print {
   .dont-print {
-    display:none;
+    display: none;
   }
 }
diff --git a/public/css/icinga/colors.less b/public/css/icinga/colors.less
index f8fe951ec..77908d991 100644
--- a/public/css/icinga/colors.less
+++ b/public/css/icinga/colors.less
@@ -1,9 +1,5 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-.bg-color-default() {
-  background-color: inherit;
-}
-
 .bg-color-ok,
 .bg-color-up {
   background-color: @color-ok;
@@ -87,11 +83,3 @@
 .fg-color-pending {
   color: @color-pending;
 }
-
-.fg-color-default {
-  color: inherit;
-}
-
-.fg-color-inverted() {
-  color: @text-color-inverted;
-}
diff --git a/public/css/icinga/compat.less b/public/css/icinga/compat.less
index 82792f12a..6225e482d 100644
--- a/public/css/icinga/compat.less
+++ b/public/css/icinga/compat.less
@@ -24,10 +24,7 @@
 @colorPetrol: @icinga-blue;
 
 table.action {
-  .action-table();
-  a {
-    font-weight: normal;
-  }
+  .common-table();
 }
 
 table.avp {
diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index 5f1c18aec..aea9b11e5 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -1,6 +1,55 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-div.sort-control {
+.limiter-control > .control-group {
+  padding: 0;
+
+  > .control-label-group {
+    text-align: left;
+    padding: 0;
+    width: 1em;
+  }
+
+  > select {
+    width: 4.5em;
+  }
+
+  > i {
+    .sr-only();
+  }
+}
+
+.pagination-control {
+  li {
+    &.active {
+      > a,
+      > a:hover {
+        border-bottom: 2px solid @icinga-blue;
+        color: @icinga-blue
+      }
+      > a:hover {
+        background: none;
+        cursor: default;
+        text-decoration: none;
+      }
+    }
+
+    &.disabled {
+      color: @gray-light;
+      cursor: no-drop;
+    }
+
+    > a,
+    > span {
+      padding: 0 0.5em 0.25em 0.5em;
+    }
+    > a:hover {
+      background-color: @gray-lighter;
+      text-decoration: none;
+    }
+  }
+}
+
+.sort-control {
   label {
     width: auto;
     margin-right: 0.5em;
@@ -17,7 +66,7 @@ div.sort-control {
   }
 }
 
-html.no-js div.sort-control form {
+html.no-js .sort-control form {
   display: table;
   margin-left: auto;
   margin-top: 0.25em;
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 7a3e64651..53b4636af 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -1,6 +1,8 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 input {
+  .transition(border 0.3s ease);
+
   border: none;
   border-bottom: 1px solid @gray-light;
   color: inherit;
@@ -8,18 +10,35 @@ input {
   padding: @vertical-padding / 2 @horizontal-padding / 2;
 
   &:focus {
-    border-bottom: 1px solid @icinga-blue;
+    border-color: @icinga-blue;
+    outline: none;
   }
 }
 
 input.search {
   padding-left: 20px;
-  background: @gray-lightest url('../img/icons/search.png') no-repeat 2px;
+  background: transparent url('../img/icons/search.png') no-repeat 2px;
   background-size: 12px 12px;
 
   &:focus {
     background-color: @body-bg-color;
   }
+
+  &::-webkit-input-placeholder {
+    color: inherit;
+  }
+
+  &:-moz-placeholder {
+    color: inherit;
+  }
+
+  &::-moz-placeholder {
+    color: inherit;
+  }
+
+  &:-ms-input-placeholder {
+    color: inherit;
+  }
 }
 
 input, select, textarea {
@@ -59,6 +78,7 @@ button:hover .icon-cancel {
 
 .control-info {
   color: @text-color-light;
+  margin-left: 0.2em;
 
   &:hover {
     .opacity(0.6);
@@ -70,7 +90,8 @@ button:hover .icon-cancel {
 }
 
 label {
-  .text-small();
+  color: @text-color-light;
+  font-size: @font-size-small;
 }
 
 .control-label-group {
@@ -95,8 +116,6 @@ label {
   border: none;
   padding: 0;
 
-  font-weight: @font-weight-bold;
-
   &:hover {
     text-decoration: underline;
   }
@@ -109,7 +128,7 @@ label {
 .form-errors, .form-errors ul,
 form .errors, form .errors ul {
   // Reset defaults
-  margin: 0;
+  margin: 5 0;
   padding: 0;
   list-style-type: none;
 }
@@ -120,7 +139,8 @@ form .errors, form .errors ul {
 }
 
 .form-info {
-  .text-small();
+  color: @text-color-light;
+  font-size: @font-size-small;
 }
 
 .form-notifications {
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 370b746bc..d9c29e3fa 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -172,7 +172,7 @@ html {
 }
 
 .content {
-  padding: 1em;
+  padding: 0 1em 1em 1em;
 }
 
 .dashboard .content {
@@ -232,11 +232,11 @@ html {
 
 /* 72em */
 #layout.compact-layout {
-  font-size: 0.8em;
+  font-size: 0.875em;
 }
 
 #layout.poor-layout {
-  font-size: 0.8em;
+  font-size: 0.875em;
 
   .dashboard > div.container {
     width: 98%;
diff --git a/public/css/icinga/limiter.less b/public/css/icinga/limiter.less
deleted file mode 100644
index 4637baeff..000000000
--- a/public/css/icinga/limiter.less
+++ /dev/null
@@ -1,17 +0,0 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-.limiter-control {
-  font-size: @font-size-small;
-
-  li {
-    a {
-      padding: 2px 4px;
-    }
-
-    &.active {
-      a {
-        color: @text-color-light;
-      }
-    }
-  }
-}
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 7608884c2..e9d8bd2cf 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -18,7 +18,7 @@
   }
 
   .image {
-    padding-top: 3%;
+    padding-top: 5%;
     margin-left: auto;
     margin-right: auto;
     text-align: center;
@@ -40,7 +40,7 @@
   .form {
     position: absolute;
     font-size: 0.9em;
-    top: 30%;
+    top: 35%;
     left: 0;
     bottom: 0;
     right: 0;
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index 27d1523e6..2bad07bee 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -1,39 +1,32 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+// Width for the name column--th--of name-value-table
+@name-value-table-name-width: 14em;
+
 .action-link {
   color: @icinga-blue;
 }
 
-.big-icon {
-  font-size: 28px;
-}
-
-.clearfix {
-  &:after {
-    content: "";
-    clear: both;
-    display: table;
-  }
-}
-
-.comment-text {
-  .text-small();
-  font-family: @font-family-fixed;
+.large-icon {
+  font-size: 200%;
 }
 
 .content-centered {
-  .text-center();
   margin: 0 auto;
+  text-align: center;
 }
 
 .icon-col {
-  width: 28px;
+  width: 1em;
 }
 
-.primary-nav {
-  a {
-    font-weight: normal;
-  }
+.icon-strikethrough {
+  text-decoration: line-through;
+}
+
+.preformatted {
+  font-family: @font-family-fixed;
+  white-space: pre-wrap;
 }
 
 .pull-left {
@@ -44,23 +37,10 @@
   float: right;
 }
 
-.text-center {
-  text-align: center;
-}
-
-.text-left {
-  text-align: left;
-}
-
 .text-right {
   text-align: right;
 }
 
-.text-small {
-  color: @text-color-light;
-  font-size: @font-size-small;
-}
-
 .user-avatar {
   height: 16px;
   width: 16px;
@@ -72,10 +52,12 @@
   }
 }
 
-a:hover .icon-cancel {
+a:hover > .icon-cancel {
   color: @color-critical;
 }
 
+// Link styles
+
 .button-link {
   .action-link();
   .button();
@@ -97,48 +79,90 @@ a:hover .icon-cancel {
   }
 }
 
-dl.feed-list {
-  dd {
-    // Reset default margin
-    margin: 0;
-  }
+// List styles
 
-  dt {
+.comment-list {
+  margin: 0;
+
+  .comment-header {
     border-bottom: 1px solid @gray-lighter;
-    margin-top: @vertical-padding;
-
-    .icon-cancel {
-      display: none;
-    }
 
     &:hover {
       background-color: @gray-lightest;
-      .icon-cancel {
-        display: block;
+
+      > .comment-meta > .meta-icons > .remove-action {
+        visibility: visible;
       }
     }
 
-    &:first-child {
-      margin-top: 0;
+    > .comment-meta > .meta-icons > .remove-action {
+      visibility: hidden;
     }
   }
 }
 
-dl.name-value-list {
+.comment-header {
+  .clearfix();
+}
+
+.comment-meta {
+  color: @text-color-light;
+  font-size: @font-size-small;
+
+  > .meta-icons {
+    float: right;
+    margin-top: 0.2em;
+  }
+}
+
+.comment-text {
+  // Reset margin
+  margin: 0;
+}
+
+.name-value-list {
   dd {
     // Reset default margin
     margin: 0;
   }
 
   dt {
-    .text-small();
+    color: @text-color-light;
+    font-size: @font-size-small;
   }
 }
 
-table.action-table {
+// Table styles
+
+.common-table {
+  width: 100%;
+
+  td, th {
+    padding-bottom: 1em;
+    padding-top: 1em;
+  }
+
+  th {
+    text-align: left;
+  }
+
+  thead {
+    border-bottom: 1px solid @gray-light;
+  }
+
   tbody tr {
+    border-bottom: 1px solid @gray-lightest;
+    border-left: 5px solid transparent;
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  tr[href] {
     &.active {
       background-color: @gray-lighter;
+      border-left-color: @icinga-blue;
     }
 
     &:hover {
@@ -146,42 +170,23 @@ table.action-table {
       cursor: pointer;
     }
   }
-}
 
-table.listing-table {
-  border-collapse: collapse;
-
-  tbody th {
-    text-align: left;
-  }
-
-  thead {
-    color: @text-color-light;
-    // Reset default font-weight
-    font-weight: normal;
-  }
-
-  tr {
-    border-bottom: 1px solid @gray-lightest;
-
-    &:last-child {
-      border-bottom: none;
-    }
+  caption {
+    border-top: 1px solid @gray-light;
+    caption-side: bottom;
+    text-align: right;
+    font-style: italic;
   }
 }
 
-.name-value-table {
-  border-spacing: @vertical-padding 0;
-  line-height: @line-height;
-
-  th {
-    .text-left();
-    .text-small();
-    // Reset default font-weight
-    font-weight: normal;
-    width: 120px;
-    vertical-align: top;
-  }
+.name-value-table th {
+  color: @text-color-light;
+  // Reset default font-weight
+  font-weight: normal;
+  padding-left: 0;
+  text-align: left;
+  vertical-align: top;
+  width: @name-value-table-name-width;
 }
 
 // TODO(el): Fix
@@ -200,9 +205,4 @@ table.listing-table {
     .pull-right();
     padding: @vertical-padding / 2 0;
   }
-
-  .selection-info {
-    .pull-right();
-    padding: @vertical-padding / 2 0;
-  }
 }
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 1bd2aaf9d..f975a5f2e 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -1,313 +1,168 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+@icon-width: 1.2em; // 1em width + 0.2em right margin
+
 #menu {
-  max-height: 100%;
+  height: 100%;
   overflow: auto;
 }
 
-#menu > nav > ul > li.nav-item.no-icon a {
-  display: inline-block;
-  padding-left: 28px;
-}
-
-#layout.hoveredmenu #menu {
-  overflow: visible;
-}
-
-#menu, #menu ul {
-  margin: 0;
-  padding: 0;
-}
-
 #menu a {
-  color: @text-color-default;
-}
-
-#menu .separator {
-  background-color: #888;
-}
-
-#menu li {
-  margin-left: 0.0em;
-}
-
-#menu > nav > ul > li > ul {
-  display: none;
-  padding-left: 6px;
-}
-
-.no-js #menu > nav > ul > li > ul {
-  display: block;
-}
-
-#menu > nav > ul > li.active > ul {
-  display: block;
-}
-
-#menu > nav > ul > li.active {
-  background-color: white;
-  padding-left: 0.0em;
-  margin-left: 0;
-  margin-right: 0;
-}
-
-#menu > nav > ul > li.active > a {
-  color: @icinga-blue;
-}
-
-#menu > nav > ul > li.active > div.clearfix > a {
-  color: @icinga-blue;
-}
-
-#menu > nav > ul > li.active li.active a {
-  color: @icinga-blue;
-}
-
-#menu > nav > ul > li a:hover {
-  color: @icinga-blue;
-}
-
-#menu > nav > ul > li.nav-item.hover > ul > li > a:hover {
-   color: @gray;
-}
-
-#menu > nav > ul > li.nav-item.hover > ul > li div.clearfix > a:hover {
-   color: @gray;
-}
-
-#menu > nav > ul > li li {
-  font-size: 0.8em;
-  padding-left: 1.6em;
-}
-
-#menu .badge {
-  margin-right: 5px;
-}
-
-#menu nav > ul > li.active > .badge {
-  margin-top: 15px;
-  margin-right: 5px;
-}
-
-#menu nav > ul > li > div > .badge{
-  margin-top: 8px;
-}
-
-#menu nav > ul > li.active > div > .badge{
-  display: none;
-}
-
-
-/* Collapsed menu item color */
-#menu > nav > ul > li > a {
-  color: @text-color-light;
-  font-weight: 500;
-}
-
-/* Sub item color */
-#menu .active ul li a {
-  color: @colorTextDefault;
-}
-
-#menu ul {
-  list-style-type: none;
-  padding: 0;
-}
-
-#menu ul li a {
-  display: block;
-  line-height: 2.8em;
-  padding-left: 0.7em;
-  text-decoration: none;
-  white-space: nowrap;
+  overflow: hidden;
   text-overflow: ellipsis;
+  white-space: nowrap;
+
+  &:focus {
+    color: @icinga-blue;
+    outline-offset: -0.25em;
+  }
+
+  &:hover {
+    color: @icinga-blue;
+    text-decoration: none;
+  }
+}
+
+#menu .active > a {
+  color: @icinga-blue;
+}
+
+#menu .nav-level-1 > .nav-item {
+  border-left: 5px solid transparent;
+  line-height: 2.167em; // 26 px
+
+  &.active {
+    > a > .badge {
+      display: none;
+    }
+
+    .nav-level-2 > li {
+      // Expand menu if active
+      display: block;
+    }
+
+    background-color: @body-bg-color;
+    border-color: @icinga-blue;
+  }
+
+  &.no-icon > a {
+    margin-left: @icon-width;
+  }
+
+  > a {
+    padding: 0.5em 0.5em; // 6px 6px
+  }
+
+  > a:active ~ .nav-level-2 > li {
+    display: block;
+  }
+}
+
+#menu .nav-level-2 > .nav-item {
+  // Collapse menu by default
+  display: none;
+  line-height: 1.833em; // 22px
+  margin-left: @icon-width;
+
+  > a {
+    font-size: @font-size-small;
+    padding: 0.364em 0.545em; // 4px 6px
+  }
+}
+
+.no-js #menu .nav-level-2 > .nav-item {
+  // Expand menu if JavaScript is disabled
+  display: block;
 }
 
 #menu img.icon {
-  margin-right: 0.5em;
+  line-height: 1;
+  margin: 0 0.2em;
   width: 1em;
-  height: 1em;
 }
 
-#menu ul ul li a {
-  line-height: 1.5em;
-  padding-top: 0.4em;
-  padding-bottom: 0.7em;
+#menu .user-nav-item {
+  background-color: @gray-light;
 }
 
-#menu ul ul li a {
+#menu input.search {
+  background: transparent url('../img/icons/search.png') no-repeat @horizontal-padding center;
+  background-size: 1em auto;
+  border: none;
+  border-left: 5px solid transparent;
+  line-height: 2.167em;
+  padding-left: @icon-width + @horizontal-padding;
+  width: 100%;
+
+  &.active {
+    background-color: @body-bg-color;
+    border-color: @icinga-blue;
+  }
 }
 
-#menu > nav > ul > li {
-  border-left: solid 5px @gray-lighter;
+// Badge offset correction
+
+#menu > nav > .nav-level-1 > .badge-nav-item > a > .badge {
+  margin-top: 0.2em;
 }
 
-#menu > nav > ul > li > a {
-  color: @text-color;
+#menu .nav-level-2 > .badge-nav-item > a > .badge {
+  margin-top: 0.2em;
 }
 
-#menu > nav > ul > li.active {
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  border-left: solid 5px @icinga-blue;
-  -webkit-transition: border 0.5s;
-  -moz-transition: border 0.5s;
-  -o-transition: border 0.5s;
-  transition: border 0.5s;
-}
+// Hovered menu
 
-
-/* BEGIN OF Hoverable menu */
-
-#menu li.hover {
-  width: 27em;
-  padding-left: 0.0em;
-  margin-left: 0px;
-  margin-right: 5;
+#menu .nav-level-1 > .nav-item.hover {
   position: relative;
-}
 
-#menu li.hover > ul{
-  position: absolute;
-  display: block;
-  left: 10.9em;
-  right: 0;
-  top: -0.5em;
-  padding-top: 0.8em;
-  padding-left: 1em;
-  padding-bottom: 0.5em;
-  height: auto;
-  background-color: @text-color;
-  font-size:15px;
-}
+  &:before {
+    border: 0.5em solid rgba(0, 0, 0, 0);
+    border-right-color: @text-color;
+    content: "";
+    position: absolute;
+    right: 0;
+    top: 30%;
+  }
 
-#menu li.hover > a {
-  overflow: visible;
-}
+  > .nav-level-2 {
+    background-color: @text-color;
+    color: @text-color-inverted;
+    left: 100%;
+    padding: @vertical-padding 0;
+    position: absolute;
+    top: 0;
+    width: 14em;
 
-#menu li.hover > ul a {
-  width: 90%;
-  display: block;
-  color: @text-color-inverted;
-}
+    > .nav-item {
+      display: block;
 
-#menu li.hover > ul a:hover {
-  text-decoration: underline;
-}
+      > a:hover {
+        color: @text-color-inverted;
+        text-decoration: underline;
+      }
+    }
+  }
 
-#menu li.hover > ul a:focus {
-  text-shadow: none;
-}
-
-#menu li.hover > ul > li.active > a {
-  font-weight: bold;
-  color: @text-color-light;
-}
-
-#menu li.hover li {
-  padding: 0;
-}
-
-#menu li.hover > a:after {
-  border: 0.5em solid rgba(0, 0, 0, 0);
-  border-right-color: #333;
-  content: " ";
-  margin-top: 0.8em;
-  pointer-events: none;
-  position: absolute;
-  left: 10.8em;
-  height: 0;
-  width: 0;
+  > a > .badge {
+    display: none;
+  }
 }
 
 #layout.hoveredmenu {
   #main {
-    z-index: 2;
+   z-index: 2;
   }
+
   #sidebar {
-    z-index: 3;
+   z-index: 3;
+  }
+
+  #menu {
+    overflow: visible;
   }
 }
 
-/* END of Hoverable menu */
-
-#menu form {
-  width: 100%;
-}
-
-#menu input.search {
-  font-size: 14px;
-  margin: 0;
-  padding: 0 0.5em 0 2.2em;
-  border: none;
-  width: 100%;
-  border-radius: 0;
-  height: 2.8em;
-  display: block;
-  outline: none;
-  background-color: transparent;
-  background-image: url('../img/icons/search.png');
-  background-repeat: no-repeat;
-  background-position: 1.0em center;
-  color: @colorTextDefault;
-  border-left: solid 5px @gray-lighter;
-}
-
-html.ie8 #menu input.search {
-  line-height: 2.8em;
-}
-
-#menu input.search:-ms-input-placeholder {
-  color: @text-color;
-}
-
-#menu input.search::-webkit-input-placeholder {
-  color: @text-color;
-}
-
-#menu input.search::-moz-placeholder {
-  color: @text-color;
-}
-
-#menu input.search.active {
-  background-color: white;
-  color: #121212;
-  text-shadow: none;
-  border-left: solid 5px @icinga-blue;
-  -webkit-transition: border 0.5s;
-  -moz-transition: border 0.5s;
-  -o-transition: border 0.5s;
-  transition: border 0.5s;
-}
-
-#menu input.search.active::-moz-placeholder {
-  color: #999;
-}
-
-#menu input.search.active::-webkit-input-placeholder {
-  color: #999;
-}
-
-#menu input.search.active:-ms-input-placeholder {
-  color: #999;
-}
-
-input:focus { outline: none; }
-
-/* Make focus outline properly visible */
-a:focus {
-  outline: dotted black 1px;
-}
-
-/* Displaying the outline in the navigation is not possible because of the messed up link borders,
-   color those links instead. */
-#menu a:focus,
-#menu > nav > ul > li > a:focus,
-#menu .active ul li a:focus {
-  color: @icinga-blue;
-  outline: none;
-}
+// Accessibility skip links
 
 .skip-links {
   position: relative;
@@ -318,9 +173,9 @@ a:focus {
     li {
       display: block;
       a, button[type="submit"] {
-        background-color: #fff;
-        left: -999em;
-        padding: 0.8em;
+        background-color: @body-bg-color;
+        left: -999px;
+        padding: @vertical-padding @horizontal-padding;
         position: absolute;
         width: 100%;
         &:focus {
@@ -334,46 +189,3 @@ a:focus {
     }
   }
 }
-
-.user-nav-item {
-  margin-top: 39px;
-}
-.user-nav-item ~ .user-nav-item {
-  margin-top: 0px;
-}
-
-#menu .user-nav-item {
-  background-color: @gray;
-  border-left: solid 5px @gray;
-
-  .user-avatar {
-    border: 1px solid @gray;
-    float: right;
-    margin-top: 5px;
-    margin-right: 5px;
-    border-radius: 150px;
-    height: 30px;
-    width: 30px;
-  }
-
-  a {
-    color: @text-color-inverted;
-  };
-
-  a:hover {
-    background-color: white;
-    color: @gray;
-  };
-}
-
-#menu > nav > ul > li.user-nav-item.active > div.clearfix > a {
-  color: @gray;
-}
-
-#menu > nav > ul > li.user-nav-item.active {
-  border-left: solid 5px @gray;
-  -webkit-transition: border 0.5s;
-  -moz-transition: border 0.5s;
-  -o-transition: border 0.5s;
-  transition: border 0.5s;
-}
diff --git a/public/css/icinga/mixins.less b/public/css/icinga/mixins.less
index 512a1b5a3..fe04d7778 100644
--- a/public/css/icinga/mixins.less
+++ b/public/css/icinga/mixins.less
@@ -26,6 +26,14 @@
   }
 }
 
+.clearfix {
+  &:after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+}
+
 .invisible {
   // Maintain layout but hide visually and from screen readers
   visibility: hidden;
@@ -55,6 +63,13 @@
           background-clip: padding-box;
 }
 
+.transition (@transition) {
+  -webkit-transition: @transition;
+     -moz-transition: @transition;
+       -o-transition: @transition;
+          transition: @transition;
+}
+
 .visible {
   visibility: visible;
 }
diff --git a/public/css/icinga/nav.less b/public/css/icinga/nav.less
index 002bfe6e1..5ca24c121 100644
--- a/public/css/icinga/nav.less
+++ b/public/css/icinga/nav.less
@@ -1,23 +1,38 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-li.nav-item {
-  a, span {
+.badge-nav-item {
+  > a {
+    .clearfix();
+
+    > .badge {
+      float: right;
+    }
+  }
+}
+
+.nav-item {
+  > a,
+  > span {
     // Rollover
     display: block;
   }
 }
 
-ul.nav {
+.nav {
   // Reset defaults
+  list-style-type: none;
   margin: 0;
   padding: 0;
-  list-style-type: none;
 }
 
-ul.tab-nav {
+.tab-nav {
   .clearfix();
 
-  li {
-    .pull-left();
+  > .nav-item {
+    float: left;
   }
 }
+
+.primary-nav a {
+  font-weight: 500;
+}
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
deleted file mode 100644
index a74265b73..000000000
--- a/public/css/icinga/pagination.less
+++ /dev/null
@@ -1,44 +0,0 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-.pagination-control {
-  font-size: @font-size-small;
-
-  li {
-    &.active {
-      > a,
-      > a:hover {
-        background-color: @text-color;
-        border-color: @text-color;
-        color: @text-color-inverted;
-      }
-      > a:hover {
-        cursor: default;
-        text-decoration: none;
-      }
-    }
-
-    &.disabled {
-      color: @gray-light;
-      cursor: no-drop;
-    }
-
-    &:first-child {
-      > a,
-      > a:hover {
-        margin-left: 0;
-      }
-    }
-
-    > a,
-    > span {
-      border: 1px solid @gray-lighter;
-      margin-left: -1px;
-      padding: 4px 8px;
-    }
-    > a:hover {
-      background-color: @gray-lighter;
-      border: 1px solid @gray-lighter;
-      padding: 4px 8px;
-    }
-  }
-}
diff --git a/public/css/icinga/selection-toolbar.less b/public/css/icinga/selection-toolbar.less
deleted file mode 100644
index d9c696f4a..000000000
--- a/public/css/icinga/selection-toolbar.less
+++ /dev/null
@@ -1,10 +0,0 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-div.selection-toolbar {
-  float: right;
-  padding-right: 20px;
-}
-
-div.selection-toolbar a {
-  color: @icinga-blue;
-}
diff --git a/public/css/icinga/themes/icinga.less b/public/css/icinga/themes/icinga.less
deleted file mode 100644
index c663e757b..000000000
--- a/public/css/icinga/themes/icinga.less
+++ /dev/null
@@ -1,43 +0,0 @@
-// Gray colors
-@gray: #7F7F7F;
-@gray-light: #C9C9C9;
-@gray-lighter: #EEEEEE;
-@gray-lightest: #F7F7F7;
-
-// Icinga colors
-@icinga-blue: #0095BF;
-@icinga-blue-dark: #AA95BF;
-@color-ok: #44bb77;
-@color-warning: #ffaa44;
-@color-warning-handled: #ffcc66;
-@color-critical: #ff5566;
-@color-critical-handled: #ff99aa;
-@color-unknown: #aa44ff;
-@color-unknown-handled: #cc77ff;
-@color-unreachable: #aa44ff;
-@color-unreachable-handled: #cc77ff;
-@color-pending: #77aaff;
-
-// Background color for <body>
-@body-bg-color: #fff;
-
-// Text colors
-@text-color: #535353;
-@text-color-inverted: @body-bg-color;
-@text-color-light: @gray;
-
-// Text color on <a>
-@link-color: @text-color;
-
-// Font and line-height for text
-@font-family: Calibri, Helvetica, sans-serif;
-@font-family-fixed: Menlo, monospace;
-@font-size: 14px;
-@font-size-small: 11px;
-@font-weight-bold: 600;
-@line-height: 17px;
-@line-height-small: 14px;
-
-// Default padding
-@vertical-padding: 6px;
-@horizontal-padding: 12px;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 61adf4932..340ddf505 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -9,7 +9,7 @@ table.historycolorgrid th {
   height: 1em;
   margin: 0.5em;
   font-size: 0.55em;
-  font-weight: normal;
+  font-weight: bold;
 }
 
 table.historycolorgrid td {
@@ -24,17 +24,18 @@ table.historycolorgrid td:hover {
 
 table.historycolorgrid td.weekday {
   font-size: 0.55em;
-  font-weight: normal;
+  font-weight: bold;
   width: 2.5em;
   opacity: 1.0;
 }
 
 table.historycolorgrid a, table.historycolorgrid span {
+  .rounded-corners(0.2em);
   margin: 0;
   text-decoration: none;
   display: block;
-  width: 1em;
-  height: 1em;
+  width: 1.1em;
+  height: 1.1em;
 }
 
 table.historycolorgrid a:hover {
@@ -66,21 +67,12 @@ table.multiselect tr[href] td {
   }
 }
 
-ul.datafilter li {
-  list-style-type: none;
-  margin: 0;
-}
-
 ul.tree select { /* ?? */
   margin-bottom: 0.3em;
   margin-left: 1em;
 }
-ul.datafilter li input, ul.datafilter li select:first-child {
-    margin-left: 1em;
-}
 
 ul.tree {
-  font-size: 0.8em;
   padding: 0;
   margin: 0;
 }
@@ -165,7 +157,7 @@ ul.tree > ul > li::before, ul.tree > ul > li::after {
 
 ul.tree li a {
   display: inline-block;
-/* TODO -> find something better  padding-left: 2.4em; */
+  padding-left: 1em;
   line-height: 2em;
   text-decoration: none;
   color: #777;
@@ -192,10 +184,6 @@ ul.tree li a.error:hover {
   opacity: 0.85;
 }
 
-.pie-data:hover {
-  opacity: 0.6;
-}
-
 /* charts should grow as much as possible but never beyond the current viewport's size */
 .svg-container-responsive {
   padding: 1.5em;
@@ -238,42 +226,6 @@ ul.tree li a.error:hover {
 //    color: @colorGray;
 //    text-decoration: none;
 //}
-//
-//#menu nav ul .badge {
-//  margin-right: 0em;
-//  top: 0.5em;
-//}
-
-//#menu nav > ul > li.active > .badge-container {
-//  display: none;
-//}
-//
-//#menu nav > ul > li.hover > .badge-container {
-//  display: none;
-//}
-//
-//#menu nav > ul > li.active > ul > li .badge-container {
-//  position: relative;
-//  top: -0.5em;
-//}
-
-#menu nav > ul > li.hover > ul > li > a {
-  width: 12.5em;
-}
-
-//#menu nav > ul > li.hover > ul > li .badge-container {
-//  position: relative;
-//  top: -0.5em;
-//}
-
-#menu nav > ul > li.hover > ul > li  {
-  // prevent floating badges from resizing list items in webkit
-  //max-height: 2em;
-}
-
-//li li .badge {
-//  font-size: 0.975em;
-//}
 
 //.badge-critical {
 //  background-color: @colorCritical;
@@ -303,46 +255,14 @@ ul.tree li a.error:hover {
 //  background-color: @colorUnknown;
 //}
 
-.sparkline-box {
-  position: relative;
-  top: -3px;
-  float: right;
-}
-
-.dashboard .sparkline-box {
-  top: -3px;
-}
-
-.sparkline {
-  width: 12px;
-  height: 12px;
-  position: relative;
-  top: 4px;
-
-  margin: 0em 0em 0em 0.1em;
-}
-
 .tipsy .tipsy-inner {
   // overwrite tooltip max width, we need them to grow bigger
+  font-family: @font-family;
+  font-size: @font-size-small;
   max-width: 300px;
   text-align: left;
 }
 
-.color-box {
-  position: relative;
-  top: 2px;
-  margin: 0px 3px 0px 3px;
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-}
-
-.oneline {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
 .progress-label span {
   font-size: 1.5em;
   .animate(blink 1.4s infinite both);
diff --git a/public/img/bugreport.png b/public/img/bugreport.png
deleted file mode 100644
index 23d913291..000000000
Binary files a/public/img/bugreport.png and /dev/null differ
diff --git a/public/img/docs.png b/public/img/docs.png
deleted file mode 100644
index 051db6cce..000000000
Binary files a/public/img/docs.png and /dev/null differ
diff --git a/public/img/support.png b/public/img/support.png
deleted file mode 100644
index 17a0c9233..000000000
Binary files a/public/img/support.png and /dev/null differ
diff --git a/public/img/wiki.png b/public/img/wiki.png
deleted file mode 100644
index 02df73af6..000000000
Binary files a/public/img/wiki.png and /dev/null differ
diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index 8ec3c63f6..6e134d3fd 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -330,7 +330,7 @@
         this.loading = false;
 
         this.on('rendered', this.onRendered, this);
-        this.on('click', 'table.action tr[href], table.action-table tr[href]', this.onRowClicked, this);
+        this.on('click', 'table.action tr[href], table.table-row-selectable tr[href]', this.onRowClicked, this);
     };
     ActionTable.prototype = new Icinga.EventListener();
 
@@ -342,9 +342,9 @@
      */
     ActionTable.prototype.tables = function(context) {
         if (context) {
-            return $(context).find('table.action, table.action-table');
+            return $(context).find('table.action, table.table-row-selectable');
         }
-        return $('table.action, table.action-table');
+        return $('table.action, table.table-row-selectable');
     };
 
     /**
@@ -354,7 +354,7 @@
         var self = event.data.self;
         var $target = $(event.target);
         var $tr = $target.closest('tr');
-        var table = new Selection($tr.closest('table.action, table.action-table')[0], self.icinga);
+        var table = new Selection($tr.closest('table.action, table.table-row-selectable')[0], self.icinga);
 
         // some rows may contain form actions that trigger a different action, pass those through
         if (!$target.hasClass('rowaction') && $target.closest('form').length &&
@@ -417,7 +417,7 @@
         var self = evt.data.self;
 
         // initialize all rows with the correct row action
-        $('table.action tr, table.action-table tr', container).each(function(idx, el) {
+        $('table.action tr, table.table-row-selectable tr', container).each(function(idx, el) {
 
             // decide which row action to use: links declared with the class rowaction take
             // the highest precedence before hrefs defined in the tr itself and regular links
@@ -437,7 +437,7 @@
         });
 
         // IE will not ignore user-select unless we cancel selectstart
-        $('table.action.multiselect tr, table.action-table.multiselect tr', container).each(function(idx, el) {
+        $('table.action.multiselect tr, table.table-row-selectable.multiselect tr', container).each(function(idx, el) {
             $(el).on('selectstart', false);
         });
 
diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index e614a95ff..cf91bc392 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -42,30 +42,32 @@
     Navigation.prototype = new Icinga.EventListener();
 
     /**
-     * Apply the menu selection and hovering according to the current state
+     * Activate menu items if their class is set to active or if the current URL matches their link
      *
-     * @param evt   {Object}    The event context
+     * @param {Object} e Event
      */
-    Navigation.prototype.onRendered = function(evt) {
-        var self = evt.data.self;
-        this.element = evt.target;
+    Navigation.prototype.onRendered = function(e) {
+        var _this = e.data.self;
 
-        if (! self.active) {
+        this.element = e.target;
+
+        if (! _this.active) {
             // There is no stored menu item, therefore it is assumed that this is the first rendering
             // of the navigation after the page has been opened.
 
             // initialise the menu selected by the backend as active.
-            var $menus = $('#menu li.active', evt.target);
-            if ($menus.size()) {
-                $menus.each(function () {
-                    self.setActive($(this));
+            var $menus = $('#menu li.active', e.target);
+            if ($menus.length) {
+                $menus.each(function() {
+                    _this.setActive($(this));
                 });
             } else {
                 // if no item is marked as active, try to select the menu from the current URL
-                self.setActiveByUrl($('#col1').data('icingaUrl'));
+                _this.setActiveByUrl($('#col1').data('icingaUrl'));
             }
         }
-        self.refresh();
+
+        _this.refresh();
     };
 
     /**
@@ -205,7 +207,7 @@
 
             // unfold the containing menu
             var $outerMenu = $selectedMenu.parent().closest('li');
-            if ($outerMenu.size()) {
+            if ($outerMenu.length) {
                 $outerMenu.addClass('active');
             }
         } else if ($input.length) {
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index ee352002a..04c55b3e4 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -2,7 +2,7 @@
 
 (function(Icinga, $) {
 
-    "use strict";
+    'use strict';
 
     Icinga.Behaviors = Icinga.Behaviors || {};
 
@@ -10,45 +10,20 @@
         Icinga.EventListener.call(this, icinga);
         this.on('rendered', this.onRendered, this);
     };
+
     Sparkline.prototype = new Icinga.EventListener();
 
-    Sparkline.prototype.onRendered = function(evt) {
-        var el = evt.target;
-
-        $('.sparkline', el).each(function(i, element) {
-            // read custom options
-            var $spark = $(element);
-            var title  = $spark.attr('title');
-
-            if ($spark.attr('labels')) {
-                $spark.removeAttr('original-title');
-            }
-
-            var options;
-            if ($spark.hasClass('sparkline-perfdata')) {
-                options = {
-                    enableTagOptions: true,
-                    width: 16,
-                    height: 16,
-                    title: title,
-                    disableTooltips: true,
-                    borderWidth: 1.4,
-                    borderColor: '#FFF'
-                };
-                $spark.sparkline('html', options);
-            } else if ($spark.hasClass('sparkline-multi')) {
-                options = {
-                    width: 100,
-                    height: 100,
-                    title: title,
-                    enableTagOptions: true
-                };
-                $spark.sparkline('html', options);
-            }
+    Sparkline.prototype.onRendered = function(e) {
+        var el = e.target;
 
+        $(e.target).find('.sparkline').each(function() {
+            $(this).sparkline('html', {
+                enableTagOptions: true,
+                disableTooltips: true
+            });
         });
     };
 
     Icinga.Behaviors.Sparkline = Sparkline;
 
-}) (Icinga, jQuery);
+})(Icinga, jQuery);