diff --git a/content/tips/_example.md b/content/tips/_example.md
index dfc7fef..346ecdc 100644
--- a/content/tips/_example.md
+++ b/content/tips/_example.md
@@ -17,7 +17,6 @@ tags:
 
 ## Changelog
 {{< changelog >}}
-{{< back_to_top >}}
 {{< change 2023-03-17 "test change 1" >}}
 {{< change 2023-03-18 "test change 2" >}}
 {{< /changelog >}}
diff --git a/content/tips/_template.md b/content/tips/_template.md
index 8618dc9..a0f5537 100644
--- a/content/tips/_template.md
+++ b/content/tips/_template.md
@@ -15,8 +15,6 @@ tags:
 ---
 
 ## Changelog
-{{< back_to_top >}}
-
 {{< changelog >}}
 {{< change 1900-12-30 "Add additional detail, tags" >}}
 {{< change 1900-12-30 "Initial creation" >}}
diff --git a/content/tips/faq-contributing.md b/content/tips/faq-contributing.md
index 9b4b77c..e19035f 100644
--- a/content/tips/faq-contributing.md
+++ b/content/tips/faq-contributing.md
@@ -14,8 +14,6 @@ tags:
 ---
 
 ## Changelog
-{{< back_to_top >}}
-
 {{< changelog >}}
 {{< change 2023-03-20 "Initial creation" >}}
 {{< /changelog >}}
diff --git a/content/tips/organizers-bujo.md b/content/tips/organizers-bujo.md
index f250a91..ffebb0b 100644
--- a/content/tips/organizers-bujo.md
+++ b/content/tips/organizers-bujo.md
@@ -14,8 +14,6 @@ tags:
 ---
 
 ## Changelog
-{{< back_to_top >}}
-
 {{< changelog >}}
 {{< change 2023-03-20 "Initial creation" >}}
 {{< /changelog >}}
diff --git a/content/tips/organizers-gtd.md b/content/tips/organizers-gtd.md
index 2e2b2b3..4bf087e 100644
--- a/content/tips/organizers-gtd.md
+++ b/content/tips/organizers-gtd.md
@@ -14,8 +14,6 @@ tags:
 ---
 
 ## Changelog
-{{< back_to_top >}}
-
 {{< changelog >}}
 {{< change 2023-03-20 "Initial creation" >}}
 {{< /changelog >}}
diff --git a/content/tips/organizers.md b/content/tips/organizers.md
index 8529b3b..5be1b54 100644
--- a/content/tips/organizers.md
+++ b/content/tips/organizers.md
@@ -19,8 +19,6 @@ tags:
 ---
 
 ## Changelog
-{{< back_to_top >}}
-
 {{< changelog >}}
 {{< change 2023-03-20 "Initial creation" >}}
 {{< /changelog >}}
diff --git a/themes/hugo-xmin/layouts/partials/categories_tags.html b/themes/hugo-xmin/layouts/partials/categories_tags.html
index d55e602..aa90d13 100644
--- a/themes/hugo-xmin/layouts/partials/categories_tags.html
+++ b/themes/hugo-xmin/layouts/partials/categories_tags.html
@@ -1,10 +1,19 @@
 <a id="categories_tags" />
 
+<a id="categories" />
 <p class="terms">
-    {{ range $i := (slice "categories" "tags") }}
+    {{ range $i := (slice "categories") }}
     {{ with ($.Param $i) }}
     {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }}
     {{ end }}
-    <br />
     {{ end }}
-  </p>
\ No newline at end of file
+</p>
+
+<a id="tags" />
+<p class="terms">
+  {{ range $i := (slice "tags") }}
+  {{ with ($.Param $i) }}
+  {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }}
+  {{ end }}
+  {{ end }}
+</p>
\ No newline at end of file
diff --git a/themes/hugo-xmin/layouts/partials/footer.html b/themes/hugo-xmin/layouts/partials/footer.html
index 72716e0..ff31be2 100644
--- a/themes/hugo-xmin/layouts/partials/footer.html
+++ b/themes/hugo-xmin/layouts/partials/footer.html
@@ -1,12 +1,35 @@
   <footer>
   {{ partial "foot_custom.html" . }}
-  {{ with .Site.Params.footer }}
+
   <hr/>
+
+  {{ if .Page.Params.toc }}
+  <a class="back_to_top" href="#top">Back to ToC</a>
+  {{ else }}
   <a class="back_to_top" href="#top">Back to top</a>
