diff --git a/app/templates/app/_nav_item.html b/app/templates/app/_nav_item.html
index d295abf..5fc7f8e 100644
--- a/app/templates/app/_nav_item.html
+++ b/app/templates/app/_nav_item.html
@@ -1,4 +1,4 @@
-<li class="nav-item me-1"{% if 'admin:' in view %} hx-disable{% endif %}>
+<li class="nav-item me-1">
     <a href="{% url view %}"
             {% if current_page == view %} class="nav-link active px-3" aria-current="page"
             {% else %} class="nav-link px-3"
diff --git a/app/templates/app/_navbar_items.html b/app/templates/app/_navbar_items.html
index 4ef355a..5cf6bcd 100644
--- a/app/templates/app/_navbar_items.html
+++ b/app/templates/app/_navbar_items.html
@@ -9,7 +9,6 @@
         {% include "app/_nav_item.html" with view="documents" label=_("Documents") %}
         {% include "app/_nav_item.html" with view="languages" label=_("Languages") %}
         {% include "app/_nav_item.html" with view="subjects" label=_("Subjects") %}
-        {% include "app/_nav_item.html" with view="admin:index" label=_("Admin") %}
     </ul>
 </div>
 {% endspaceless %}
diff --git a/app/templates/base.html b/app/templates/base.html
index a0bedcf..2ddb073 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -65,16 +65,38 @@ <h1 id="error-title" class="card-title">{% block error_title %}Error{% endblock
 
 {% spaceless %}
 <footer class="footer container-fluid text-bg-primary py-3 link-light"
-        style="--bs-link-color-rgb: 255, 255, 255">
+        style="--bs-link-color-rgb: 255, 255, 255; --bs-link-color:#fff; --bs-btn-color:#fff;">
     <div class="row text-center">
 
         <div class="col col-sm-8 col-md-6 offset-md-3">
-          <p><a href="https://sadilar.org" title="{% trans 'External link'%}">{% trans "Developed by SADiLaR" %}</a></p>
-          <div class="d-md-flex justify-content-center">
-             <div class="px-2 py-1"><a href="{% url 'legal_notices' %}">{% trans "Legal Notices" %}</a></div>
-             <div class="px-2 py-1"><a href="{% url 'contact' %}">{% trans "Contact Us" %}</a></div>
-             <div class="px-2 py-1"><a href="/gebreek">{% trans " - gebreekte skakel -" %}</a></div>
-          </div>
+            <p>
+                <a href="https://sadilar.org" title="{% trans 'External link'%}">
+                    {% trans "Developed by SADiLaR" %}
+                </a>
+            </p>
+            <div class="d-md-flex justify-content-center">
+                <div class="px-2">
+                    <a href="{% url 'legal_notices' %}" class="btn btn-link p-0">{% trans "Legal Notices" %}</a>
+                </div>
+                <div class="px-2">
+                    <a href="{% url 'contact' %}" class="btn btn-link p-0">{% trans "Contact Us" %}</a>
+                </div>
+                {% if user.is_authenticated %}
+                    <div class="px-2" hx-disable>
+                        <a href="{% url 'admin:index' %}" class="btn btn-link p-0">{% trans "Admin" %}</a>
+                    </div>
+                    <div class="px-2" hx-disable>
+                        <form id="logout-form" method="post" action="{% url 'logout' %}">
+                            {% csrf_token %}
+                            <button type="submit" class="btn btn-link p-0">{% trans "Logout" %}</button>
+                        </form>
+                    </div>
+                {% else %}
+                    <div class="px-2" hx-disable>
+                        <a href="{% url 'login' %}" class="btn btn-link p-0">{% trans "Login" %}</a>
+                    </div>
+                {% endif %}
+            </div>
         </div>
 
         <div class="col col-sm-4 col-md-3 pt-2">