diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 995d3baae..1c26c4117 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -1,9 +1,8 @@
 <?php if (Icinga\Authentication\Manager::getInstance()->isAuthenticated()): ?>
-<div id="layout">
  <div id="header">
    <ul id="notifications"></ul>
-<div id="logo"><a href="<?= $this->href('/dashboard') ?>"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" /></a>
-</div>
+   <div id="logo"><a href="<?= $this->href('/dashboard') ?>"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" /></a>
+ </div>
  </div>
 <!--
   <ul class="tabs" >
@@ -35,8 +34,6 @@
   <div id="col3" class="container">
   </div>
  </div><!-- END of main -->
-</div><!-- END of layout -->
 <?php else: ?>
 <?= $this->render('inline.phtml') ?>
 <?php endif ?>
-
diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index 8c675365f..f8da646e5 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -41,7 +41,10 @@ $jsfiles = array(
 
 </head>
 <body id="body">
+<pre id="responsive-debug"></pre>
+<div id="layout" class="default-layout">
 <?= $this->render('body.phtml') ?>
+</div>
 <?php foreach ($jsfiles as $file): ?>
 <script type="text/javascript" src="<?= $this->href($file) ?>"></script>
 <?php endforeach ?>
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 99c8e07c4..176c71bc3 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -1,20 +1,24 @@
 <?php
 
+use Icinga\Web\Url;
+use Icinga\Web\Menu;
+
 // Don't render a menu for unauthenticated users unless menu is auth aware
 if (! $this->auth()->isAuthenticated()) {
     return;
 }
 
 // Current url
-$url = Icinga\Web\Url::fromRequest()->getRelativeUrl();
-$menu = Icinga\Web\Menu::fromConfig();
-
+$url = Url::fromRequest()->remove('_render')->getRelativeUrl();
+$menu = Menu::fromConfig();
 ?>
-<div id="menu">
-  <form action="<?= $this->href('search') ?>" method="post"><input type="text" name="q" class="search" placeholder="Search..." autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" /></form>
+<div id="menu" data-base-target="col1">
+  <form action="<?= $this->href('search') ?>" method="post">
+    <input type="text" name="q" class="search" placeholder="Search..." autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+  </form>
 <?= $this->partial('parts/menu.phtml', array(
     'items' => $menu->getChildren(),
     'url'   => $url
-))
-?>
+)) ?>
+<br /><a href="<?= Url::fromPath('authentication/logout') ?>" data-base-target="layout" style="display: block; padding-left: 2.5em; color: white; text-decoration: none; font-style: italic;">Temporary Logout</a>
 </div>
diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 4fc9692c6..243f4b6cd 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -1,11 +1,10 @@
-<div class="layout fullscreen login">
- <div class="main">
+ <div id="login">
   <div class="logo">
    <div class="image">
     <img src="<?= $this->baseUrl('img/logo_icinga_big.png') ?>" >
    </div>
   </div>
-  <div class="form">
+  <div class="form" data-base-target="layout">
    <h1>Icinga Users Login</h1>
    <?php
    /* TODO: remove this as soon as notifications and forms are ready */
@@ -18,4 +17,3 @@
    <div class="footer">Icinga Web 2 &copy; 2013-2014 Icinga Team</div>
   </div>
  </div>
-</div>
