diff --git a/templates/mailman-django/menu/general.html b/templates/mailman-django/menu/general.html
index 78e5a0d..ab510a8 100644
--- a/templates/mailman-django/menu/general.html
+++ b/templates/mailman-django/menu/general.html
@@ -3,25 +3,108 @@
 {% block menu_administration %}
     <ul class="menu">
     General
-        <li {% if selected == "domains" %}id="selected"{% endif %}>
+        <li {% if selected == "notifications" %}id="selected"{% endif %}>
             <a href="{% url domains %}">
-                {% trans "Domains" %}
+                {% trans "Notifications" %} Link:TODO
             </a>
+            <ul>
+                <li {% if selected == "admin_immend_notify" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "admin_immend_notify" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "admin_notify_mchanges" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "admin_notify_mchanges" %} Link:TODO
+                    </a>
+                </li>                              
+            </ul>
         </li>
-        <li {% if selected == "new_list" %}id="selected"{% endif %}>
+        <li {% if selected == "formatting" %}id="selected"{% endif %}>
             <a href="{% url list_new %}">
-                {% trans "New List" %}
+                {% trans "Formatting" %} Link:TODO
             </a>
+            <ul>
+                <li {% if selected == "include_list_post_header" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "include_list_post_header" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "include_rfc2369_headers" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "include_rfc2369_headers" %} Link:TODO
+                    </a>
+                </li>         
+                <li {% if selected == "convert_html_to_plaintext" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "convert_html_to_plaintext" %} Link:TODO
+                    </a>
+                </li>                                         
+            </ul>            
         </li>
-        <li {% if selected == "delete_list" %}id="selected"{% endif %}>
+        <li {% if selected == "gateways" %}id="selected"{% endif %}>
             <a href="{% comment %}{% url list_delete list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "Delete List" %}
+                {% trans "Gateways" %} Link:TODO
             </a>
         </li>
-        <li{% if selected == "administrivia" %}id="selected"{% endif %}>
+        <li{% if selected == "language" %}id="selected"{% endif %}>
             <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "New List" %}
+                {% trans "Language" %} Link:TODO
             </a>
         </li>
+        <li{% if selected == "subscription_rules" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "Subscription rules" %} Link:TODO
+            </a>
+            <ul>
+                <li {% if selected == "send_welcome_message" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "send_welcome_message" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "advertised" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "advertised" %} Link:TODO
+                    </a>
+                </li>         
+                <li {% if selected == "anonymus_list" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "anonymus_list" %} Link:TODO
+                    </a>
+                </li>                                         
+            </ul>     
+        </li>
+        <li{% if selected == "bounces" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "Bounces" %} Link:TODO
+            </a>
+        </li>
+        <li{% if selected == "digest" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "Digest" %} Link:TODO
+            </a>
+            <ul>
+                <li {% if selected == "next_digest_number" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "next_digest_number" %} Link:TODO
+                    </a>
+                </li>
+                <li {% if selected == "digest_size_threshold" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "digest_size_threshold" %} Link:TODO
+                    </a>
+                </li>         
+                <li {% if selected == "digest_last_send_at" %}id="selected"{% endif %}>
+                    <a href="{% comment %}{% url ... %}{% endcomment %}">
+                        {% trans "digest_last_send_at" %} Link:TODO
+                    </a>
+                </li>                                         
+            </ul>                
+        </li>  
+        <li{% if selected == "description" %}id="selected"{% endif %}>
+            <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
+                {% trans "Description" %} Link:TODO
+            </a>
+        </li>              
     </ul>
 {% endblock%}