diff --git a/templates/mailman-django/lists/list_summary.html b/templates/mailman-django/lists/list_summary.html
index c91f4e4..0930b6a 100644
--- a/templates/mailman-django/lists/list_summary.html
+++ b/templates/mailman-django/lists/list_summary.html
@@ -7,7 +7,7 @@
 
 {% block header %}
     <div class="mm_box">
-        <div class="mm_boxHeader">About</div>
+        <div class="mm_boxHeader">{% trans "About" %}</div>
         {{list.description}}
     </div>
 {% endblock %}
diff --git a/templates/mailman-django/lists/settings.html b/templates/mailman-django/lists/settings.html
index 4345737..f09d33b 100644
--- a/templates/mailman-django/lists/settings.html
+++ b/templates/mailman-django/lists/settings.html
@@ -1,30 +1,33 @@
 {% extends "mailman-django/base.html" %}
 {% load i18n %}
 
-{% block links%}
-    {% url list_info fqdn_listname as url_list_info %}
-    {% url list_delete fqdn_listname as url_list_delete %}
-    {% url mass_subscribe fqdn_listname as url_mass_subscription %}
-
-
-    {% blocktrans %}
- If you wish to mass subscribe users to this list, please click <a href="{{url_mass_subscription}}">here</a>.
-    {% endblocktrans %}
+{% block heading %}
+    {{list.list_name}} <span>{{list.real_name}}</span>
 {% endblock %}
 
-{% block content %}
+{% block header%}
+    <div class="mm_box">
+        <div class="mm_boxHeader">{% trans "List Settings for " %}{{ fqdn_listname }}</div>
+        <p>{% trans "This page visualizes all list settings. This gives an idea of what the settings page could look like." %}</p>
 
-<h1>{% trans "List Settings for " %}{{ fqdn_listname }}</h1>
-
-<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=fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings">
-{{ form.as_div }}
-
-    <div class="field">
-        <button type="submit">{%trans "Save changes" %}</button>
+        <form action="{% url list_settings fqdn_listname=fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings">
+        {{ form.as_div }}
+            <div class="field">
+                <button type="submit">{%trans "Save changes" %}</button>
+            </div>
+        </form>
     </div>
+{% endblock %}
 
-</form>
 
+
+{% block smallBoxLeft %}
+    <div class="mm_box mm_smallBox mm_smallBoxLeft">
+        <div class="mm_boxHeader">{% trans "Links" %}</div>
+        <ul>
+            <li><a href="{% url list_summary fqdn_listname %}">{% trans "List Summary" %} </a></li>
+            <li><a href="{% url list_delete fqdn_listname %}">{% trans "Delete List" %} </a></li>
+            <li><a href="{% url mass_subscribe fqdn_listname %}">{% trans "Mass Subscribe to List" %} </a></li>
+        </ul>
+    </div>
 {% endblock %}
diff --git a/templates/mailman-django/lists/subscriptions.html b/templates/mailman-django/lists/subscriptions.html
index 0e53d0a..1c58e0f 100644
--- a/templates/mailman-django/lists/subscriptions.html
+++ b/templates/mailman-django/lists/subscriptions.html
@@ -1,45 +1,31 @@
 {% extends "mailman-django/base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block heading %}
+    {{list.list_name}} <span>{{list.real_name}}</span>
+{% endblock %}
 
-<h1>{{ fqdn_listname }} -- {{ listinfo.real_name }}</h1>
+{% block header %}
+    <div class="mm_box">
+        <div class="mm_boxHeader">{% trans "About" %}</div>
+            {% if form_subscribe %}
+            <form action="{% url list_subscriptions fqdn_listname %}" method="post" class="subscribe" name="subscribe">
+                {{ form_subscribe.as_div }}
+	            <div class="field">
+		            <button type="submit">{% trans "Subscribe" %}</button>
+	            </div>
 
-{% if form_subscribe %}
-<form action="{% url list_subscriptions fqdn_listname %}" method="post" class="subscribe" name="subscribe">
-    {{ form_subscribe.as_div }}
-	<div class="field">
-		<button type="submit">{% trans "Subscribe" %}</button>
-	</div>
+            </form>
+            {% endif %}
+            {% if form_unsubscribe %}
+            <form action="" method="post" class="unsubscribe" name="unsubscribe">
+                {{ form_unsubscribe.as_div }}
+                <div class="field">
+                    <button type="submit">{% trans "Unsubscribe" %}</button>
+                </div>
 
-</form>
-{% endif %}
-{% if form_unsubscribe %}
-<form action="" method="post" class="unsubscribe" name="unsubscribe">
-    {{ form_unsubscribe.as_div }}
-<!--
-    <fieldset>
-
-        <legend>{% trans "Unsubscribe from " %} "{{ listinfo.real_name }}"</legend>
-
-        {{ unsubscribe.listname }}
-        {{ unsubscribe.name }}
-        
-        <div class="field {{ unsubscribe.email.html_name }}">
-            {{ unsubscribe.email.label_tag }}
-            {{ unsubscribe.email}}
-            {{ unsubscribe.email.errors }}
+            </form>
+            {% endif %}
         </div>
-
-    </fieldset>
--->
-    <div class="field">
-        <button type="submit">{% trans "Unsubscribe" %}</button>
     </div>
-
-</form>
-{% endif %}
-
-
-
 {% endblock %}
diff --git a/templates/mailman-django/public/base.html b/templates/mailman-django/public/base.html
index 6202bde..93efe69 100644
--- a/templates/mailman-django/public/base.html
+++ b/templates/mailman-django/public/base.html
@@ -16,7 +16,7 @@
 	
 	<script src="{{MEDIA_URL}}js/public/libs/modernizr-1.7.min.js"></script>
 </head>
-<body>
+<body>HALLO
     <div id="mm_page">
         <h1>{% block heading %}{% endblock %}</h1>
         {% block header%}{% endblock %}