diff --git a/modules/core/templates/_frontpage_menu.twig b/modules/core/templates/_frontpage_menu.twig
new file mode 100644
index 0000000000000000000000000000000000000000..8e07bda1b4cf77ef54bf8818a4b441e69f021c7c
--- /dev/null
+++ b/modules/core/templates/_frontpage_menu.twig
@@ -0,0 +1,25 @@
+<div class="pure-g">
+  <div class="pure-u-2-3">
+    <div class="pure-menu pure-menu-horizontal">
+    <ul class="pure-menu-list">
+      <li class="pure-menu-item {% if frontpage_section == "welcome" %} pure-menu-selected{% endif %}">
+        <a href="frontpage_welcome.php" class="pure-menu-link">Welcome</a></li>
+      <li class="pure-menu-item {% if frontpage_section == "config" %} pure-menu-selected{% endif %}">
+        <a href="frontpage_config.php" class="pure-menu-link">Configuration</a></li>
+      <li class="pure-menu-item {% if frontpage_section == "auth" %} pure-menu-selected{% endif %}">
+        <a href="frontpage_auth.php" class="pure-menu-link">Authentication</a></li>
+      <li class="pure-menu-item {% if frontpage_section == "federation" %} pure-menu-selected{% endif %}">
+        <a href="frontpage_federation.php" class="pure-menu-link">Federation</a></li>
+    </ul>
+    </div>
+  </div>
+  <div class="pure-u-1-3">
+    {% if isadmin %}
+    <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
+    {% else %}
+    <p class="float-r youareadmin">
+        <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
+    </p>
+    {% endif %}
+  </div>
+</div>
diff --git a/modules/core/templates/frontpage_auth.twig b/modules/core/templates/frontpage_auth.twig
index 3d30318f460d8a063365b3fcca003cc478601abe..cfe3c4f9d1f385e00bb3ecb2da497c0cf9e61013 100644
--- a/modules/core/templates/frontpage_auth.twig
+++ b/modules/core/templates/frontpage_auth.twig
@@ -1,14 +1,9 @@
 {% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'auth' %}
 {% extends "base.twig" %}
 
 {% block content %}
-    {% if isadmin %}
-    <p class="right youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
-    {% else %}
-    <p class="right youareadmin">
-        <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
-    </p>
-    {% endif %}
+    {% include "@core/_frontpage_menu.twig" %}
 
     <ul>
     {% for key, link in links_auth %}
diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig
index 353f9b9779b760306a49a079f807f476c1e3cc75..1d599c424a2af143b760a877ea5670240b0b667e 100644
--- a/modules/core/templates/frontpage_config.twig
+++ b/modules/core/templates/frontpage_config.twig
@@ -1,14 +1,9 @@
 {% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'config' %}
 {% extends "base.twig" %}
 
 {% block content %}
-    {% if isadmin %}
-    <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
-    {% else %}
-    <p class="float-r youareadmin">
-        <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
-    </p>
-    {% endif %}
+    {% include "@core/_frontpage_menu.twig" %}
 
     <div style="margin-top: 1em;">
         <code style="background: white; background: #f5f5f5; border: 1px dotted #bbb; padding: 1em;  color: #555" >{{ directory }} ({{ version }})</code>
diff --git a/modules/core/templates/frontpage_federation.twig b/modules/core/templates/frontpage_federation.twig
index 91772b6935e3532f4b7280e8012f368b49458745..ef21bbeade9579bcd98838232162aaed2688cccc 100644
--- a/modules/core/templates/frontpage_federation.twig
+++ b/modules/core/templates/frontpage_federation.twig
@@ -1,14 +1,9 @@
 {% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'federation' %}
 {% extends "base.twig" %}
 
 {% block content %}
-    {% if isadmin %}
-    <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
-    {% else %}
-    <p class="float-r youareadmin">
-        <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
-    </p>
-    {% endif %}
+    {% include "@core/_frontpage_menu.twig" %}
 
     {% if metaentries.hosted is iterable and metaentries.hosted is not empty %}
     <dl>
diff --git a/modules/core/templates/frontpage_welcome.twig b/modules/core/templates/frontpage_welcome.twig
index c4c305222ebe7588aabc549983ae662a69946074..de2f3757ca2897b077d688bdceb14e86ab0cd5ed 100644
--- a/modules/core/templates/frontpage_welcome.twig
+++ b/modules/core/templates/frontpage_welcome.twig
@@ -1,14 +1,9 @@
 {% set pagetitle = '{core:frontpage:page_title}'|trans %}
+{% set frontpage_section = 'welcome' %}
 {% extends "base.twig" %}
 
 {% block content %}
-    {% if isadmin %}
-    <p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
-    {% else %}
-    <p class="float-r youareadmin">
-        <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
-    </p>
-    {% endif %}
+    {% include "@core/_frontpage_menu.twig" %}
 
     <p>{{ '{core:frontpage:intro}'|trans|raw }}</p>
     <ul>