diff --git a/src/mailmanweb/templates/mailmanweb/lists/settings.html b/src/mailmanweb/templates/mailmanweb/lists/settings.html
index 7da865a..76b0281 100644
--- a/src/mailmanweb/templates/mailmanweb/lists/settings.html
+++ b/src/mailmanweb/templates/mailmanweb/lists/settings.html
@@ -5,7 +5,6 @@
     {% include 'mailmanweb/menu/list_nav.html' %}
     <h1>{{list.real_name}} <span>- {{list.fqdn_listname}}</span></h1>
 
-    <p style="border: 2px solid darkred">{{list.settings}}</p>
     <ul class="nav nav-pills">
         {% for section in form_sections %}
         <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=section.0 visible_option=None %}">{{section.0}}</a></li>
@@ -13,7 +12,6 @@
     </ul>
 
     {% if visible_section %}
-        <p>{% trans "This page visualizes all list settings. This gives an idea of what the settings page could look like." %}</p>
         <form class="well" action="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings">
             {{ form.as_p }}
 	        <button class="btn btn-large btn-primary" type="submit">{%trans "Save changes" %}</button>
diff --git a/src/mailmanweb/templates/mailmanweb/lists/subscribe.html b/src/mailmanweb/templates/mailmanweb/lists/subscribe.html
new file mode 100644
index 0000000..b5d77b2
--- /dev/null
+++ b/src/mailmanweb/templates/mailmanweb/lists/subscribe.html
@@ -0,0 +1,7 @@
+{% extends extend_template %}
+{% load i18n %}
+
+{% block main %}
+    <h1>{% trans 'Delete List' %} <span>{{ list.fqdn_listname}}</span></h1>
+    <p>{% trans 'Are you sure you want to delete' %} {{ list.fqdn_listname }}?</p>
+{% endblock main %}
diff --git a/src/mailmanweb/templates/mailmanweb/lists/subscriptions.html b/src/mailmanweb/templates/mailmanweb/lists/subscriptions.html
index 2735dd0..8ffd46a 100644
--- a/src/mailmanweb/templates/mailmanweb/lists/subscriptions.html
+++ b/src/mailmanweb/templates/mailmanweb/lists/subscriptions.html
@@ -4,7 +4,7 @@
 {% block main %}
     {{list.list_name}} <span>{{list.real_name}}</span>
     {% if form_subscribe %}
-    <form action="{%url list_subscriptions fqdn_listname=list.fqdn_listname option='subscribe' %}" method="post" class="subscribe mm_clear" name="subscribe">
+    <form action="{%url list_subscriptions list.fqdn_listname %}" method="post" class="subscribe mm_clear" name="subscribe">
         {{ form_subscribe.as_div }}
         <div class="field">
             <button type="submit">{% trans "Subscribe" %}</button>
@@ -13,7 +13,7 @@
     </form>
     {% endif %}
     {% if form_unsubscribe %}
-    <form action="{% url list_subscriptions fqdn_listname=list.fqdn_listname  option='unsubscribe' %}" method="post" class="unsubscribe mm_clear" name="unsubscribe">
+    <form action="{% url list_subscriptions list.fqdn_listname %}" method="post" class="unsubscribe mm_clear" name="unsubscribe">
         {{ form_unsubscribe.as_div }}
         <div class="field">
             <button type="submit">{% trans "Unsubscribe" %}</button>
diff --git a/src/mailmanweb/templates/mailmanweb/lists/summary.html b/src/mailmanweb/templates/mailmanweb/lists/summary.html
index 2fdf8ba..d06ec71 100644
--- a/src/mailmanweb/templates/mailmanweb/lists/summary.html
+++ b/src/mailmanweb/templates/mailmanweb/lists/summary.html
@@ -12,12 +12,12 @@
     <h2>{% trans "Subscribe / Join this list" %}</h2>
     <form action="{% url list_subscriptions list.fqdn_listname %}" method="post" class="list_subscribe
 mm_clear">
