diff --git a/src/_includes/asummersend/navbar.njk b/src/_includes/asummersend/navbar.njk
index 65e3a467..6e414b19 100644
--- a/src/_includes/asummersend/navbar.njk
+++ b/src/_includes/asummersend/navbar.njk
@@ -12,6 +12,4 @@
             <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
         </li>
     {%- endfor %}
-    <li><a href="/shrines/">Shrine Index</a></li>
-    <li><a href="/">Main Site</a></li>
 {% endblock %}
\ No newline at end of file
diff --git a/src/_includes/cassettebeasts/navbar.njk b/src/_includes/cassettebeasts/navbar.njk
index 0bc2e064..537f52eb 100644
--- a/src/_includes/cassettebeasts/navbar.njk
+++ b/src/_includes/cassettebeasts/navbar.njk
@@ -12,6 +12,4 @@
             <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
         </li>
     {%- endfor %}
-    <li><a href="/shrines/">Shrine Index</a></li>
-    <li><a href="/">Main Site</a></li>
 {% endblock %}
\ No newline at end of file
diff --git a/src/_includes/global/footer.njk b/src/_includes/global/footer.njk
index 931fdd36..36cd6db5 100644
--- a/src/_includes/global/footer.njk
+++ b/src/_includes/global/footer.njk
@@ -1,17 +1,17 @@
 <footer class="footer">
-    {%- block footerContent %}
-        {{ footerContent }}
-    {% endblock -%}
+{%- block footerContent %}
+    {{ footerContent }}
+{% endblock -%}
 
-    {%- if tags and tags.includes("shrine pages") %}
-        <nav class="footer__shrines">
-            <p>Back to:</p>
-            <ul class="footer__links">
-                <li><a href="/shrines/">Shrine Index</a></li>
-                <li><a href="/">{{ sitemeta.siteName }}</a></li>
-            </ul>
-        </nav>
-    {%- endif -%}
+{%- if tags and tags.includes("shrine pages") %}
+    <nav class="footer__shrines">
+        <p>Back to:</p>
+        <ul class="footer__links">
+            <li><a href="/shrines/">Shrine Directory</a></li>
+            <li><a href="/">{{ sitemeta.siteName }}</a></li>
+        </ul>
+    </nav>
+{%- endif -%}
 
     {%- include "global/top-btn.njk" %}
 </footer>
diff --git a/src/_includes/global/navbar.njk b/src/_includes/global/navbar.njk
index 054e8a94..74715541 100644
--- a/src/_includes/global/navbar.njk
+++ b/src/_includes/global/navbar.njk
@@ -1,7 +1,13 @@
 {# Accessible hamburger menu code based on:
 https://kalechips.net/projects/snippets/burger #}
 
-{% set navLinksEl %}{% block navbarLinks %}{{ navbarLinks }}{% endblock %}{% endset %}
+{% set navLinksEl %}
+{% block navbarLinks %}{{ navbarLinks }}{% endblock %}
+{%- if tags and tags.includes("shrine pages") %}
+    <li><a href="/shrines/">Shrine Directory</a></li>
+    <li><a href="/">Main Site</a></li>
+{%- endif -%}
+{% endset %}
 
 <nav class="navbar">
     <details class="navbar__burger">
diff --git a/src/_includes/starwarskotor/navbar.njk b/src/_includes/starwarskotor/navbar.njk
index 127bf807..fca13940 100644
--- a/src/_includes/starwarskotor/navbar.njk
+++ b/src/_includes/starwarskotor/navbar.njk
@@ -12,6 +12,4 @@
             <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
         </li>
     {%- endfor %}
-    <li><a href="/shrines/">Shrine Index</a></li>
-    <li><a href="/">Main Site</a></li>
 {% endblock %}
\ No newline at end of file