diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index 16818d1d5..94fc83baf 100755
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -1,7 +1,7 @@
 <?php
 
 $jsfiles = array(
-  'js/jquery-1.8.3.js',
+  'js/vendor/jquery-1.8.3.js',
   'js/helpers.js',
   'js/icinga.js',
   'js/icinga/logger.js',
diff --git a/application/layouts/scripts/parts/menu.phtml b/application/layouts/scripts/parts/menu.phtml
new file mode 100644
index 000000000..7955f3251
--- /dev/null
+++ b/application/layouts/scripts/parts/menu.phtml
@@ -0,0 +1,28 @@
+<ul>
+<?php
+
+foreach ($this->items as $item) {
+
+    printf(
+        '  <li%s><a href="%s">%s%s</a>',
+        $this->href($this->url) === $this->href($item->getUrl()) ? ' class="active"' : '',
+        $item->getUrl() ? $this->href($item->getUrl()) : '#',
+        $item->getIcon() ? $this->img(
+            $item->getIcon(),
+            array('height' => '16px', 'width' => '16px')
+        ) . ' ' : '',
+        $item->getTitle()
+    );
+
+    if ($item->hasChildren()) {
+        echo $this->partial(
+            'parts/menu.phtml',
+            array('items' => $item->getChildren(), 'url' => $this->url)
+        );
+    }
+
+    echo "</li>\n";
+}
+
+?>
+</ul>
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 929eaf13f..c39bb23df 100755
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -1,7 +1,9 @@
 <div id="menu-header"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" style="height: 2em; width:6em; float: left; margin-left: 1.5em; margin-right: 9em; margin-top: 0.5em;" alt="" /></div>
 <div id="menu">
 <?php
-
+// determine current key
+$url = Icinga\Web\Url::fromRequest()->getRelativeUrl();
+$menu = Icinga\Web\Menu::fromConfig();
 
 if ($this->auth()->isAuthenticated()) {
     echo $this->partial(