diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html
index 2bebdd0..4e520f6 100644
--- a/src/postorius/templates/postorius/lists/index.html
+++ b/src/postorius/templates/postorius/lists/index.html
@@ -4,7 +4,7 @@
 
 {% block main %}
     <div class="mm_subHeader">
-        <span class="mm_context">{% trans "Mailing Lists" %}</span>
+        <h1>{% trans "Mailing Lists" %}</h1>
     </div>
     {% if user.is_superuser %}
         <p>
diff --git a/src/postorius/templates/postorius/menu/administration.html b/src/postorius/templates/postorius/menu/administration.html
deleted file mode 100644
index faa1670..0000000
--- a/src/postorius/templates/postorius/menu/administration.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-
-{% block menu_administration %}
-    <a href="{% url 'administration' %}"> {% trans "Administration" %}</a>
-    <div id="menu_administration"><ul>    
-        <li {% if selected == "domains" %}id="selected"{% endif %}>
-            <a href="{% url 'domains' %}">
-                {% trans "Domains" %}
-            </a>
-        </li>
-        <li {% if selected == "all_lists" %}id="selected"{% endif %}>
-            <a href="{% url 'list_index' %}">
-                {% trans "All Lists" %}
-            </a>
-        </li>
-        <li {% if selected == "new_list" %}id="selected"{% endif %}>
-            <a href="{% url 'list_new' %}">
-                {% trans "New List" %}
-            </a>
-        </li>
-        {% if fqdn_listname %}
-        <li {% if selected == "delete_list" %}id="selected"{% endif %}>
-            <a href="{% url 'list_delete' fqdn_listname=fqdn_listname %}">
-                {% trans "Delete List #TODO:really delete dialog" %}
-            </a>
-        </li>
-        <li {% if selected == "administrivia" %}id="selected"{% endif %}>
-            <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_option='administrivia' visible_section=None%}"> 
-                {% trans "Administrivia" %}
-            </a>
-        </li>
-        {% endif %}
-    </ul></div>
-{% endblock%}
diff --git a/src/postorius/templates/postorius/menu/index.html b/src/postorius/templates/postorius/menu/index.html
deleted file mode 100644
index 8506f85..0000000
--- a/src/postorius/templates/postorius/menu/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-
-<!-- TODO use include "template" instead of with .. as .. end with-->
-<ul class="menu">
-<li id="admin">{% include "mailman-django/menu/administration.html" %}</li>
-<li id="maintanance">{% include "mailman-django/menu/maintanance.html" %}</li>
-<li id="general">{% include "mailman-django/menu/general.html" %}</li>
-<li id="info">{% include "mailman-django/menu/info.html" %}</li>
-<li id="subscriptions">{% include "mailman-django/menu/subscriptions.html" %}</li>
-<li id="user_options">{% include "mailman-django/menu/user_options.html" %}</li>
-        {% comment %} {% if user in list.moderator %}{% endcomment %}
-        ACL:TODO
-
-        <li{% if selected == "requests" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                {% trans "Requests" %} Link:TODO
-            </a>
-        </li>
-        {% comment %}{% endif %}{% endcomment %} 
-</ul>
-
diff --git a/src/postorius/templates/postorius/menu/user_nav.html b/src/postorius/templates/postorius/menu/user_nav.html
index 599b846..cccc25a 100644
--- a/src/postorius/templates/postorius/menu/user_nav.html
+++ b/src/postorius/templates/postorius/menu/user_nav.html
@@ -1,7 +1,9 @@
 {% load url from future %}
 {% load i18n %}
 <div class="mm_subHeader">
-    <span class="mm_context">{% trans 'Settings' %}</span>
+    <div class="mm_subHeader">
+        <h1>{% trans "Settings" %}</h1>
+    </div>
     <ul class="mm_nav">
         <li class="mm_nav_item"><a href="{% url 'user_profile' %}">{% trans "Profile" %}</a></li>
         <li class="mm_nav_item"><a href="{% url 'user_mailmansettings' %}">{% trans "Subscription Settings" %}</a></li>
diff --git a/src/postorius/templates/postorius/site_settings.html b/src/postorius/templates/postorius/site_settings.html
deleted file mode 100644
index 0ef4bc9..0000000
--- a/src/postorius/templates/postorius/site_settings.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends extend_template %}
-{% load url from future %}
-{% load i18n %}
-
-{% block main %}
-    {% include 'postorius/menu/settings_nav.html' %}
-    <h1>General Settings</h1>
-    <h2 class="text-info">Site level settings coming soon.</h2>
-{% endblock main %}
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index 0a1508a..d61343c 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -5,11 +5,15 @@
 {% block main %}
     {% include 'postorius/menu/user_nav.html' %}
     {% if nolists %}
-        <h1>No Preferences Available</h1>
+        <div class="mm_subHeader">
+            <h1>{% trans "No Preferences Available" %}</h1>
+        </div>
         <p> {% trans 'You are not yet subscribed to any lists, so have no Mailman preferences.' %} </p>
     {% else %}
 
-  <h1>{% trans 'Mailman Settings' %} <span>- {{ user }}</span></h1>
+    <div class="mm_subHeader">
+        <h1>{% trans "Subscription Settings" %} <span>- {{ user }}</span></h1>
+    </div>
 
     <p><strong>Mailman display name:</strong> {{ mm_user.display_name}}</p>
     <p><strong>Django email:</strong> {{ user.email }}</p>
diff --git a/src/postorius/templates/postorius/users/index.html b/src/postorius/templates/postorius/users/index.html
index 12a21bd..5765b78 100644
--- a/src/postorius/templates/postorius/users/index.html
+++ b/src/postorius/templates/postorius/users/index.html
@@ -6,6 +6,9 @@
 {% block main %}
     {% if user.is_superuser %}
         {% users_nav 'user_index' 'Mailman Users' %}
+    <div class="mm_subHeader">
+        <h1>{% trans "Mailman Users" %}</h1>
+    </div>
     {% endif %}
 
     <table class="table table-bordered table-striped">