-  &nbsp;|&nbsp;<a class="back_to_top" href="#categories_tags">Back to categories and tags</a>
-  &nbsp;|&nbsp;<a class="back_to_top" href="#nav_menu">Back to menu</a>
+  {{ end }}
+
+  {{ with .Page.Params.categories }}
+  &nbsp;|&nbsp;<a class="back_to_top" href="#categories">Back to categories</a>
+  {{ end }}
+
+  {{ with .Page.Params.tags }}
+  &nbsp;|&nbsp;<a class="back_to_top" href="#tags">Back to tags</a>
+  {{ end }}
+
+  {{ range first 1 (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
+  {{ $.Scratch.Set "has_related" true }}
+{{ end }}
+{{ if $.Scratch.Get "has_related" }}
+  &nbsp;|&nbsp;<a class="back_to_top" href="#related">Back to related pages</a>
+{{ end }}
+
+  &nbsp;|&nbsp;<a class="back_to_top" href="#nav_menu">Back to site menu</a>
+
+  {{ with .Site.Params.footer }}
   <br />{{ replace . "{Year}" now.Year | markdownify}}
   {{ end }}
+
   {{ if .GitInfo}}
   <br />
   Revision <a href="https://github.com/mcrosson/accessible.tips/commit/{{ .GitInfo.Hash }}" rel="noopener">{{ .GitInfo.Hash }}</a>
diff --git a/themes/hugo-xmin/layouts/partials/page_meta.html b/themes/hugo-xmin/layouts/partials/page_meta.html
index 93746a4..6ec30a3 100644
--- a/themes/hugo-xmin/layouts/partials/page_meta.html
+++ b/themes/hugo-xmin/layouts/partials/page_meta.html
@@ -1,4 +1,9 @@
 <div class="article-meta">
+    {{ if .Params.toc }}
+    <a class="back_to_top" href="#top">Jump to ToC</a>
+    {{ else }}
+    <a class="back_to_top" href="#top">Jump to content</a>
+    {{ end }}
     <h1><span class="title">{{ .Title | markdownify }}</span></h1>
     {{ with .Params.author }}
         <h3 class="author">By: 
diff --git a/themes/hugo-xmin/layouts/shortcodes/back_to_top.html b/themes/hugo-xmin/layouts/shortcodes/back_to_top.html
index 4eb082a..ce78536 100644
--- a/themes/hugo-xmin/layouts/shortcodes/back_to_top.html
+++ b/themes/hugo-xmin/layouts/shortcodes/back_to_top.html
@@ -1 +1,5 @@
+{{ if .Page.Params.toc }}
+<a class="back_to_top" href="#top">Back to ToC</a>
+{{ else }}
 <a class="back_to_top" href="#top">Back to top</a>
+{{ end }}
diff --git a/themes/hugo-xmin/layouts/shortcodes/end_section.html b/themes/hugo-xmin/layouts/shortcodes/end_section.html
index ae0be74..34a7d4e 100644
--- a/themes/hugo-xmin/layouts/shortcodes/end_section.html
+++ b/themes/hugo-xmin/layouts/shortcodes/end_section.html
@@ -1,2 +1,6 @@
+{{ if .Page.Params.toc }}
+<a class="back_to_top" href="#top">Back to ToC</a>
+{{ else }}
 <a class="back_to_top" href="#top">Back to top</a>
+{{ end }}
 <hr />
diff --git a/themes/hugo-xmin/static/admin/desktop/config.yml b/themes/hugo-xmin/static/admin/desktop/config.yml
index 42bdaf5..d7f1ae5 100644
--- a/themes/hugo-xmin/static/admin/desktop/config.yml
+++ b/themes/hugo-xmin/static/admin/desktop/config.yml
@@ -61,8 +61,6 @@ collections:
         default: >-
           ## Changelog
           
-          {{< back_to_top >}}
-           
           {{< changelog >}}
 
           {{< change 2000-12-30 "change 1" >}}
@@ -123,8 +121,6 @@ collections:
         default: >-
           ## Changelog
           
-          {{< back_to_top >}}
-          
           {{< changelog >}}
            
           {{< change 2000-12-30 "change 1" >}}
diff --git a/themes/hugo-xmin/static/admin/mobile/config.yml b/themes/hugo-xmin/static/admin/mobile/config.yml
index 2e21e4f..f784990 100644
--- a/themes/hugo-xmin/static/admin/mobile/config.yml
+++ b/themes/hugo-xmin/static/admin/mobile/config.yml
@@ -51,8 +51,6 @@ collections:
         default: >-
           ## Changelog
           
-          {{< back_to_top >}}
-           
           {{< changelog >}}
           
           {{< change 2000-12-30 "change 1" >}}
@@ -104,9 +102,7 @@ collections:
         required: true
         default: >-
           ## Changelog
-          
-          {{< back_to_top >}}
-           
+
           {{< changelog >}}
 
           {{< change 2000-12-30 "change 1" >}}