diff --git a/VERSION b/VERSION
index a00bf2444..1ee76d11b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.0.0-beta3
+v2.0.0-rc1
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 9d55910e9..0f3d7d1ed 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -86,12 +86,8 @@ class ConfigController extends Controller
         if ($this->firstAllowedAction === null) {
             throw new SecurityException($this->translate('No permission for application configuration'));
         }
-        $action = $this->getTabs()->get($this->firstAllowedAction);
-        if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {
-            $this->forward($this->firstAllowedAction);
-        } else {
-            $this->redirectNow($action->getUrl());
-        }
+
+        $this->redirectNow($this->getTabs()->get($this->firstAllowedAction)->getUrl());
     }
 
     /**
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 7e4ac479b..b00ddf2b8 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Forms\Dashboard\DashletForm;
diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index a4161981a..fc881a3cf 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Application\Logger;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Reducible;
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 54482dd7d..4c6d5dfe9 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotFoundError;
diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index 1a3c2f46e..d1c0efc63 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Application\Config;
 use Icinga\Exception\NotFoundError;
 use Icinga\Forms\ConfirmRemovalForm;
diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 78bb4f91d..5da1e4322 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -5,29 +5,20 @@ use Icinga\Web\Notification;
 use Icinga\Authentication\Manager as Auth;
 
 
-if (Auth::getInstance()->isAuthenticated()): ?>
- <div id="header">
-   <ul id="notifications"><?php
-
-$moduleName = $this->layout()->moduleName;
-if ($moduleName) {
-    $moduleClass = ' icinga-module module-' . $moduleName;
-} else {
-    $moduleClass = '';
-}
-
-$refresh = '';
-if ($this->layout()->autorefreshInterval) {
-    $refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
-}
-
-$notifications = Notification::getInstance();
-if ($notifications->hasMessages()) {
-    foreach ($notifications->getMessages() as $m) {
-        echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
+if (Auth::getInstance()->isAuthenticated()):
+    $moduleName = $this->layout()->moduleName;
+    if ($moduleName) {
+        $moduleClass = ' icinga-module module-' . $moduleName;
+    } else {
+        $moduleClass = '';
     }
-}
-   ?></ul>
+
+    $refresh = '';
+    if ($this->layout()->autorefreshInterval) {
+        $refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
+    }
+?>
+ <div id="header">
    <div id="logo" data-base-target="_main">
        <?= $this->qlink(
            '',
@@ -56,6 +47,16 @@ if ($notifications->hasMessages()) {
   <div id="col3" class="container">
   </div>
  </div><!-- END of main -->
+ <div id="footer">
+   <ul id="notifications"><?php
+$notifications = Notification::getInstance();
+if ($notifications->hasMessages()) {
+    foreach ($notifications->getMessages() as $m) {
+        echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
+    }
+}
+   ?></ul>
+ </div>
 <?php else: ?>
 <?= $this->render('inline.phtml') ?>
 <?php endif ?>
diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index e00b9371d..794dc6e3b 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -14,6 +14,7 @@ if (array_key_exists('_dev', $_GET)) {
 $ie8jsfile  = 'js/icinga.ie8.js';
 $lang = Translator::splitLocaleCode()->language;
 $isIframe = $this->layout()->isIframe;
+$showFullscreen = $this->layout()->showFullscreen;
 $iframeClass = $isIframe ? ' iframe' : '';
 
 ?><!DOCTYPE html>
@@ -49,7 +50,7 @@ $iframeClass = $isIframe ? ' iframe' : '';
 </head>
 <body id="body">
 <pre id="responsive-debug"></pre>
-<div id="layout" class="default-layout">
+<div id="layout" class="default-layout<?php if ($showFullscreen): ?> fullscreen-layout<?php endif ?>">
 <?= $this->render('body.phtml') ?>
 </div>
 <!--[if IE 8]>
diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index 8f18a14a0..13256f810 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -1,8 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_View_Helper_FormElement;
-
 /**
  * Render number input controls
  */
