diff --git a/modules/doc/application/views/scripts/partials/docandtoc.phtml b/modules/doc/application/views/scripts/partials/docandtoc.phtml
index 704e5ef88..46f7b0bfe 100644
--- a/modules/doc/application/views/scripts/partials/docandtoc.phtml
+++ b/modules/doc/application/views/scripts/partials/docandtoc.phtml
@@ -1,19 +1,20 @@
+<h1><?= $docName ?> documentation</h1>
 <?php if ($docHtml === null): ?>
-  <p>No documentation available.</p>
+<p>Documentation not available.</p>
 <?php else: ?>
-  <div class="toc">
-    <?= $this->partial(
-      'layout/menu.phtml',
-        'default',
-        array(
-          'items'   => $docToc->getChildren(),
-          'sub'     => false,
-          'url'     => ''
-        )
-      );
-    ?>
-    </div>
-    <div class="doc">
-      <?= $docHtml ?>
-    </div>
+<div class="toc">
+<?= $this->partial(
+  'layout/menu.phtml',
+    'default',
+    array(
+      'items'   => $docToc->getChildren(),
+      'sub'     => false,
+      'url'     => ''
+    )
+  );
+?>
+</div>
+<div class="doc">
+<?= $docHtml ?>
+</div>
 <?php endif ?>
diff --git a/modules/doc/library/Doc/Controller.php b/modules/doc/library/Doc/Controller.php
index 840011150..ae5bc177f 100644
--- a/modules/doc/library/Doc/Controller.php
+++ b/modules/doc/library/Doc/Controller.php
@@ -13,11 +13,13 @@ class Controller extends ActionController
      *
      * @param string $module Name of the module for which to populate doc and toc. `null` for Icinga Web 2's doc
      */
-    protected function populateView($module = null)
+    protected function renderDocAndToc($module = null)
     {
         $parser = new DocParser($module);
         list($docHtml, $docToc) = $parser->getDocAndToc();
         $this->view->docHtml = $docHtml;
         $this->view->docToc = $docToc;
+        $this->view->docName = $module === null ? 'Icinga Web 2' : ucfirst($module);
+        $this->_helper->viewRenderer('partials/docandtoc', null, true);
     }
 }