diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html
index 7943483..247f65d 100644
--- a/site/layouts/_default/baseof.html
+++ b/site/layouts/_default/baseof.html
@@ -5,10 +5,9 @@
 </head>
 <body>
   {{ partial "nav.html" . }}
-  {{ block "header" . }}{{ end }}
   {{ block "content" . }}{{ end }}
   <footer>
-    <small><a href="/">{{ .Site.Title }}</a> · {{ now.Format "2006" }}</small>
+    <a href="/">{{ .Site.Title }}</a> · {{ now.Format "2006" }}
   </footer>
 </body>
 </html>
diff --git a/site/layouts/_default/list.html b/site/layouts/_default/list.html
index 16ef30c..337881b 100644
--- a/site/layouts/_default/list.html
+++ b/site/layouts/_default/list.html
@@ -1,24 +1,26 @@
-{{ define "header" }}
-  <header>
-    <h1>{{ .Title }}</h1>
-    {{ with .Description }}<p>{{ . }}</p>{{ end }}
-  </header>
-{{ end }}
-
 {{ define "content" }}
-  <article role="main">
-    <section>
-      {{ range .Pages }}
-      <article>
-        <header>
-          <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
-          <p data-text="dim">
-            <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2006" }}</time>
-          </p>
-        </header>
-        {{ with .Summary }}<p>{{ . }}</p>{{ end }}
-      </article>
-      {{ end }}
-    </section>
+  <article>
+    <header>
+      <h1>{{ .Title }}</h1>
+      {{- with .Description }}
+      <p>{{ . }}</p>
+      {{- end }}
+    </header>
+
+    {{ .Content }}
+
+    {{ range .Pages }}
+    <article>
+      <header>
+        <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+        {{- if not .Date.IsZero }}
+        <p data-text="dim">
+          <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2006" }}</time>
+        </p>
+        {{- end }}
+      </header>
+      {{- with .Description }}<p>{{ . }}</p>{{ end }}
+    </article>
+    {{ end }}
   </article>
 {{ end }}
diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html
index 2f47e13..98355f9 100644
--- a/site/layouts/_default/single.html
+++ b/site/layouts/_default/single.html
@@ -1,23 +1,39 @@
-{{ define "header" }}
-  <header>
-    {{ with .Type }}<p data-text="eyebrow">{{ . }}</p>{{ end }}
-    <p data-text="dim">
-      <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2006" }}</time>
-      {{ with .Params.author }} · {{ . }}{{ end }}
-    </p>
-    {{ with .Params.tags }}
-    <p>{{ range . }}<a href="/tags/{{ . }}" data-text="tag">#{{ . }}</a> {{ end }}</p>
-    {{ end }}
-  </header>
-{{ end }}
-
 {{ define "content" }}
-  <article role="main">
+  <article>
+    <header>
+      <h1>{{ .Title }}</h1>
+      {{- with .Description }}
+      <p>{{ . }}</p>
+      {{- end }}
+      {{- if or (not .Date.IsZero) .Params.author }}
+      <p data-text="dim">
+        {{- if not .Date.IsZero -}}
+        <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2, 2006" }}</time>
+        {{- end -}}
+        {{- if and (not .Date.IsZero) .Params.author }} · {{ end -}}
+        {{- with .Params.author }}{{ . }}{{ end -}}
+      </p>
+      {{- end }}
+      {{- with .GetTerms "tags" }}
+      <nav aria-label="Tags">
+        {{- range . }}
+        <a href="{{ .Permalink }}">#{{ .Name }}</a>
+        {{- end }}
+      </nav>
+      {{- end }}
+    </header>
+
     {{ .Content }}
-    {{ with .Params.footer }}
+
+    {{- if or .PrevInSection .NextInSection }}
     <footer>
-      <small>{{ . }}</small>
+      {{- with .PrevInSection }}
+      <a href="{{ .RelPermalink }}" rel="prev"><span aria-hidden="true">←</span> {{ .LinkTitle }}</a>
+      {{- end }}
+      {{- with .NextInSection }}
+      <a href="{{ .RelPermalink }}" rel="next">{{ .LinkTitle }} <span aria-hidden="true">→</span></a>
+      {{- end }}
     </footer>
-    {{ end }}
+    {{- end }}
   </article>
 {{ end }}
diff --git a/site/layouts/console/single.html b/site/layouts/console/single.html
index d4ed500..8347338 100644
--- a/site/layouts/console/single.html
+++ b/site/layouts/console/single.html
@@ -1,87 +1,37 @@
-{{ define "header" }}
-  <header>
-    {{- if .Description -}}
-    <hgroup>
-      <h1>{{ .Title }}</h1>
-      <p>{{ .Description }}</p>
-    </hgroup>
-    {{- else -}}
-    <h1>{{ .Title }}</h1>
-    {{- end }}
-  </header>
-{{ end }}
-
 {{ define "content" }}
   <section data-layout="console">
 
     <nav aria-label="Documentation" data-nav="sidebar">
