diff --git a/pages/draft-05/index.md b/pages/draft-05/index.md
index 91c72c2b0..1d9c03813 100644
--- a/pages/draft-05/index.md
+++ b/pages/draft-05/index.md
@@ -5,6 +5,12 @@ type: docs
 authors: ['Austin Wright']
 Metaschema: 'https://json-schema.org/draft-04/schema'
 Specification: 'https://json-schema.org/draft-05/draft-wright-json-schema-00.pdf'
+prev:
+  label: Draft 06
+  url: /draft-06
+next:
+  label: Specification Links
+  url: /specification-links
 ---
 
 ### Draft-05 Documents
diff --git a/pages/draft-05/index.page.tsx b/pages/draft-05/index.page.tsx
index a792cfc05..e8c83ca8c 100644
--- a/pages/draft-05/index.page.tsx
+++ b/pages/draft-05/index.page.tsx
@@ -7,6 +7,7 @@ import { SectionContext } from '~/context';
 import DocTable from '~/components/DocTable';
 import { Headline1 } from '~/components/Headlines';
 import { DocsHelp } from '~/components/DocsHelp';
+import NextPrevButton from '~/components/NavigationButtons';
 
 export async function getStaticProps() {
   const index = fs.readFileSync('pages/draft-05/index.md', 'utf-8');
@@ -40,6 +41,12 @@ export default function ImplementationsPages({
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
       <StyledMarkdown markdown={blocks.body} />
+      <NextPrevButton
+        prevLabel={frontmatter?.prev?.label}
+        prevURL={frontmatter?.prev?.url}
+        nextLabel={frontmatter?.next?.label}
+        nextURL={frontmatter?.next?.url}
+      />
       <DocsHelp fileRenderType={fileRenderType} />
     </SectionContext.Provider>
   );
diff --git a/pages/draft-06/index.md b/pages/draft-06/index.md
index 1f27c6264..04ee54191 100644
--- a/pages/draft-06/index.md
+++ b/pages/draft-06/index.md
@@ -5,6 +5,12 @@ type: docs
 authors: ['Austin Wright', 'Henry Andrews']
 Metaschema: 'https://json-schema.org/draft-06/schema'
 Specification: 'https://json-schema.org/draft-06/draft-wright-json-schema-01.html'
+prev:
+  label: Draft 07
+  url: /draft-07
+next:
+  label: Draft 05
+  url: /draft-05
 ---
 
 ### Draft-06 Documents
diff --git a/pages/draft-06/index.page.tsx b/pages/draft-06/index.page.tsx
index b328e38ae..12a760519 100644
--- a/pages/draft-06/index.page.tsx
+++ b/pages/draft-06/index.page.tsx
@@ -7,6 +7,7 @@ import { SectionContext } from '~/context';
 import DocTable from '~/components/DocTable';
 import { Headline1 } from '~/components/Headlines';
 import { DocsHelp } from '~/components/DocsHelp';
+import NextPrevButton from '~/components/NavigationButtons';
 
 export async function getStaticProps() {
   const index = fs.readFileSync('pages/draft-06/index.md', 'utf-8');
@@ -37,6 +38,12 @@ export default function ImplementationsPages({
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
+      <NextPrevButton
+        prevLabel={frontmatter?.prev?.label}
+        prevURL={frontmatter?.prev?.url}
+        nextLabel={frontmatter?.next?.label}
+        nextURL={frontmatter?.next?.url}
+      />
       <DocsHelp fileRenderType={fileRenderType} />
     </SectionContext.Provider>
   );
diff --git a/pages/draft-07/index.md b/pages/draft-07/index.md
index aafe23e1e..22626c8cd 100644
--- a/pages/draft-07/index.md
+++ b/pages/draft-07/index.md
@@ -5,6 +5,12 @@ type: docs
 authors: ['Austin Wright', 'Henry Andrews']
 Metaschema: 'https://json-schema.org/draft-07/schema'
 Specification: 'https://json-schema.org/draft-07/draft-handrews-json-schema-01.html'
+prev:
+  label: Draft 2019-09
+  url: /draft/2019-09
+next:
+  label: Draft 06
+  url: /draft-06
 ---
 
 ### Introduction
@@ -37,5 +43,4 @@ _These were updated without changing functionality or meta-schemas due to a few
 - [JSON Schema Release Notes](../draft-07/json-schema-release-notes)
 - [JSON Hyper-Schema Release Notes](../draft-07/json-hyper-schema-release-notes)
 
-
-Note that the draft-handrews-\*-00 versions of JSON Hyper-Schema and Relative JSON Pointer had confusing bugs, and have been replaced by draft-handrews-\*-01 versions. The -00 versions may be found in the [obsolete](obsolete) directory.
\ No newline at end of file
+Note that the draft-handrews-\*-00 versions of JSON Hyper-Schema and Relative JSON Pointer had confusing bugs, and have been replaced by draft-handrews-\*-01 versions. The -00 versions may be found in the [obsolete](obsolete) directory.
diff --git a/pages/draft-07/index.page.tsx b/pages/draft-07/index.page.tsx
index c057e259c..a639ca275 100644
--- a/pages/draft-07/index.page.tsx
+++ b/pages/draft-07/index.page.tsx
@@ -7,6 +7,7 @@ import { SectionContext } from '~/context';
 import DocTable from '~/components/DocTable';
 import { Headline1 } from '~/components/Headlines';
 import { DocsHelp } from '~/components/DocsHelp';
+import NextPrevButton from '~/components/NavigationButtons';
 
 export async function getStaticProps() {
   const index = fs.readFileSync('pages/draft-07/index.md', 'utf-8');
@@ -37,6 +38,12 @@ export default function ImplementationsPages({
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
+      <NextPrevButton
+        prevLabel={frontmatter?.prev?.label}
+        prevURL={frontmatter?.prev?.url}
+        nextLabel={frontmatter?.next?.label}
+        nextURL={frontmatter?.next?.url}
+      />
       <DocsHelp fileRenderType={fileRenderType} />
     </SectionContext.Provider>
   );
diff --git a/pages/draft/2019-09/index.md b/pages/draft/2019-09/index.md
index 6782ce169..9af5b390e 100644
--- a/pages/draft/2019-09/index.md
+++ b/pages/draft/2019-09/index.md
@@ -9,6 +9,12 @@ authors:
   - Greg Dennis
 Published: 17 September 2019
 Metaschema: https://json-schema.org/draft/2019-09/schema
+prev:
+  label: Draft 2020-12
+  url: /draft/2020-12
+next:
+  label: Draft 07
+  url: /draft-07
 ---
 
 ### Introduction
@@ -43,6 +49,7 @@ One significant update is the shift to HTTPS for all meta-schema URIs. While the
   - [JSON Schema recommended output schema](https://json-schema.org/draft/2019-09/output/schema)
   - [JSON Hyper-Schema recommended output schema](https://json-schema.org/draft/2019-09/output/hyper-schema)
 - Output examples
+
   - [JSON Schema verbose output example](https://json-schema.org/draft/2019-09/output/verbose-example)
 
   ### Release Notes
diff --git a/pages/draft/2019-09/index.page.tsx b/pages/draft/2019-09/index.page.tsx
index c8e7f3e2d..51898b28e 100644
--- a/pages/draft/2019-09/index.page.tsx
+++ b/pages/draft/2019-09/index.page.tsx
@@ -7,6 +7,7 @@ import { SectionContext } from '~/context';
 import DocTable from '~/components/DocTable';
 import { Headline1 } from '~/components/Headlines';
 import { DocsHelp } from '~/components/DocsHelp';
+import NextPrevButton from '~/components/NavigationButtons';
 
 export async function getStaticProps() {
   const index = fs.readFileSync('pages/draft/2019-09/index.md', 'utf-8');
@@ -36,6 +37,12 @@ export default function ImplementationsPages({
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
+      <NextPrevButton
+        prevLabel={frontmatter?.prev?.label}
+        prevURL={frontmatter?.prev?.url}
+        nextLabel={frontmatter?.next?.label}
+        nextURL={frontmatter?.next?.url}
+      />
       <DocsHelp fileRenderType={fileRenderType} />
     </SectionContext.Provider>
   );
diff --git a/pages/draft/2020-12/index.md b/pages/draft/2020-12/index.md
index a37b3c779..e1a0f30fe 100644
--- a/pages/draft/2020-12/index.md
+++ b/pages/draft/2020-12/index.md
@@ -5,6 +5,12 @@ type: docs
 authors: ['Austin Wright', 'Henry Andrews', 'Ben Hutton', 'Greg Dennis']
 Metaschema: 'https://json-schema.org/draft/2020-12/schema'
 Specification: 'https://json-schema.org/draft/2020-12/json-schema-core.html'
+prev:
+  label: Specification
+  url: /specification
+next:
+  label: Draft 2019-09
+  url: /draft/2019-09
 ---
 
 ### Introduction
@@ -55,4 +61,4 @@ _These were updated without changing functionality or meta-schemas due to a few
 
 ### Release Notes
 
-- [Draft 2020-12 Release Notes](../draft/2020-12/release-notes)
\ No newline at end of file
+- [Draft 2020-12 Release Notes](../draft/2020-12/release-notes)
diff --git a/pages/draft/2020-12/index.page.tsx b/pages/draft/2020-12/index.page.tsx
index 30e21a5bd..b5162ef02 100644
--- a/pages/draft/2020-12/index.page.tsx
+++ b/pages/draft/2020-12/index.page.tsx
@@ -7,6 +7,7 @@ import { SectionContext } from '~/context';
 import DocTable from '~/components/DocTable';
 import { Headline1 } from '~/components/Headlines';
 import { DocsHelp } from '~/components/DocsHelp';
+import NextPrevButton from '~/components/NavigationButtons';
 
 export async function getStaticProps() {
   const index = fs.readFileSync('pages/draft/2020-12/index.md', 'utf-8');
@@ -36,6 +37,12 @@ export default function ImplementationsPages({
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
+      <NextPrevButton
+        prevLabel={frontmatter?.prev?.label}
+        prevURL={frontmatter?.prev?.url}
+        nextLabel={frontmatter?.next?.label}
+        nextURL={frontmatter?.next?.url}
+      />
       <DocsHelp fileRenderType={fileRenderType} />
     </SectionContext.Provider>
   );
diff --git a/pages/specification-links.md b/pages/specification-links.md
index 8fe5d26cb..d6ececa5b 100644
--- a/pages/specification-links.md
+++ b/pages/specification-links.md
@@ -1,9 +1,9 @@
 ---
 title: Specification Links
 section: docs
-prev: 
-  label: Specification
-  url: /specification
+prev:
+  label: Draft 05
+  url: /draft-05
 next: 
   label: Migration
   url: /specification/migration
diff --git a/pages/specification.md b/pages/specification.md
index e5f18061b..130d62efa 100644
--- a/pages/specification.md
+++ b/pages/specification.md
@@ -4,9 +4,9 @@ section: docs
 prev: 
   label: "Media: string-encoding non-JSON data"
   url: /understanding-json-schema/reference/non_json_data
-next: 
-  label: Specification Links
-  url: /specification-links
+next:
+  label: Draft 2020-12
+  url: /draft/2020-12
 ---
 
 The current version is *2020-12*!