diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index f2552736..8cdd0f80 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -89,31 +89,7 @@
         </div>
         {% block usertools %}
         {% if has_permission %}
-        <div id="user-tools">
-            <a href="{% url 'admin:Add' %}">Add ➕</a> &nbsp; &nbsp;
-            <a href="{% url 'Home' %}">Snapshots</a> |
-            <a href="/admin/core/archiveresult/?o=-1">Outputs</a> |
-            <a href="/admin/core/tag/">Tags</a> &nbsp; &nbsp;
-            <a href="{% url 'Docs' %}">Docs</a> | 
-            <a href="/admin/">Admin</a>
-             &nbsp; &nbsp;
-            {% block welcome-msg %}
-                {% trans 'User' %}
-                <strong>{% firstof user.get_short_name user.get_username %}</strong> &nbsp; &nbsp;
-            {% endblock %}
-            {% block userlinks %}
-                {% if user.is_active and user.is_staff %}
-                    {% url 'django-admindocs-docroot' as docsroot %}
-                    {% if docsroot %}
-                        <a href="{{ docsroot }}">{% trans 'Documentation' %}</a> /
-                    {% endif %}
-                {% endif %}
-                {% if user.has_usable_password %}
-                <a href="{% url 'admin:password_change' %}">Account</a> /
-                {% endif %}
-                <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
-            {% endblock %}
-        </div>
+            {% include 'navigation.html' %}
         {% endif %}
         {% endblock %}
         {% block nav-global %}{% endblock %}
diff --git a/archivebox/templates/core/base.html b/archivebox/templates/core/base.html
index e664c22f..fbecd84b 100644
--- a/archivebox/templates/core/base.html
+++ b/archivebox/templates/core/base.html
@@ -44,21 +44,8 @@
                         </a>
                     </h1>
                 </div>
-                <div id="user-tools">
-                    <a href="/add/">➕&nbsp; Add</a> &nbsp;/&nbsp;
-                    <a href="/">Snapshots</a> &nbsp;/&nbsp;
-                    <a href="/admin/">Admin</a> &nbsp;/&nbsp;
-                    <a href="https://github.com/ArchiveBox/ArchiveBox/wiki">Docs</a>
-                    {% if user.is_authenticated %}
-                        &nbsp; &nbsp;
-                        User
-                        <strong>{% firstof user.get_short_name user.get_username %}</strong> &nbsp; &nbsp;
-                        {% if user.has_usable_password %}
-                            <a href="{% url 'admin:password_change' %}">Change password</a> /
-                        {% endif %}
-                        <a href="{% url 'admin:logout' %}">Log out</a>
-                    {% endif %}
-                </div>
+                {% include 'navigation.html' %}
+               
             </div>
             <div id="content" class="flex">
                 {% block body %}
diff --git a/archivebox/templates/core/navigation.html b/archivebox/templates/core/navigation.html
new file mode 100644
index 00000000..27330f1c
--- /dev/null
+++ b/archivebox/templates/core/navigation.html
@@ -0,0 +1,22 @@
+{% load i18n static %}
+
+<div id="user-tools">
+    <a href="{% url 'admin:Add' %}">Add ➕</a> &nbsp; &nbsp;
+    <a href="{% url 'Home' %}">Snapshots</a> |
+    <a href="/admin/core/tag/">Tags</a> |
+    <a href="/admin/core/archiveresult/?o=-1">Log</a> &nbsp; &nbsp;
+    <a href="{% url 'Docs' %}">Docs</a> | 
+    <a href="{% url 'public-index' %}">Public</a> | 
+    <a href="/admin/">Admin</a>
+     &nbsp; &nbsp;
+    {% block welcome-msg %}
+        {% trans 'User' %}
+        <strong>{% firstof user.get_short_name user.get_username %}</strong> &nbsp; &nbsp;
+    {% endblock %}
+    {% block userlinks %}
+        {% if user.has_usable_password %}
+            <a href="{% url 'admin:password_change' %}">Account</a> /
+        {% endif %}
+        <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
+    {% endblock %}
+</div>
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c374867..d70ca4a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@
 # Documentation:
 #     https://github.com/ArchiveBox/ArchiveBox/wiki/Docker#docker-compose
 
-version: '3.7'
+version: '2.4'
 
 services:
     archivebox:
@@ -87,4 +87,3 @@ services:
     #     volumes:
     #         ./data:/archivebox
     #         ./data/wayback:/webarchive
-