diff --git a/themes/hugo-xmin/layouts/_default/single.html b/themes/hugo-xmin/layouts/_default/single.html
index 046b68d..f922f20 100644
--- a/themes/hugo-xmin/layouts/_default/single.html
+++ b/themes/hugo-xmin/layouts/_default/single.html
@@ -27,13 +27,13 @@
 
 {{ if $.Scratch.Get "has_related" }}
   <h2>See Also</h2>
-  <a href="#top">Back to top</a>
   <ul>
   {{ $num_to_show := .Site.Params.related_content_limit | default 15 }}
   {{ range first $num_to_show (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
     <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
   {{ end }}
   </ul>
+  <a class="back_to_top" href="#top">Back to top</a>
 {{ end }}
 
 {{ partial "footer.html" . }}
diff --git a/themes/hugo-xmin/layouts/partials/footer.html b/themes/hugo-xmin/layouts/partials/footer.html
index 2bf71be..335c9c6 100644
--- a/themes/hugo-xmin/layouts/partials/footer.html
+++ b/themes/hugo-xmin/layouts/partials/footer.html
@@ -2,7 +2,7 @@
   {{ partial "foot_custom.html" . }}
   {{ with .Site.Params.footer }}
   <hr/>
-  <a href="#top">Back to top</a>
+  <a class="back_to_top" href="#top">Back to top</a>
   <br />{{ replace . "{Year}" now.Year | markdownify}}
   {{ end }}
   {{ if .GitInfo}}
diff --git a/themes/hugo-xmin/layouts/shortcodes/end_section.html b/themes/hugo-xmin/layouts/shortcodes/end_section.html
new file mode 100644
index 0000000..ae0be74
--- /dev/null
+++ b/themes/hugo-xmin/layouts/shortcodes/end_section.html
@@ -0,0 +1,2 @@
+<a class="back_to_top" href="#top">Back to top</a>
+<hr />