-		{{form.as_p}}
+		{{subscribe_form.as_p}}
 	</form>
 
     <h2>{% trans "Unsubscribe / Leave this list" %}</h2>
-    <form action"url_unsubscribe" method="post" class="list_unsubscribe
-mm_clear">
+    <form action"url_unsubscribe" method="post">
+		{{unsubscribe_form.as_p}}
     </form>
   
     <h2>{% trans "Edit list options" %}</h2>
diff --git a/src/mailmanweb/templates/mailmanweb/menu/list_nav.html b/src/mailmanweb/templates/mailmanweb/menu/list_nav.html
index 71774c3..dc8608b 100644
--- a/src/mailmanweb/templates/mailmanweb/menu/list_nav.html
+++ b/src/mailmanweb/templates/mailmanweb/menu/list_nav.html
@@ -1,8 +1,7 @@
 {% load i18n %}
 <ul class="mm_nav">
     <li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li>
-    <li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "List Metrics" %}</a></li>
-    <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li>
+    <li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
     <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li>
     <li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
     <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
diff --git a/src/mailmanweb/templates/mailmanweb/menu/subscriptions.html b/src/mailmanweb/templates/mailmanweb/menu/subscriptions.html
index ba9a90d..08e00b7 100644
--- a/src/mailmanweb/templates/mailmanweb/menu/subscriptions.html
+++ b/src/mailmanweb/templates/mailmanweb/menu/subscriptions.html
@@ -2,7 +2,7 @@
 
 {% block menu_subscriptions %}
     {% if fqdn_listname %}
-    <a href="{% url list_subscriptions fqdn_listname=fqdn_listname option=None %}">{% trans "Subscriptions" %}</a>
+    <a href="{% url list_subscriptions fqdn_listname  %}">{% trans "Subscriptions" %}</a>
     <div><ul class="menu">
          <li{% if selected == "description" %}id="selected"{% endif %}>
             <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
@@ -10,7 +10,7 @@
             </a>
          </li>
          <li{% if selected == "subscribe" %}id="selected"{% endif %}>
-            <a href="{% url list_subscriptions fqdn_listname=fqdn_listname option='subscribe' %}">
+            <a href="{% url list_subscriptions fqdn_listname  %}">
                 {% trans "Subscribe" %}
             </a>
             <div><ul class="menu">
@@ -32,7 +32,7 @@
             </ul></div>
         </li>  
         <li{% if selected == "remove" %}id="selected"{% endif %}>
-            <a href="{% url list_subscriptions fqdn_listname=fqdn_listname option='unsubscribe' %}">
+            <a href="{% url list_subscriptions fqdn_listname %}">
                 {% trans "Unsubscribe" %}
             </a>
             <div><ul class="menu">
diff --git a/src/mailmanweb/urls.py b/src/mailmanweb/urls.py
index 657ff39..e33fc06 100644
--- a/src/mailmanweb/urls.py
+++ b/src/mailmanweb/urls.py
@@ -31,12 +31,14 @@
     url(r'^domains/new/$', 'domain_new', name='domain_new'),
     url(r'^lists/$', 'list_index', name='list_index'),
     url(r'^lists/new/$', 'list_new', name='list_new'),
-    url(r'^lists/(?P<fqdn_listname>[^/]+)/$', 'list_metrics',
+    url(r'^lists/(?P<fqdn_listname>[^/]+)/metrics$', 'list_metrics',
         name='list_metrics'),
     url(r'^lists/(?P<fqdn_listname>[^/]+)/$', 'list_summary',
         name='list_summary'),
     url(r'^lists/(?P<fqdn_listname>[^/]+)/subscribe$',
         'list_subscribe', name='list_subscribe'),
+    url(r'^lists/(?P<fqdn_listname>[^/]+)/subscriptions$',
+        'list_subscriptions', name='list_subscriptions'),
     url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/mass_subscribe/$',
         'mass_subscribe', name='mass_subscribe'),
     url(r'^delete_list/(?P<fqdn_listname>[^/]+)/$', 'list_delete',