diff --git a/panel/src/panel/templates/base.html b/panel/src/panel/templates/base.html
index 7a665787..aa29745a 100644
--- a/panel/src/panel/templates/base.html
+++ b/panel/src/panel/templates/base.html
@@ -16,12 +16,28 @@
 
   <body>
     <header>
-    {% if user.is_authenticated %}
-      <p>Welcome, {{ user.username }}! <a href="{% url 'logout' %}?next={{ request.path }}">Logout</a></p>
-      <p><a href="{% url 'deploy_services' %}">Deploy services</a></p>
-    {% else %}
-      <p><a href="{% url 'login' %}?next={{ request.path }}">Login</a></p>
-    {% endif %}
+
+      {% block navigation %}
+      <nav>
+        <ul>
+          <li>
+            <a href="{% url 'index' %}">Start</a>
+          </li>
+          <li>
+            <a href="{% url 'service_list' %}">Services</a>
+          </li>
+
+          {% load custom_tags %}
+          <li>
+          {% if user.is_authenticated %}
+            Welcome, <a href="{% url 'account_detail' %}">{{ user.username }}</a>! <a id="logout" href="{% auth_url 'logout' %}">Logout</a>
+          {% else %}
+            <a id="login" href="{% auth_url 'login' %}">Login</a>
+          {% endif %}
+          </li>
+        </ul>
+      </nav>
+      {% endblock navigation %}
     </header>
 
     {% block layout %}