diff --git a/application/views/scripts/dashboard/index.phtml b/application/views/scripts/dashboard/index.phtml
index 7c3724dc6..8550d8a6b 100644
--- a/application/views/scripts/dashboard/index.phtml
+++ b/application/views/scripts/dashboard/index.phtml
@@ -1,5 +1,7 @@
 <div class="controls">
+<?php if (! $this->compact): ?>
 <?= $this->tabs ?>
+<?php endif ?>
 </div>
 <?php if ($this->dashboard): ?>
     <div class="dashboard content">
@@ -15,4 +17,4 @@
             ) ?>
         </p>
     </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 84c3e0b13..0549b7b50 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,6 +1,6 @@
 # Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
-%define revision 3.beta3
+%define revision 4.rc1
 
 Name:           icingaweb2
 Version:        2.0.0
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index b54f8b15e..fe6539515 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -156,7 +156,7 @@ class Query extends SimpleQuery
     {
         $result = $this->fetchAll();
         $sorted = array();
-        $quotedDn = preg_quote($this->connection->getDN(), '/');
+        $quotedDn = preg_quote($this->ds->getDN(), '/');
         foreach ($result as $key => & $item) {
             $new_key = LdapUtils::implodeDN(
                 array_reverse(
@@ -170,7 +170,7 @@ class Query extends SimpleQuery
         unset($groups);
         ksort($sorted);
 
-        $tree = Root::forConnection($this->connection);
+        $tree = Root::forConnection($this->ds);
         $root_dn = $tree->getDN();
         foreach ($sorted as $sort_key => & $key) {
             if ($key === $root_dn) {
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index a60c82c8e..d7156becc 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -86,9 +86,13 @@ class ActionController extends Zend_Controller_Action
         $this->handlerBrowserWindows();
         $this->view->translationDomain = 'icinga';
         $this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
+        $this->_helper->layout()->showFullscreen = $request->getUrl()->shift('showFullscreen');
         $this->_helper->layout()->moduleName = false;
 
         $this->view->compact = $request->getParam('view') === 'compact';
+        if ($request->getUrl()->shift('showCompact')) {
+            $this->view->compact = true;
+        }
         if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
             $this->xhrLayout = 'body';
         }
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index ab36d78c5..cbd2c8aba 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -18,6 +18,7 @@ class StyleSheet
         'css/icinga/layout-structure.less',
         'css/icinga/menu.less',
         'css/icinga/header-elements.less',
+        'css/icinga/footer-elements.less',
         'css/icinga/main-content.less',
         'css/icinga/tabs.less',
         'css/icinga/forms.less',
diff --git a/modules/doc/run.php b/modules/doc/run.php
index 95abbf9df..d0712a858 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Router_Route;
 use Icinga\Application\Icinga;
 
 if (Icinga::app()->isCli()) {
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 092aeff0f..83a05d2e0 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -20,6 +20,12 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
     public function perfdata($perfdataStr, $compact = false, $limit = 0, $color = Perfdata::PERFDATA_OK)
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
+        uasort(
+            $pieChartData,
+            function($a, $b) {
+                return $a->worseThan($b) ? -1 : ($b->worseThan($a) ? 1 : 0);
+            }
+        );
         $results = array();
         $keys = array('', 'label', 'value', 'min', 'max', 'warn', 'crit');
         $columns = array();
diff --git a/modules/monitoring/application/views/scripts/host/services.phtml b/modules/monitoring/application/views/scripts/host/services.phtml
index ca12f3d0e..11166f8fa 100644
--- a/modules/monitoring/application/views/scripts/host/services.phtml
+++ b/modules/monitoring/application/views/scripts/host/services.phtml
@@ -12,6 +12,7 @@
     'compact'       => true,
     'showHost'      => false,
     'services'      => $services,
-    'addColumns'    => array()
+    'addColumns'    => array(),
+    'baseTarget'    => '_self'
   )
 ); ?>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 9f87e7c60..f3b28bb5e 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -25,7 +25,7 @@ if (count($services) === 0) {
     return;
 }
 ?>
-<table data-base-target="_next"
+<table data-base-target="<?= isset($baseTarget) ? $baseTarget : '_next'; ?>"
     class="action multiselect <?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;"
     data-icinga-multiselect-url="<?= $this->href("monitoring/services/show") ?>"
     data-icinga-multiselect-data="service,host">
@@ -60,7 +60,7 @@ if (count($services) === 0) {
       </td>
 
       <td>
-        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
+        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div>
         <?= $this->iconImage()->service($service) ?>
         <?= implode(' ', $this->serviceFlags($service)); ?>
         <?= $this->qlink(
diff --git a/modules/doc/doc/security.md b/modules/monitoring/doc/security.md
similarity index 100%
rename from modules/doc/doc/security.md
rename to modules/monitoring/doc/security.md
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index df1b6016a..3bcebdbf6 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -7,6 +7,7 @@ use Icinga\Util\Format;
 use InvalidArgumentException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Web\Widget\Chart\InlinePie;
+use Icinga\Module\Monitoring\Object\Service;
 use Zend_Controller_Front;
 
 class Perfdata
@@ -453,4 +454,60 @@ class Perfdata
         );
         return $parts;
     }
+
+    /**
+     * Return the state indicated by this perfdata
+     *
+     * @see Service
+     *
+     * @return int
+     */
+    public function getState()
+    {
+        if ($this->value === null) {
+            return Service::STATE_UNKNOWN;
+        }
+
+        if (! ($this->criticalThreshold === null
+            || $this->value < $this->criticalThreshold)) {
+            return Service::STATE_CRITICAL;
+        }
+
+        if (! ($this->warningThreshold === null
+            || $this->value < $this->warningThreshold)) {
+            return Service::STATE_WARNING;
+        }
+
+        return Service::STATE_OK;
+    }
+
+    /**
+     * Return whether the state indicated by this perfdata is worse than
+     * the state indicated by the other perfdata
+     * CRITICAL > UNKNOWN > WARNING > OK
+     *
+     * @param Perfdata $rhs     the other perfdata
+     *
+     * @return bool
+     */
+    public function worseThan(Perfdata $rhs)
+    {
+        if (($state = $this->getState()) === ($rhsState = $rhs->getState())) {
+            return $this->getPercentage() > $rhs->getPercentage();
+        }
+
+        if ($state === Service::STATE_CRITICAL) {
+            return true;
+        }
+
+        if ($state === Service::STATE_UNKNOWN) {
+            return $rhsState !== Service::STATE_CRITICAL;
+        }
+
+        if ($state === Service::STATE_WARNING) {
+            return $rhsState === Service::STATE_OK;
+        }
+
+        return false;
+    }
 }
diff --git a/public/css/icinga/footer-elements.less b/public/css/icinga/footer-elements.less
new file mode 100644
index 000000000..f3b248b69
--- /dev/null
+++ b/public/css/icinga/footer-elements.less
@@ -0,0 +1,50 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+div#footer {
+  position: fixed;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  z-index: 9999;
+}
+
+/** Notifications **/
+
+#notifications {
+  margin: 0;
+  padding: 0;
+}
+
+#notifications > li {
+  list-style-type: none;
+  display: block;
+  border-top: 1px solid #999;
+  color: white;
+  line-height: 2.5em;
+  padding-left: 3em;
+  background-repeat: no-repeat;
+  background-position: 1em center;
+}
+
+#notifications > li:hover {
+  cursor: pointer;
+}
+
+#notifications > li.info {
+  background-color: @colorFormNotificationInfo;
+}
+
+#notifications > li.warning {
+  background-color: @colorWarningHandled;
+}
+#notifications > li.error {
+  background-color: @colorCritical;
+  background-image: url(../img/icons/error_white.png);
+}
+
+#notifications > li.success {
+  background-color: #fe6;
+  background-image: url(../img/icons/success.png);
+  color: #333;
+}
+/** END of Notifications **/
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 5b5eee5ef..587ddac5e 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -81,13 +81,29 @@ html {
 
 /** Fullscreen layout **/
 #layout.fullscreen-layout {
-  #header, #sidebar, .controls > .tabs {
+  #header, #sidebar {
     display: none;
   }
 
