diff --git a/assets/sass/_zen.scss b/assets/sass/_zen.scss
index 3d086a4..182a2c4 100644
--- a/assets/sass/_zen.scss
+++ b/assets/sass/_zen.scss
@@ -31,9 +31,9 @@ figcaption {
 // Apply heading font stack and colour to labels etc.
 
 th,
-nav,
 label,
 legend,
+.main-menu,
 .header,
 .footer {
   color: var(--color-headings);
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index eb6296e..7a5963b 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -14,10 +14,10 @@
 {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 {{ with site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
 {{ range where site.RegularPages "Section" "" -}}
-<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
+<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .LinkTitle }}</a></li>
 {{ end -}}
 {{ range site.Sections -}}
-<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
+<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .LinkTitle }}</a></li>
 {{ end -}}
 
 {{ end -}}
diff --git a/layouts/partials/mobilemenu.html b/layouts/partials/mobilemenu.html
index d531437..b2059ab 100644
--- a/layouts/partials/mobilemenu.html
+++ b/layouts/partials/mobilemenu.html
@@ -26,10 +26,10 @@
     {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
     {{ with site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
     {{ range where site.RegularPages "Section" "" -}}
-    <li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
+    <li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .LinkTitle }}</a></li>
     {{ end -}}
     {{ range site.Sections -}}
-    <li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
+    <li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .LinkTitle }}</a></li>
     {{ end -}}
 
     {{ end -}}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index cf081ca..8bfb53e 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -3,13 +3,13 @@
 {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <aside class="sidebar layout__second-sidebar">
 {{ range site.Sections -}}
-<section class="menu">
-<p class="title"><strong><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .Title }}</a></strong></p>
+<nav class="menu">
+<p class="title"><strong><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} aria-current="page"{{ end }}>{{ .LinkTitle }}</a></strong></p>
 <ul>
 {{ range .Pages -}}
-<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .Title }}</a></li>
+<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} aria-current="page"{{ end }}>{{ .LinkTitle }}</a></li>
 {{ end -}}
 </ul>
-</section>
+</nav>
 {{ end -}}
 </aside>