diff --git a/src/main/resources/templates/base.html b/src/main/resources/templates/base.html
index 6b1ad42..8619f3e 100644
--- a/src/main/resources/templates/base.html
+++ b/src/main/resources/templates/base.html
@@ -13,6 +13,24 @@
 </head>
 
 <body>
-{#insert body}{/}
+  <header>
+    <h1><a href="/">Benki</a> → {#insert siteSection}{/}</h1>
+  </header>
+
+  <nav>
+    <ol>
+      <li><a href="/bookmarx">Bookmarks</a></li>
+      <li><a href="/lafargue">Remarks</a></li>
+      <li class="this-page"><a href="/wiki">Wiki</a></li>
+    </ol>
+  </nav>
+
+  <main>
+    {#insert body}{/}
+  </main>
+
+  <footer>
+    <a href="/imprint">Imprint</a>
+  </footer>
 </body>
 </html>
diff --git a/src/main/resources/templates/benki/wiki/wikiPage.html b/src/main/resources/templates/benki/wiki/wikiPage.html
index e4a7d58..6ebf7c2 100644
--- a/src/main/resources/templates/benki/wiki/wikiPage.html
+++ b/src/main/resources/templates/benki/wiki/wikiPage.html
@@ -4,6 +4,8 @@
 
 {#title}{page.title} &#8212; Benki Wiki{/title}
 
+{#siteSection}Wiki{/siteSection}
+
 {#head}
 <link rel="stylesheet" type="text/css" href="/web_modules/ContentTools/build/content-tools.min.css" />
 <script type="module" src="/web_modules/elix/define/ExpandablePanel.js" defer></script>
@@ -75,14 +77,14 @@
       <h1>{page.title}</h1>
     </div>
 
-    <elix-expandable-panel id="warning-panel"><div id="warning-text"></div></elix-expandable-panel>
+    <elix-expandable-panel id="warning-panel" role="alert"><div id="warning-text"></div></elix-expandable-panel>
   </header>
 
-  <main>
+  <section id="wiki-page-content">
     <div data-editable data-name="wiki-content" id="wiki-content">
       {#with page}{enrichedContent.raw}{/}
     </div>
-  </main>
+  </section>
 
   <hr>
 
diff --git a/src/main/resources/templates/benki/wiki/wikiPageRevisionList.html b/src/main/resources/templates/benki/wiki/wikiPageRevisionList.html
index f4a3d95..eb64ff9 100644
--- a/src/main/resources/templates/benki/wiki/wikiPageRevisionList.html
+++ b/src/main/resources/templates/benki/wiki/wikiPageRevisionList.html
@@ -5,6 +5,8 @@
 
 {#title}Revisions &#8212; {title} &#8212; Benki Wiki{/title}
 
+{#siteSection}Wiki{/siteSection}
+
 {#body}
 <header>
   <h1>Revisions &#8212; <a href="/wiki/{title}">{title}</a></h1>