diff --git a/templates/index.html b/templates/index.html
index 897457c..4f924be 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -28,7 +28,7 @@
           </a>
         </div>
         <h1>$title</h1>
-          <nav role="top-navigation">
+          <nav arial-label="Main">
             <a href="/index.html">Home</a> |
             <a href="/slides.html">Slides</a> |
             <a href="/about-me.html">About</a>
@@ -125,7 +125,7 @@ $body$
       </main>
       <footer id="postamble" class="status" role="contentinfo">
         <div class="content">
-          <nav role="bottom-navigation">
+          <nav aria-label="Main">
             <a href="/index.html">Home</a> |
             <a href="/slides.html">Slides</a> |
             <a href="/about-me.html">About</a>
diff --git a/templates/post.html b/templates/post.html
index 900f864..efb8ee2 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -42,8 +42,10 @@ $description$
         </div>
       </header>
       <main id="content" role="main">
-$if(toc)$<div id="toc">$table-of-contents$</div>$endif$
+$if(toc)$<nav id="toc" role="doc-toc">$table-of-contents$</nav>$endif$
+<article>
 $body$
+</article>
       </main>
       <footer id="postamble" class="status" role="contentinfo">
         <div class="content">