diff --git a/themes/hugo-xmin/layouts/partials/categories_tags.html b/themes/hugo-xmin/layouts/partials/categories_tags.html
new file mode 100644
index 0000000..d55e602
--- /dev/null
+++ b/themes/hugo-xmin/layouts/partials/categories_tags.html
@@ -0,0 +1,10 @@
+<a id="categories_tags" />
+
+<p class="terms">
+    {{ range $i := (slice "categories" "tags") }}
+    {{ 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
diff --git a/themes/hugo-xmin/layouts/partials/footer.html b/themes/hugo-xmin/layouts/partials/footer.html
index 335c9c6..72716e0 100644
--- a/themes/hugo-xmin/layouts/partials/footer.html
+++ b/themes/hugo-xmin/layouts/partials/footer.html
@@ -3,6 +3,8 @@
   {{ with .Site.Params.footer }}
   <hr/>
   <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>
   <br />{{ replace . "{Year}" now.Year | markdownify}}
   {{ end }}
   {{ if .GitInfo}}
diff --git a/themes/hugo-xmin/layouts/partials/header.html b/themes/hugo-xmin/layouts/partials/header.html
index fe324e0..ca7511e 100644
--- a/themes/hugo-xmin/layouts/partials/header.html
+++ b/themes/hugo-xmin/layouts/partials/header.html
@@ -22,7 +22,7 @@
   </head>
 
   <body>
-    <nav>
+    <nav id="nav_menu">
     <ul class="menu">
       {{ range .Site.Menus.main }}
       <li><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
diff --git a/themes/hugo-xmin/layouts/partials/page_meta.html b/themes/hugo-xmin/layouts/partials/page_meta.html
index 5b92303..93746a4 100644
--- a/themes/hugo-xmin/layouts/partials/page_meta.html
+++ b/themes/hugo-xmin/layouts/partials/page_meta.html
@@ -9,26 +9,28 @@
             {{ end }}
         </h3>
     {{ end }}
-    
+
     {{ if (gt .Date 0) }}<h4 class="date">Published: {{ .Date.Format "2006/01/02" }}</h4>{{ end }}
     {{ if (gt .Lastmod 0) }}<h4 class="date">Last Modified: {{ .Lastmod.Format "2006/01/02" }}</h4>{{ end }}
-    <p class="terms">
-      {{ range $i := (slice "categories" "tags") }}
-      {{ with ($.Param $i) }}
-      {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }}
-      {{ end }}
-      {{ end }}
-    </p>
-    <p class="terms">
-      {{ partial "related.html" . }}
-    </p>
+
     <p>
         {{ if (gt .ReadingTime 0) }}<small>Reading Time: {{ .ReadingTime }} minutes</small>{{ end }}
         &nbsp;|&nbsp;
         {{ if (gt .WordCount 0) }}<small>Word Count: {{ .WordCount }} words</small>{{ end }}
     </p>
-    </div>
+
+    <p class="terms">
+        {{ partial "categories_tags.html" . }}
+      </p>
+    <p class="terms">
+      {{ partial "related.html" . }}
+    </p>
+
+</div>
     
+    <a id="top" />
+
     {{ if .Params.toc }}
     {{ .TableOfContents }}
+    {{ else }}
     {{ end }}
\ No newline at end of file
diff --git a/themes/hugo-xmin/layouts/partials/related.html b/themes/hugo-xmin/layouts/partials/related.html
index 2a3a67c..de21cd0 100644
--- a/themes/hugo-xmin/layouts/partials/related.html
+++ b/themes/hugo-xmin/layouts/partials/related.html
@@ -1,3 +1,5 @@
+<a id="related" />
+
 {{ range first 1 (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
   {{ $.Scratch.Set "has_related" true }}
 {{ end }}
