diff --git a/argocd/deployment.yaml b/argocd/deployment.yaml
index 0ecd729..e67c50d 100644
--- a/argocd/deployment.yaml
+++ b/argocd/deployment.yaml
@@ -27,7 +27,7 @@ spec:
               mountPath: /data
       containers:
         - name: web
-          image: git.baumann.gr/adebaumann/labhelper:0.035
+          image: git.baumann.gr/adebaumann/labhelper:0.036
           imagePullPolicy: Always
           ports:
             - containerPort: 8000
diff --git a/labhelper/templates/base.html b/labhelper/templates/base.html
index 2d9ad59..1ff4fc0 100644
--- a/labhelper/templates/base.html
+++ b/labhelper/templates/base.html
@@ -69,7 +69,8 @@
             gap: 8px;
         }
         
-        .navbar-nav a:hover {
+        .navbar-nav a:hover,
+        .navbar-nav button:hover {
             background: #667eea;
             color: white;
             transform: translateY(-2px);
@@ -230,9 +231,14 @@
             <a href="/search/"><i class="fas fa-search"></i> Search</a>
             <a href="/admin/"><i class="fas fa-cog"></i> Admin</a>
             {% if user.is_authenticated %}
-            <a href="/logout/"><i class="fas fa-sign-out-alt"></i> Logout ({{ user.username }})</a>
+            <form method="post" action="{% url 'logout' %}" style="display: inline;">
+                {% csrf_token %}
+                <button type="submit" style="background: none; border: none; color: #555; font: inherit; cursor: pointer; padding: 8px 16px; border-radius: 8px; transition: all 0.3s ease; display: inline-flex; align-items: center; gap: 8px;">
+                    <i class="fas fa-sign-out-alt"></i> Logout ({{ user.username }})
+                </button>
+            </form>
             {% else %}
-            <a href="/login/"><i class="fas fa-sign-in-alt"></i> Login</a>
+            <a href="{% url 'login' %}"><i class="fas fa-sign-in-alt"></i> Login</a>
             {% endif %}
         </div>
     </nav>