diff --git a/static/mailman_django/css/menu.css b/static/mailman_django/css/menu.css
index 5997e12..5ad43d0 100644
--- a/static/mailman_django/css/menu.css
+++ b/static/mailman_django/css/menu.css
@@ -10,4 +10,8 @@
 
 ul.menu li {
     margin-left:15px;
-    }    
+    }   
+
+li#selected, li#selected a {
+    color:#ff0000;
+    }     
diff --git a/templates/mailman-django/base.html b/templates/mailman-django/base.html
index 4da3190..dd0c1cc 100644
--- a/templates/mailman-django/base.html
+++ b/templates/mailman-django/base.html
@@ -32,7 +32,7 @@
         <a id="logo" href="{% url list_index %}"></a>
         <hr>
         <div id="menu">
-            {% include "mailman-django/menu/general.html" %}
+            {% include "mailman-django/menu/index.html" %}
         </div>
         <hr>
 		<div id="content">
diff --git a/templates/mailman-django/menu/administration.html b/templates/mailman-django/menu/administration.html
index bee4bb5..f08b76c 100644
--- a/templates/mailman-django/menu/administration.html
+++ b/templates/mailman-django/menu/administration.html
@@ -1,26 +1,27 @@
 {% load i18n %}
+
 {% block menu_administration %}
-<ul class="menu">
-Administration
-    <li {% if selected == "domains" %}id="selected"{% endif %}>
-        <a href="{% url domains %}">
-            {% trans "Domains" %}
-        </a>
-    </li>
-    <li {% if selected == "new_list" %}id="selected"{% endif %}>
-        <a href="{% url list_new %}">
-            {% trans "New List" %}
-        </a>
-    </li>
-    <li {% if selected == "delete_list" %}id="selected"{% endif %}>
-        <a href="{% comment %}{% url list_delete list.fqdn_listname %}TODO add List{% endcomment %}">
-            {% trans "Delete List" %}
-        </a>
-    </li>
-    <li{% if selected == "administrivia" %}id="selected"{% endif %}>
-        <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
-            {% trans "New List" %}
-        </a>
-    </li>
-</ul>
+    <ul class="menu">
+    Administration
+        <li {% if selected == "domains" %}id="selected"{% endif %}>
+            <a href="{% url domains %}">
+                {% trans "Domains" %}
+            </a>
+        </li>
+        <li {% if selected == "new_list" %}id="selected"{% endif %}>
+            <a href="{% url list_new %}">
+                {% trans "New List" %}
+            </a>
+        </li>
+        <li {% if selected == "delete_list" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_delete list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "Delete List" %}
+            </a>
+        </li>
+        <li{% if selected == "administrivia" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "New List" %}
+            </a>
+        </li>
+    </ul>
 {% endblock%}
diff --git a/templates/mailman-django/menu/general.html b/templates/mailman-django/menu/general.html
index 323edda..78e5a0d 100644
--- a/templates/mailman-django/menu/general.html
+++ b/templates/mailman-django/menu/general.html
@@ -1,5 +1,27 @@
-{% with "new_list" as selected %}<!-- TODO use include "template" instead of with .. as .. end with-->
+{% load i18n %}
 
-{% include "mailman-django/menu/administration.html" %}
-
-{% endwith %}
+{% block menu_administration %}
+    <ul class="menu">
+    General
+        <li {% if selected == "domains" %}id="selected"{% endif %}>
+            <a href="{% url domains %}">
+                {% trans "Domains" %}
+            </a>
+        </li>
+        <li {% if selected == "new_list" %}id="selected"{% endif %}>
+            <a href="{% url list_new %}">
+                {% trans "New List" %}
+            </a>
+        </li>
+        <li {% if selected == "delete_list" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_delete list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "Delete List" %}
+            </a>
+        </li>
+        <li{% if selected == "administrivia" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "New List" %}
+            </a>
+        </li>
+    </ul>
+{% endblock%}
diff --git a/templates/mailman-django/menu/index.html b/templates/mailman-django/menu/index.html
new file mode 100644
index 0000000..3d43fd3
--- /dev/null
+++ b/templates/mailman-django/menu/index.html
@@ -0,0 +1,7 @@
+{% with "new_list" as selected %}<!-- TODO use include "template" instead of with .. as .. end with-->
+
+{% include "mailman-django/menu/administration.html" %}
+{% include "mailman-django/menu/maintanance.html" %}
+{% include "mailman-django/menu/general.html" %}
+
+{% endwith %}
diff --git a/templates/mailman-django/menu/maintanance.html b/templates/mailman-django/menu/maintanance.html
index e69de29..14cf9f4 100644
--- a/templates/mailman-django/menu/maintanance.html
+++ b/templates/mailman-django/menu/maintanance.html
@@ -0,0 +1,81 @@
+{% load i18n %}
+
+{% block menu_maintanance %}
+    <ul class="menu">
+    Maintanance
+        <li {% if selected == "archive" %}id="selected"{% endif %}>
+            <a href="{% url domains %}">
+                {% trans "Archive" %} Link:TODO
+            </a>
+        </li>
+        <li {% if selected == "auto_resonder" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url ... %}{% endcomment %}">
+                {% trans "Auto Responder" %} Link:TODO
+            </a>
+            <ul>
+                <li {% if selected == "auto_respond_postings" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Postings" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "auto_respond_requests" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Requests" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "auto_respond_owner" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Owner" %} Link:TODO
+                    </a>
+                </li>                                
+            </ul>
+        </li>
+        </li>
+        <li {% if selected == "filter" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
+                {% trans "Filter" %} Link:TODO
+            </a>
+            <ul>
+                <li {% if selected == "filter_content" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Filter content" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "filter_sender" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Sender" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "filter_message" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Message" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "filter_receipent" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Receipent" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "filter_spam" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Spam" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "filter_topics" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "Topics" %} Link:TODO
+                    </a>
+                </li>                   
+            </ul>
+        </li>
+        {% comment %} {% if user in list.moderators %}{% 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>
+{% endblock%}