-      {{- $menu := index .Site.Menus "docs" -}}
-      {{- if $menu -}}
-        {{- range $menu -}}
-          {{- if .HasChildren -}}
-          <h3>{{ .Name }}</h3>
-          <ul>
-            {{- range .Children -}}
-            <li>
-              <a href="{{ .URL }}"
-                {{- if eq (relURL .URL) $.RelPermalink }} aria-current="page"{{ end -}}>
-                {{- .Name -}}
-              </a>
-            </li>
-            {{- end -}}
-          </ul>
-          {{- else -}}
-          <ul>
-            <li>
-              <a href="{{ .URL }}"
-                {{- if eq (relURL .URL) $.RelPermalink }} aria-current="page"{{ end -}}>
-                {{- .Name -}}
-              </a>
-            </li>
-          </ul>
-          {{- end -}}
-        {{- end -}}
-      {{- else -}}
-        {{- with .CurrentSection -}}
-        <h3>{{ .Title }}</h3>
-        <ul>
-          {{- range .RegularPages -}}
-          <li>
-            <a href="{{ .RelPermalink }}"
-               {{- if eq .RelPermalink $.RelPermalink }} aria-current="page"{{ end -}}>
-              {{- .LinkTitle -}}
-            </a>
-          </li>
-          {{- end -}}
-        </ul>
+      {{- $top := .FirstSection -}}
+      {{- range $top.Sections.ByWeight -}}
+      <h3>{{ .Title }}</h3>
+      <ul>
+        {{- range .RegularPages.ByWeight -}}
+        <li>
+          <a href="{{ .RelPermalink }}"
+            {{- if eq .RelPermalink $.RelPermalink }} aria-current="page"{{ end -}}>
+            {{- .LinkTitle -}}
+          </a>
+        </li>
         {{- end -}}
+      </ul>
       {{- end -}}
     </nav>
 
     <article>
-      {{ .Content }}
+      <header>
+        <h1>{{ .Title }}</h1>
+        {{- with .Description }}
+        <p>{{ . }}</p>
+        {{- end }}
+      </header>
 
-      {{- if or .PrevInSection .NextInSection -}}
-      <footer data-role="prev-next">
-        {{- with .NextInSection -}}
-        <a href="{{ .RelPermalink }}" rel="prev">
-          <span aria-hidden="true">←</span> Previous
-          <span>{{ .LinkTitle }}</span>
-        </a>
-        {{- end -}}
-        {{- with .PrevInSection -}}
-        <a href="{{ .RelPermalink }}" rel="next">
-          Next <span aria-hidden="true">→</span>
-          <span>{{ .LinkTitle }}</span>
-        </a>
-        {{- end -}}
-      </footer>
-      {{- end -}}
+      {{ .Content }}
     </article>
 
     {{- with .TableOfContents -}}
     <aside data-toc>
-      <h3>On this page</h3>
+      <h3>{{ i18n "onThisPage" | default "On this page" }}</h3>
       {{ . }}
     </aside>
     {{- end -}}
diff --git a/site/layouts/docs/single.html b/site/layouts/docs/single.html
index f335f88..0fafb33 100644
--- a/site/layouts/docs/single.html
+++ b/site/layouts/docs/single.html
@@ -1,16 +1,3 @@
-{{ define "header" }}
-  <header>
-    {{- if .Description -}}
-    <hgroup>
-      <h1>{{ .Title }}</h1>
-      <p>{{ .Description }}</p>
-    </hgroup>
-    {{- else -}}
-    <h1>{{ .Title }}</h1>
-    {{- end }}
-  </header>
-{{ end }}
-
 {{ define "content" }}
   <section data-layout="docs">
 
@@ -32,20 +19,25 @@
     </nav>
 
     <article>
+      <header>
+        <h1>{{ .Title }}</h1>
+        {{- with .Description }}
+        <p>{{ . }}</p>
+        {{- end }}
+      </header>
+
       {{ .Content }}
 
       {{- if or .PrevInSection .NextInSection -}}
-      <footer data-role="prev-next">
+      <footer>
         {{- with .NextInSection -}}
         <a href="{{ .RelPermalink }}" rel="prev">
-          <span aria-hidden="true">←</span> Previous
-          <span>{{ .LinkTitle }}</span>
+          <span aria-hidden="true">←</span> {{ .LinkTitle }}
         </a>
         {{- end -}}
         {{- with .PrevInSection -}}
         <a href="{{ .RelPermalink }}" rel="next">
-          Next <span aria-hidden="true">→</span>
-          <span>{{ .LinkTitle }}</span>
+          {{ .LinkTitle }} <span aria-hidden="true">→</span>
         </a>
         {{- end -}}
       </footer>
