diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index cd8310d..61f938b 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -4,13 +4,15 @@
 
   <body>
     {{ block "body" . -}}
-    {{ block "header" . }}{{ end }}
+    {{ block "header" . }}{{ partial "header.html" .}}{{ end }}
     <main class="{{ .Type }} {{ .Kind }}{{ if gt (len .Pages) 0 }} list{{ end }}">
       {{ block "main" . }}{{ end }}
     </main>
-    {{- partial "development/page_info.html" . -}}
-    {{- block "footer" . -}}{{- end -}}
+    {{- block "footer" . -}}
+      {{ partial "footer.html" . }}
     {{- end -}}
+    {{- end -}}
+    {{- partial "development/page_info.html" . -}}
   </body>
 
   {{ with partial "resources/root_css.html" . -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3a8bfe9..3cf9292 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,7 +1,3 @@
-{{ define "header" }}
-  {{ partial "header.html" . }}
-{{ end }}
-
 {{ define "main" }}
   {{ partial "single_main.html" . }}
 {{ end }}
@@ -27,7 +23,3 @@
   <script defer {{ if $isModule }}type="module"{{ end }} src="{{ $script.Permalink | relURL }}"></script>
   {{- end -}}
 {{ end }}
-
-{{ define "footer" }}
-  {{ partial "footer.html" . }}
-{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index d0dde7a..b081a68 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,16 +1,18 @@
-{{ define "main" }}
-<div class="platter grid">
-  <h1 class="site">{{ .Title }}</h1>
-  <div id="content">
-    {{ .Content }}
-  </div>
-  {{- with site.Menus.main -}}
+{{ define "body" }}
+<main>
+  <div class="platter grid">
+    <h1 class="site">{{ .Title }}</h1>
+    <div id="content">
+      {{ .Content }}
+    </div>
+    {{- with site.Menus.main -}}
     {{- $url := $.RelPermalink -}}
     <nav class="site bulleted">
       {{- range . -}}
-        <li><a class="{{ if eq .URL $url }}active{{ end }}" href="{{ .URL }}"><span>{{ i18n .Identifier | default .Name }}</span></a></li>
+      <li><a class="{{ if eq .URL $url }}active{{ end }}" href="{{ .URL }}"><span>{{ i18n .Identifier | default .Name }}</span></a></li>
       {{- end -}}
     </nav>
-  {{ end }}
-</div>
+    {{ end }}
+  </div>
+</main>
 {{ end }}
