diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index d0483e2..8df8183 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,5 +1,5 @@
-<a href="#content" class="skip">Skip to content</a>
 <header id="banner" itemscope itemtype="https://schema.org/WPHeader">
+	<a href="#content" class="skip">Skip to content</a>
 	<nav aria-label="Main navigation">
 		<ul class="unstyled-list">
 			{{- $currentPage := . -}}
diff --git a/layouts/partials/processed-content.html b/layouts/partials/processed-content.html
index c471c41..66be99d 100644
--- a/layouts/partials/processed-content.html
+++ b/layouts/partials/processed-content.html
@@ -16,7 +16,7 @@
 {{ $preWithTabIndex := `<pre tabindex="0">` }}
 
 <!--Move the Table of Contents heading *inside* the <nav> element-->
-{{ $tocHeadingOutside := `<h2 id="toc-hd">Table of Contents</h2><nav id="TableOfContents">` }}
+{{ $tocHeadingOutside := `<h2>Table of Contents</h2><nav id="TableOfContents">` }}
 {{ $tocHeadingInside := `<nav id=TableOfContents role="doc-toc"><h2 id="toc-hd">Table of Contents</h2>` }}
 
 {{ .Content | replaceRE $references $referencesWithHeading | replaceRE $endnote $noEndnote | replaceRE $preWithoutTabIndex $preWithTabIndex | replaceRE $tocHeadingOutside $tocHeadingInside | safeHTML -}}
diff --git a/layouts/shortcodes/toc.html b/layouts/shortcodes/toc.html
index 5ce94eb..3dddddc 100644
--- a/layouts/shortcodes/toc.html
+++ b/layouts/shortcodes/toc.html
@@ -1,3 +1 @@
-<aside aria-labelledby="toc-hd">
-<h2 id="toc-hd">Table of Contents</h2>{{.Page.TableOfContents}}
-</aside>
+<h2>Table of Contents</h2>{{.Page.TableOfContents}}