diff --git a/src/mailmanweb/forms.py b/src/mailmanweb/forms.py
index 0a4a025..e2f1ea8 100644
--- a/src/mailmanweb/forms.py
+++ b/src/mailmanweb/forms.py
@@ -175,72 +175,21 @@
 class ListSubscribe(FieldsetForm):
     """Form fields to join an existing list.
     """
-    fqdn_listname = forms.EmailField(
-        label = '',#_('List Name'), 
-        widget = forms.HiddenInput(),
-        error_messages = {
-            'required': _('Please enter the mailing list address.'), 
-            'invalid': _('Please enter a valid email address.')
-        })
-    email = forms.EmailField(
-        label = _('Your email address'), 
+    fqdn_listname = forms.EmailField(widget = forms.HiddenInput())
+    email = forms.EmailField(label = _('Your email address'), 
         error_messages = {'required': _('Please enter an email address.'), 
                           'invalid': _('Please enter a valid email address.')})
-    real_name = forms.CharField(
-        label = _('Your name'), 
-        required = False,
-    )
-    name = forms.CharField(
-        label = '', #Name of action
-        widget = forms.HiddenInput(),
-        initial = 'subscribe',
-    )
+    real_name = forms.CharField(label=_('Your name'), required=False)
     
-    # should add password! TODO
-    class Meta:
-        """
-        Class to handle the automatic insertion of fieldsets and divs.
-        
-        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.
-        """
-        layout = [["Subscribe", "email","real_name","name","fqdn_listname"]]    
-
 class ListUnsubscribe(FieldsetForm):
     """Form fields to leave an existing list.
     """
-    fqdn_listname = forms.EmailField(
-        label = '',#_('List Name'), 
-        widget = forms.HiddenInput(),
-        error_messages = {
-            'required': _('Please enter the mailing list address.'), 
-            'invalid': _('Please enter a valid email address.')
-        }
-    )
-    email = forms.EmailField(
-        label = _('Your email address'), 
+    fqdn_listname = forms.EmailField(widget=forms.HiddenInput())
+    email = forms.EmailField(label = _('Your email address'), 
         error_messages = {
             'required': _('Please enter an email address.'), 
-            'invalid': _('Please enter a valid email address.')
-        }
-    )
-    name = forms.CharField(
-        label = '', #Name of action
-        widget = forms.HiddenInput(),
-        initial = 'unsubscribe',
-    )
-    class Meta:
-        """
-        Class to handle the automatic insertion of fieldsets and divs.
-        
-        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.
-        """
-        layout = [["Unsubscribe", "email","name","fqdn_listname"]]        
+            'invalid': _('Please enter a valid email address.')})
 
-    # should at one point add the password to be required as well! #TODO
 class ListSettings(FieldsetForm):
     """Form fields dealing with the list settings.
     """
