diff --git a/panel/src/panel/templates/base.html b/panel/src/panel/templates/base.html
index aa29745a..7a665787 100644
--- a/panel/src/panel/templates/base.html
+++ b/panel/src/panel/templates/base.html
@@ -16,28 +16,12 @@
 
   <body>
     <header>
-
-      {% 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 %}
+    {% 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 %}
     </header>
 
     {% block layout %}
diff --git a/panel/src/panel/templates/deploy_services.html b/panel/src/panel/templates/deploy_services.html
index ad67e72d..f9c52275 100644
--- a/panel/src/panel/templates/deploy_services.html
+++ b/panel/src/panel/templates/deploy_services.html
@@ -4,7 +4,6 @@
   {% csrf_token %}
   {{ form.as_p }}
 
-
   </fieldset>
 
   <button class="button" disabled>Deploy</button>
diff --git a/panel/src/panel/views.py b/panel/src/panel/views.py
index b9c04357..c94af0c7 100644
--- a/panel/src/panel/views.py
+++ b/panel/src/panel/views.py
@@ -28,4 +28,4 @@ class DeployServices(LoginRequiredMixin, UpdateView):
 
     def get_object(self, queryset=None):
         obj, created = DeployFormModel.objects.get_or_create(user=self.request.user)
-        return obj
\ No newline at end of file
+        return obj
