diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index ea09b25..92974e5 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,6 +3,7 @@
   <nav class="nav nav-bottom"{{- with .Site.Params.aria.menu_bottom }} aria-label="{{ . }}"{{- end }}>
     <ul>
       {{- range .Site.Menus.footer }}
+      {{ with .Pre }}{{ . }}{{ end }}
       <li>
         {{- if .URL }}
         <a href="{{ .URL }}">{{ .Name }}</a>
@@ -10,6 +11,7 @@
         {{ .Name }}
         {{- end }}
       </li>
+      {{ with .Post }}{{ . }}{{ end }}
       {{- end }}
       {{- with .Site.Home.OutputFormats.Get "RSS" }}
       <li>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 446dab8..7486282 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,13 +8,15 @@
   <ul>
     {{- $curr := . }}
     {{- range .Site.Menus.main }}
-    {{- if .URL }}
+    {{ with .Pre }}{{ . }}{{ end }}
     <li{{ with .Params.class }} class="{{ . }}"{{ end }}>
+      {{- if .URL }}
       <a href="{{ .URL }}"{{ with .Title }} title="{{ . }}"{{ end }}>{{ .Name }}</a>
+      {{- else }}
+      <li>{{ .Name }}</li>
+      {{- end }}
     </li>
-    {{- else }}
-    {{ .Name }}
-    {{- end }}
+    {{ with .Post }}{{ . }}{{ end }}
     {{- end }}
   </ul>
 </nav>