diff --git a/panel/src/panel/templates/base.html b/panel/src/panel/templates/base.html
index ad2afc5..86f1557 100644
--- a/panel/src/panel/templates/base.html
+++ b/panel/src/panel/templates/base.html
@@ -17,9 +17,9 @@
   <body>
     <header>
     {% if user.is_authenticated %}
-      <p>Welcome, {{ user.username }}! <a href="{% url 'logout' %}">Logout</a></p>
+      <p>Welcome, {{ user.username }}! <a href="{% url 'logout' %}?next={{ request.path }}">Logout</a></p>
     {% else %}
-      <p><a href="{% url 'login' %}">Login</a></p>
+      <p><a href="{% url 'login' %}?next={{ request.path }}">Login</a></p>
     {% endif %}
     </header>
     {% block navigation %}
diff --git a/panel/src/panel/templates/service_list.html b/panel/src/panel/templates/service_list.html
new file mode 100644
index 0000000..9570f69
--- /dev/null
+++ b/panel/src/panel/templates/service_list.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1>Fediverse services</h1>
+
+<dl>
+  <dt>Hello world service</dt>
+  <dd>Nothing to see here</dd>
+</dl>
+{% endblock %}
diff --git a/panel/src/panel/urls.py b/panel/src/panel/urls.py
index 7a0fc28..a8a8fab 100644
--- a/panel/src/panel/urls.py
+++ b/panel/src/panel/urls.py
@@ -23,4 +23,5 @@ urlpatterns = [
     path('', views.Index.as_view(), name='index'),
     path("", include("django.contrib.auth.urls")),
     path("account/", views.AccountDetail.as_view(), name='accountdetail')
+    path("services/", views.ServiceList.as_view(), name='service_list'),
 ]
diff --git a/panel/src/panel/views.py b/panel/src/panel/views.py
index f945d89..184855b 100644
--- a/panel/src/panel/views.py
+++ b/panel/src/panel/views.py
@@ -11,3 +11,6 @@ class AccountDetail(LoginRequiredMixin, DetailView):
     template_name = 'accountdetail.html'
     def get_object(self):
         return self.request.user
+
+class ServiceList(TemplateView):
+    template_name = 'service_list.html'
