diff --git a/modules/doc/application/controllers/IndexController.php b/modules/doc/application/controllers/IndexController.php
index 9e7a63a95..299ae5c65 100644
--- a/modules/doc/application/controllers/IndexController.php
+++ b/modules/doc/application/controllers/IndexController.php
@@ -5,8 +5,27 @@
 
 use Icinga\Module\Doc\Controller as DocController;
 
+use Icinga\Module\Doc\DocParser;
+
 class Doc_IndexController extends DocController
 {
+    protected $parser;
+
+
+    public function init()
+    {
+        $module = null;
+        $this->parser = new DocParser($module);
+    }
+
+
+    public function tocAction()
+    {
+        // Temporary workaround
+        list($html, $toc)   = $this->parser->getDocumentation();
+        $this->view->toc = $toc;
+    }
+
     /**
      * Display the application's documentation
      */
diff --git a/modules/doc/application/views/scripts/index/toc.phtml b/modules/doc/application/views/scripts/index/toc.phtml
new file mode 100644
index 000000000..9188e21ff
--- /dev/null
+++ b/modules/doc/application/views/scripts/index/toc.phtml
@@ -0,0 +1,14 @@
+<div class="controls">
+<h1>Module documentations</h1>
+</div>
+<div class="content" data-base-target="_next">
+<?= $this->partial(
+    'layout/menu.phtml',
+    'default',
+    array(
+        'items' => $toc->getChildren(),
+        'sub'   => false,
+        'url'   => ''
+    )
+) ?>
+</div>
diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml
index 3096e4517..36f11e15e 100644
--- a/modules/doc/application/views/scripts/module/index.phtml
+++ b/modules/doc/application/views/scripts/module/index.phtml
@@ -3,4 +3,4 @@
 <?php foreach ($enabledModules as $module): ?>
     <li><a href="<?= $this->href('doc/module/view', array('name' => $module)); ?>"><?= $module ?></a></li>
 <?php endforeach ?>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/modules/doc/application/views/scripts/module/view.phtml b/modules/doc/application/views/scripts/module/view.phtml
index bcd894e65..291947ad7 100644
--- a/modules/doc/application/views/scripts/module/view.phtml
+++ b/modules/doc/application/views/scripts/module/view.phtml
@@ -1,21 +1,7 @@
 <?php if ($html === null): ?>
     <p>No documentation available.</p>
 <?php else: ?>
-<div class="row">
-    <div class="col-sm-12 col-xs-12 col-md-2 col-lg-2">
-        <?= $this->partial(
-            'layout/menu.phtml',
-            'default',
-            array(
-                'items' => $toc->getChildren(),
-                'sub'   => false,
-                'url'   => ''
-            )
-        );
-        ?>
-    </div>
-    <div class="col-sm-12 col-xs-12 col-md-10 col-lg-10">
-        <?= $html ?>
-    </div>
+<div class="content">
+<?= $html ?>
 </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 46305e732..945a96eea 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -4,15 +4,15 @@
 
 namespace Icinga\Module\Doc;
 
-require_once 'vendor/Parsedown/Parsedown.php';
-
-use \RecursiveIteratorIterator;
-use \RecursiveDirectoryIterator;
-use \Parsedown;
+use RecursiveIteratorIterator;
+use RecursiveDirectoryIterator;
+use Parsedown;
 use Icinga\Application\Icinga;
 use Icinga\Web\Menu;
 use Icinga\Web\Url;
 
+require_once 'vendor/Parsedown/Parsedown.php';
+
 /**
  * Parser for documentation written in Markdown
  */
@@ -119,7 +119,7 @@ class DocParser
                         'level' => $level,
                         'item'  => $item
                     ));
-                    $line = '<span id="' . $id . '"></span>' . PHP_EOL . $line;
+                    $line = '<a name="' . $id . '"></a>' . PHP_EOL . $line;
                 }
                 $cat[] = $line;
             }