diff --git a/forms.py b/forms.py
index faa3268..22febc2 100644
--- a/forms.py
+++ b/forms.py
@@ -747,6 +747,15 @@
         label = _('Posting Address'),
         required = False,
     )
+    #Descriptions used in the Settings Overview Page
+    section_descriptions = {
+        "List Indentity":_("General List settings use"),
+        "Automatic Responses":_("All options for Autoreply"),
+        "Content Filtering":_("Decide how incoming mails might be filtered"),
+        "Digest": _("Modify and check some Digest options"),
+        "Privacy" : _("Check the lists privacy standards"),
+        "Assorted" : _("Some other Admin stuff"),
+        }
     def __init__(self,visible_section,visible_option, *args, **kwargs):  
         super(ListSettings, self).__init__(*args, **kwargs)  
         #if settings:raise Exception(settings) #debug
@@ -790,7 +799,7 @@
         To use it: add a list for each wished fieldset. The first item in 
         the list should be the wished name of the fieldset, the following 
         the fields that should be included in the fieldset.
-        """
+        """        
         # just a really temporary layout to see that it works. -- Anna
         layout = [
             ["List Indentity", "real_name", "include_list_post_header", 
@@ -830,7 +839,7 @@
             #["Addresses", "bounces_address", "join_address", "leave_address", 
              #"no_reply_address", "owner_address", "posting_address", 
              #"request_address"],
-            ["Assorted", "acceptable_aliases", "administrivia", "pipeline"]]
+            ["Assorted", "acceptable_aliases", "administrivia", "pipeline"]
              #"post_id", "encode_ascii_prefixes", "first_strip_reply_to",
              #"forward_auto_discards", "gateway_to_mail", "gateway_to_news",
              #"header_matches", "linked_newsgroup", "max_days_to_hold",
@@ -846,6 +855,7 @@
              #"start_chain", "subject_prefix", "subscribe_auto_approval",
              #"subscribe_policy", "topics", "topics_bodylines_limit",
              #"topics_enabled", "unsubscribe_policy"]]
+             ]
 
 class Login(FieldsetForm):
     """Form fields to let the user log in.
diff --git a/templates/mailman-django/lists/settings.html b/templates/mailman-django/lists/settings.html
index c3353a1..9c7e874 100644
--- a/templates/mailman-django/lists/settings.html
+++ b/templates/mailman-django/lists/settings.html
@@ -6,8 +6,10 @@
 {% endblock %}
 
 {% block header %}
+{% if visible_section %}
     <div class="mm_box mm_clear">
-        <div class="mm_boxHeader">{% trans "List Settings " %}{{ fqdn_listname }}</div>
+        <div class="mm_boxHeader">{% trans "List Settings " %}{{ fqdn_listname }}<br>
+        </div>
         <p>{% trans "This page visualizes all list settings. This gives an idea of what the settings page could look like." %}</p>
 
         <form action="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings">
@@ -17,8 +19,19 @@
             </div>
         </form>
     </div>
-
+{% endif %}
 {% endblock %}
+
+{% block smallBoxLeft %}
+    {% for section in form_sections %}
+    <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}">
+        <div class="mm_boxHeader"><a href="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=section.0 visible_option=None %}">{{section.0}}</a></div>
+        {{section.1}}
+    </div>
+    {% endfor %}
+{% endblock %}        
+
+
 {% block actionButtonsList %}
     <ul class="mm_actionButtons">
         <li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "List Summary" %}</a></li>
diff --git a/views.py b/views.py
index 9bd809e..bdd0821 100644
--- a/views.py
+++ b/views.py
@@ -319,28 +319,32 @@
         else:
             message = _("Validation Error - The list has not been updated.")
     
-    else:#Provide a form with existing values
+    else:
+        #collect all Form sections for the links:
+        temp = ListSettings('','')
+        form_sections = []
+        for section in temp.layout:
+            try:
+                form_sections.append((section[0],temp.section_descriptions[section[0]]))
+            except KeyError, e:
+                error=e
+        del temp
+        #Provide a form with existing values
         #create form and process layout into form.layout
         form = ListSettings(visible_section,visible_option,data=None)
         #create a Dict of all settings which are used in the form
         used_settings={}
         for section in form.layout:
+
             for option in section[1:]:
                 used_settings[option] = the_list.settings[option]
         #recreate the form using the settings
         form = ListSettings(visible_section,visible_option,data=used_settings)
         form.truncate()
-    if visible_option:
-        selected = visible_option
-    elif visible_section:
-        selected = visible_section
-    else:
-        selected = None
-        
     return render_to_response(template, {'form': form,
+                                         'form_sections': form_sections,
                                          'message': message,
                                          'list': the_list,
-                                         'selected':selected,
                                          'visible_option':visible_option,
                                          'visible_section':visible_section,
                                          }