+  .container .controls {
+    padding: 0;
+  }
+
+  .controls > ul.tabs {
+    margin-top: 0;
+    height: 1.5em;
+    background-color: @colorPetrol;
+    font-size: 0.75em;
+    padding: 0.2em 0 0;
+  }
+
+  .controls > ul.tabs > li > a {
+    line-height: 1.5em;
+  }
+
   #main {
     left: 0;
-    top: 0;
+    top: 0 !important;
   }
 }
 
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 6f15533cc..635c1628f 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -23,43 +23,6 @@ img.icon {
   border: none;
 }
 
-/** Notifications **/
-
-#notifications {
-  margin: 0;
-  padding: 0;
-}
-
-#notifications > li {
-  list-style-type: none;
-  display: block;
-  border-bottom: 1px solid #999;
-  color: white;
-  line-height: 2.5em;
-  padding-left: 3em;
-  background-repeat: no-repeat;
-  background-position: 1em center;
-}
-
-#notifications > li.info {
-  background-color: @colorFormNotificationInfo;
-}
-
-#notifications > li.warning {
-  background-color: @colorWarningHandled;
-}
-#notifications > li.error {
-  background-color: @colorCritical;
-  background-image: url(../img/icons/error_white.png);
-}
-
-#notifications > li.success {
-  background-color: #fe6;
-  background-image: url(../img/icons/success.png);
-  color: #333;
-}
-/** END of Notifications **/
-
 /* TODO: Remove once there is no more module container */
 .container > div > pre {
   margin: 1em;
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 84354c960..5e49fbda9 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -105,6 +105,9 @@
             // We catch scroll events in our containers
             $('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll);
 
+            // Remove notifications on click
+            $(document).on('click', '#notifications li', function () { $(this).remove(); });
+
             // We want to catch each link click
             $(document).on('click', 'a', { self: this }, this.linkClicked);
             $(document).on('click', 'tr[href]', { self: this }, this.linkClicked);
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index b9e63aa11..cd5290f32 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -706,7 +706,7 @@
         },
 
         initializeControls: function (parent) {
-            if ($(parent).closest('.dashboard').length) {
+            if ($(parent).closest('.dashboard').length || $('#layout').hasClass('fullscreen-layout')) {
                 return;
             }
 
@@ -736,14 +736,19 @@
 
         fixControls: function ($parent) {
             var self = this;
+            if ($('#layout').hasClass('fullscreen-layout')) {
+                return;
+            }
 
             if ('undefined' === typeof $parent) {
 
-                $('#header').css({height: 'auto'});
-                $('#main').css({top: $('#header').css('height')});
-                $('#sidebar').css({top: $('#header').height() + 'px'});
-                $('#header').css({height: $('#header').height() + 'px'});
-                $('#inner-layout').css({top: $('#header').css('height')});
+                if (! $('#layout').hasClass('fullscreen-layout')) {
+                    $('#header').css({height: 'auto'});
+                    $('#main').css({top: $('#header').css('height')});
+                    $('#sidebar').css({top: $('#header').height() + 'px'});
+                    $('#header').css({height: $('#header').height() + 'px'});
+                    $('#inner-layout').css({top: $('#header').css('height')});
+                }
                 $('.container').each(function (idx, container) {
                     self.fixControls($(container));
                 });