@@ -1015,3 +964,6 @@
         """
         layout = [["User settings", "real_name", "password", 
                    "conf_password", "preferred_language", "address"],]
+
+class ListDeleteForm(forms.Form):
+    list_name = forms.EmailField(widget=forms.HiddenInput())
diff --git a/src/mailmanweb/templates/mailmanweb/lists/index.html b/src/mailmanweb/templates/mailmanweb/lists/index.html
index cc7820d..85f596d 100644
--- a/src/mailmanweb/templates/mailmanweb/lists/index.html
+++ b/src/mailmanweb/templates/mailmanweb/lists/index.html
@@ -1,7 +1,6 @@
 {% extends "mailmanweb/base.html" %}
 {% load i18n %}
 
-
 {% block main %}
     {% if user.is_superuser %}
         <ul class="mm_nav">
diff --git a/src/mailmanweb/urls.py b/src/mailmanweb/urls.py
index 406926e..685bc51 100644
--- a/src/mailmanweb/urls.py
+++ b/src/mailmanweb/urls.py
@@ -33,8 +33,8 @@
     url(r'^lists/new/$', 'list_new', name='list_new'),
     url(r'^lists/(?P<fqdn_listname>[^/]+)/$', 'list_summary',
         name='list_summary'),
-    url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/(?:(?P<option>subscribe|unsubscribe)?)(/(?P<user_email>.+))?$',
-        'list_subscriptions', name='list_subscriptions'),
+    url(r'^lists/(?P<fqdn_listname>[^/]+)/subscribe$',
+        'list_subscribe', name='list_subscribe'),
     url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/mass_subscribe/$',
         'mass_subscribe', name='mass_subscribe'),
     url(r'^delete_list/(?P<fqdn_listname>[^/]+)/$', 'list_delete',
diff --git a/src/mailmanweb/utils.py b/src/mailmanweb/utils.py
index 336985b..3729bf6 100644
--- a/src/mailmanweb/utils.py
+++ b/src/mailmanweb/utils.py
@@ -16,9 +16,21 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
+from django.shortcuts import render_to_response, redirect
+
+
 def get_domain_name(request):
     """Extracts a domain name from the request object.
     """ 
     if "HTTP_HOST" in request.META.keys():
         return request.META["HTTP_HOST"].split(":")[0]
     return None
+
+def render_api_error(request):
+    """Renders an error template.
+    Use if MailmanApiError is catched.
+    """
+    return render_to_response('mailmanweb/errors/generic.html', 
+          {'error': "REST API not found / Offline"},
+          context_instance=RequestContext(request))
+
diff --git a/src/mailmanweb/views.py b/src/mailmanweb/views.py
index c5b1665..20ae289 100644
--- a/src/mailmanweb/views.py
+++ b/src/mailmanweb/views.py
@@ -41,11 +41,6 @@
 logger = logging.getLogger(__name__)
 
 
-def render_api_error(request):
-    return render_to_response('mailmanweb/errors/generic.html', 
-          {'error': "REST API not found / Offline"},
-          context_instance=RequestContext(request))
-
 @login_required
 @permission_required('server_admin')
 def domain_index(request, template = 'mailmanweb/domain_index.html'):
@@ -53,7 +48,7 @@
         existing_domains = Domain.objects.all()
         logger.debug(Domain.objects)
     except MailmanApiError:
-        return render_api_error(request)
+        return utils.render_api_error(request)
     return render_to_response(template, {'domains':existing_domains,},
 					          context_instance=RequestContext(request))
 
@@ -70,7 +65,7 @@
             try:
                 domain.save()
             except MailmanApiError:
-                return render_api_error(request)
+                return utils.render_api_error(request)
             except HTTPError, e:
                 message=e
             return redirect("domain_index")
@@ -107,7 +102,7 @@
         try:
             domains = Domain.objects.all()
         except MailmanApiError:
-            return render_api_error(request)
+            return utils.render_api_error(request)
         choosable_domains = [("",_("Choose a Domain"))]
         for domain in domains:
             choosable_domains.append((domain.mail_host,
@@ -136,7 +131,7 @@
         try:
             domains = Domain.objects.all()
         except MailmanApiError:
-            return render_api_error(request)
+            return utils.render_api_error(request)
         choosable_domains = [("",_("Choose a Domain"))]
         for domain in domains:
             choosable_domains.append((domain.mail_host,domain.mail_host))
@@ -156,7 +151,7 @@
     try:
         lists = List.objects.all(only_public=only_public)
     except MailmanApiError:
-        return render_api_error(request)
+        return utils.render_api_error(request)
     if request.method == 'POST':
         return redirect("list_summary", fqdn_listname=request.POST["list"])
     else:
@@ -165,32 +160,35 @@
                                    'lists': lists,},
                                   context_instance=RequestContext(request))
 
-def list_summary(request,fqdn_listname=None,option=None,template='mailmanweb/lists/summary.html'):
+def list_summary(request, fqdn_listname, option=None ,template='mailmanweb/lists/summary.html'):
     """
     PUBLIC
     an entry page for each lists which allows some simple tasks per LIST
     """
-    error=None
-    user_is_subscribed = False
-    if request.method == 'POST':
-        return redirect("list_summary", fqdn_listname=request.POST["list"])
-    else:
-        try:
-            the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname)
-            try:
-                the_list.get_member(request.user.username)
-                user_is_subscribed = True
-            except:
-                pass #init
-        except MailmanApiError:
-            return render_api_error(request)
+    try:
+        the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname)
+    except MailmanApiError:
+        return utils.render_api_error(request)
     return render_to_response(template, 
-                              {'list':the_list,
-                               'message':  None,
-                               'user_is_subscribed':user_is_subscribed,
-                              },
-                              context_instance=RequestContext(request)
-                              )
+                              {'list': the_list,
+                               'subscribe_form': ListSubscribe(),
+                               'unsubscribe_form': ListUnsubscribe()},
+                              context_instance=RequestContext(request))
+
+def list_subscribe(request, fqdn_listname):
+    """Subscribe to a list.
+    """
+    try:
+        the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname)
+    except MailmanApiError:
+        return utils.render_api_error(request)
+    if request.method == 'POST':
+        form = ListSubscribe(request.POST)
+    else:
+        form = ListSubscribe()
+    return render_to_response('mailmanweb/lists/subscribe.html', 
+                              {'form': form, 'list': the_list,},
+                              context_instance=RequestContext(request))
 
 def list_subscriptions(request, option=None, fqdn_listname=None, user_email = None,
                        template = 'mailmanweb/lists/subscriptions.html', *args, **kwargs):#TODO **only kwargs ?
@@ -272,16 +270,13 @@
                                          ,context_instance=RequestContext(request))
 
 @login_required
-def list_delete(request, fqdn_listname = None, 
-                template = 'mailmanweb/lists/index.html'):
+def list_delete(request, fqdn_listname):
+    """Deletes a list but asks for confirmation first.
     """
-    Delete a list by providing the full list name including domain.
-    """
-    # create a connection to Mailman and get the list
     try:
         the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname)
     except MailmanApiError:
-        return render_api_error(request)
+        return utils.render_api_error(request)
     if request.method == 'POST':
         the_list.delete()
         # let the user return to the list index page
@@ -316,7 +311,7 @@
     try:
         the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname)
     except MailmanApiError:
-        return render_api_error(request)
+        return utils.render_api_error(request)
     #Save a Form Processed by POST  
     if request.method == 'POST':
         form = ListSettings(visible_section,visible_option,data=request.POST)
@@ -371,7 +366,7 @@
     try:
         the_list = List.objects.get_or_404(fqdn_listname=fqdn_listname)
     except MailmanApiError:
-        return render_api_error(request)
+        return utils.render_api_error(request)
     if request.method == 'POST':
         form = ListMassSubscription(request.POST)
         if form.is_valid():