diff --git a/site/layouts/essay/single.html b/site/layouts/essay/single.html
index f8d5295..f1d18f8 100644
--- a/site/layouts/essay/single.html
+++ b/site/layouts/essay/single.html
@@ -1,38 +1,38 @@
-{{ define "header" }}
-  <header>
-    <h1>{{ .Title }}</h1>
-    {{ with .Description }}<p data-abstract>{{ . }}</p>{{ end }}
-    {{- $hasDate := not .Date.IsZero -}}
-    {{- $hasAuthor := .Params.author -}}
-    {{- if or $hasDate $hasAuthor -}}
-    <p data-byline>
-      {{- if $hasDate -}}
-      <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2, 2006" }}</time>
-      {{- end -}}
-      {{- if and $hasDate $hasAuthor }} · {{ end -}}
-      {{- with .Params.author }}{{ . }}{{ end -}}
-    </p>
-    {{- end }}
-    {{- with .GetTerms "tags" }}
-    <nav data-role="tag-cloud" aria-label="Tags">
-      {{- range . }}
-      <a href="{{ .Permalink }}" data-tag="{{ .Name }}">{{ .Name }}</a>
-      {{- end }}
-    </nav>
-    {{- end }}
-  </header>
-{{ end }}
-
 {{ define "content" }}
-  <article role="main">
+  <article data-paper>
+    <header>
+      {{- with .Params.eyebrow }}<p data-text="eyebrow">{{ . }}</p>{{ end }}
+      <h1>{{ .Title }}</h1>
+      {{- with .Params.abstract }}
+      <p data-abstract>{{ . }}</p>
+      {{- end }}
+      {{- if or (not .Date.IsZero) .Params.author }}
+      <p data-byline>
+        {{- if not .Date.IsZero -}}
+        <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2, 2006" }}</time>
+        {{- end -}}
+        {{- if and (not .Date.IsZero) .Params.author }} · {{ end -}}
+        {{- with .Params.author }}{{ . }}{{ end -}}
+      </p>
+      {{- end }}
+      {{- with .GetTerms "tags" }}
+      <nav data-role="tag-cloud" aria-label="Tags">
+        {{- range . }}
+        <a href="{{ .Permalink }}">{{ .Name }}</a>
+        {{- end }}
+      </nav>
+      {{- end }}
+    </header>
+
     {{ .Content }}
+
     {{- if or .PrevInSection .NextInSection }}
     <footer>
       {{- with .PrevInSection }}
-      <a href="{{ .RelPermalink }}" rel="prev">← {{ .LinkTitle }}</a>
+      <a href="{{ .RelPermalink }}" rel="prev"><span aria-hidden="true">←</span> {{ .LinkTitle }}</a>
       {{- end }}
       {{- with .NextInSection }}
-      <a href="{{ .RelPermalink }}" rel="next">{{ .LinkTitle }} →</a>
+      <a href="{{ .RelPermalink }}" rel="next">{{ .LinkTitle }} <span aria-hidden="true">→</span></a>
       {{- end }}
     </footer>
     {{- end }}
diff --git a/site/layouts/index.html b/site/layouts/index.html
index 662bed5..8fb5cd5 100644
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -1,28 +1,26 @@
-{{ define "title" }}{{ .Site.Title }}{{ end }}
-
-{{ define "header" }}
-  <header>
-    <hgroup>
+{{ define "content" }}
+  <article>
+    <header>
       <h1>{{ .Site.Title }}</h1>
       <p>{{ .Site.Params.description | default "An agent-first approach to web generation." }}</p>
-    </hgroup>
-  </header>
-{{ end }}
+    </header>
+
+    {{ .Content }}
 
-{{ define "content" }}
-  <article role="main">
     <section>
       <h2>Recent</h2>
       {{ range first 10 .Site.RegularPages }}
       <article>
         <header>
           <h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3>
+          {{- if not .Date.IsZero }}
           <p data-text="dim">
             <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2006" }}</time>
-            {{ with .Params.eyebrow }} · {{ . }}{{ end }}
+            {{- with .Params.eyebrow }} · {{ . }}{{ end }}
           </p>
+          {{- end }}
         </header>
-        {{ with .Summary }}<p>{{ . }}</p>{{ end }}
+        {{- with .Description }}<p>{{ . }}</p>{{ end }}
       </article>
       {{ end }}
     </section>
diff --git a/site/layouts/layouts/list.html b/site/layouts/layouts/list.html
index 6287114..71190be 100644
--- a/site/layouts/layouts/list.html
+++ b/site/layouts/layouts/list.html
@@ -1,14 +1,11 @@
-{{ define "header" }}
-  <header>
-    <hgroup>
-      <h1>{{ .Title }}</h1>
-      {{ with .Description }}<p>{{ . }}</p>{{ end }}
-    </hgroup>
-  </header>
-{{ end }}
-
 {{ define "content" }}
