diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html
index 0ef26b8d5..4c2a85804 100644
--- a/openslides/agenda/templates/agenda/config.html
+++ b/openslides/agenda/templates/agenda/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Agenda settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Agenda settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Agenda" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     {{ form.as_p }}
     <p>
diff --git a/openslides/application/templates/application/config.html b/openslides/application/templates/application/config.html
index 8dd65eddf..9193f5525 100644
--- a/openslides/application/templates/application/config.html
+++ b/openslides/application/templates/application/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Application settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Application settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Applications" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     {{ form.as_p }}
     <p>
diff --git a/openslides/assignment/templates/assignment/config.html b/openslides/assignment/templates/assignment/config.html
index 035de8384..b2feb2412 100644
--- a/openslides/assignment/templates/assignment/config.html
+++ b/openslides/assignment/templates/assignment/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Election settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Election settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Elections" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     {{ form.as_p }}
     <p>
diff --git a/openslides/config/templates/config/base_config.html b/openslides/config/templates/config/base_config.html
index 78880323e..a1f99418e 100644
--- a/openslides/config/templates/config/base_config.html
+++ b/openslides/config/templates/config/base_config.html
@@ -1,13 +1,15 @@
 {% extends "base.html" %}
 
-{% load tags %}
 {% load i18n %}
 
-{% block submenu %}
-    <h4 class="sectiontitle">{% trans "Configuration" %}</h4>
-    <ul>
-        {% for menu_link in menu_links %}
-            <li{% if menu_link.2 %} class="selected"{% endif %}><a href="{{ menu_link.0 }}">{{ menu_link.1 }}</a></li>
-        {% endfor %}
-    </ul>
+{% block config_submenu %}
+    <small class="pull-right">
+        <div class="btn-toolbar">
+            <div class="btn-group">
+            {% for menu_link in menu_links %}
+                <a href="{{ menu_link.0 }}" class="btn btn-mini {% if menu_link.2 %}active{% endif %}">{{ menu_link.1 }}</a>
+            {% endfor %}
+            </div>
+        </div>
+    </small>
 {% endblock %}
diff --git a/openslides/config/templates/config/general.html b/openslides/config/templates/config/general.html
index 55fbae5b1..585adf31e 100644
--- a/openslides/config/templates/config/general.html
+++ b/openslides/config/templates/config/general.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "General settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "General settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "General" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
     <fieldset>
         <legend>{% trans "Event" %}</legend>
diff --git a/openslides/config/templates/config/version.html b/openslides/config/templates/config/version.html
index 0df6c49f3..a846675ad 100644
--- a/openslides/config/templates/config/version.html
+++ b/openslides/config/templates/config/version.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Version" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Version" %}</h1>
+    <h1>{% trans "Version" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
 
     {% for version in versions %}
         <p>{{ version.0 }} {% trans "Version" %}: {{ version.1 }}</p>
diff --git a/openslides/participant/templates/participant/config.html b/openslides/participant/templates/participant/config.html
index 49973462e..ea661a65c 100644
--- a/openslides/participant/templates/participant/config.html
+++ b/openslides/participant/templates/participant/config.html
@@ -5,7 +5,9 @@
 {% block title %}{{ block.super }} – {% trans "Participant settings" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Participant settings" %}</h1>
+    <h1>{% trans "Configuration" %}: {% trans "Participants" %}
+        {% block config_submenu %}{{ block.super }}{% endblock %}
+    </h1>
     <form action="" method="post">{% csrf_token %}
         {% include "form.html" %}
         <p>