-  <main>
+  <article>
+    <header>
+      <h1>{{ .Title }}</h1>
+      {{- with .Description }}
+      <p>{{ . }}</p>
+      {{- end }}
+    </header>
     {{ .Content }}
-  </main>
+  </article>
 {{ end }}
diff --git a/site/layouts/notes/single.html b/site/layouts/notes/single.html
index f8adac8..a0d55be 100644
--- a/site/layouts/notes/single.html
+++ b/site/layouts/notes/single.html
@@ -1,87 +1,31 @@
-{{ define "header" }}
-  <header>
-    {{- if .Description -}}
-    <hgroup>
-      <h1>{{ .Title }}</h1>
-      <p>{{ .Description }}</p>
-    </hgroup>
-    {{- else -}}
-    <h1>{{ .Title }}</h1>
-    {{- end }}
-  </header>
-{{ end }}
-
 {{ define "content" }}
   <section data-layout="docs">
 
     <nav aria-label="Notes" data-nav="sidebar">
-      {{- $menuName := .Site.Params.notes_menu | default "notes" -}}
-      {{- $menu := index .Site.Menus $menuName -}}
-      {{- if $menu -}}
-        {{- range $menu -}}
-          {{- if .HasChildren -}}
-          <h3>{{ .Name }}</h3>
-          <ul>
-            {{- range .Children -}}
-            <li>
-              <a href="{{ .URL }}"
-                {{- if $.IsMenuCurrent $menuName . }} aria-current="page"{{ end -}}>
-                {{- .Name -}}
-              </a>
-            </li>
-            {{- end -}}
-          </ul>
-          {{- else -}}
-          <ul>
-            <li>
-              <a href="{{ .URL }}"
-                {{- if $.IsMenuCurrent $menuName . }} aria-current="page"{{ end -}}>
-                {{- .Name -}}
-              </a>
-            </li>
-          </ul>
-          {{- end -}}
-        {{- end -}}
-      {{- else -}}
-        {{- with .CurrentSection -}}
-        <h3>{{ .Title }}</h3>
-        <ul>
-          {{- range .RegularPages -}}
-          <li>
-            <a href="{{ .RelPermalink }}"
-               {{- if eq .RelPermalink $.RelPermalink }} aria-current="page"{{ end -}}>
-              {{- .LinkTitle -}}
-            </a>
-          </li>
-          {{- end -}}
-        </ul>
+      {{- with .CurrentSection -}}
+      <h3>{{ .Title }}</h3>
+      <ul>
+        {{- range .RegularPages.ByWeight -}}
+        <li>
+          <a href="{{ .RelPermalink }}"
+            {{- if eq .RelPermalink $.RelPermalink }} aria-current="page"{{ end -}}>
+            {{- .LinkTitle -}}
+          </a>
+        </li>
         {{- end -}}
+      </ul>
       {{- end -}}
     </nav>
 
     <article>
-      {{ .Content }}
+      <header>
+        <h1>{{ .Title }}</h1>
+        {{- with .Description }}
+        <p>{{ . }}</p>
+        {{- end }}
+      </header>
 
-      {{- $prevURL := index .Params "prev-url" -}}
-      {{- $prevTitle := index .Params "prev-title" -}}
-      {{- $nextURL := index .Params "next-url" -}}
-      {{- $nextTitle := index .Params "next-title" -}}
-      {{- if or $prevURL $nextURL -}}
-      <footer data-role="prev-next">
-        {{- if $prevURL -}}
-        <a href="{{ $prevURL }}" rel="prev">
-          <span aria-hidden="true">←</span> Previous
-          <span>{{ $prevTitle }}</span>
-        </a>
-        {{- end -}}
-        {{- if and $nextURL $nextTitle -}}
-        <a href="{{ $nextURL }}" rel="next">
-          Next <span aria-hidden="true">→</span>
-          <span>{{ $nextTitle }}</span>
-        </a>
-        {{- end -}}
-      </footer>
-      {{- end -}}
+      {{ .Content }}
     </article>
 
     {{- with .TableOfContents -}}
diff --git a/site/layouts/page/single.html b/site/layouts/page/single.html
index bbd60f4..71190be 100644
--- a/site/layouts/page/single.html
+++ b/site/layouts/page/single.html
@@ -1,11 +1,11 @@
-{{ define "header" }}{{ end }}
-
 {{ define "content" }}
-  <main>
+  <article>
     <header>
       <h1>{{ .Title }}</h1>
-      {{- with .Description }}<p>{{ . }}</p>{{ end }}
+      {{- with .Description }}
+      <p>{{ . }}</p>
+      {{- end }}
     </header>
     {{ .Content }}
-  </main>
+  </article>
 {{ end }}
