diff --git a/src/mailman_django.egg-info/PKG-INFO b/src/mailman_django.egg-info/PKG-INFO
index b5c5ffc..c3a10b9 100644
--- a/src/mailman_django.egg-info/PKG-INFO
+++ b/src/mailman_django.egg-info/PKG-INFO
@@ -10,6 +10,8 @@
         mailman-django - web ui for GNU Mailman
         =======================================
         
+        Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
+        
         The ``mailman-django`` Django app provides a web user interface to
         access GNU Mailman. 
         
diff --git a/src/mailman_django/context_processors.py b/src/mailman_django/context_processors.py
index 994e2a3..f825a4c 100644
--- a/src/mailman_django/context_processors.py
+++ b/src/mailman_django/context_processors.py
@@ -1,48 +1,25 @@
+import logging
+
+
 from django.conf import settings
 from django.utils.translation import gettext as _
 from mailman.client import Client
 from urllib2 import HTTPError
 
-def lists_of_domain(request):
-    """ This function is a wrapper to render a list of all 
-    available List registered to the current request URL
-    """ 
-    domain_lists = []
-    domain_name = 'unknown domain'
-    message = ""
-    if "HTTP_HOST" in request.META.keys() :#TODO only lists of current domains if possible
-        #get the URL
-        web_host = ('http://%s' % request.META["HTTP_HOST"].split(":")[0])
-        #querry the Domain object
-        try:
-            c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
-        except AttributeError, e:
-            message="REST API not found / Offline"
-        d = c.get_domain(web_host=web_host)
-        #workaround LP:802971 - only lists of the current domain #todo a8
-        if d is not None:
-            domain_name = d.mail_host
-            for list in c.lists:
-                if list.mail_host == domain_name:
-                    domain_lists.append(list)
-        else:
-            domain_lists = c.lists
-        message = _(" - Accessing from an unknown domain - showing all lists")
 
-    #return a Dict with the key used in templates
-    return {"lists": domain_lists,"domain": domain_name, "message": message}
-    
-def render_css_theme(request):
-    """ This function is a wrapper to render the Mailman Theme Variable from Settings
-    """
-    return {"MAILMAN_THEME": settings.MAILMAN_THEME}
+logger = logging.getLogger(__name__)
 
-def extend_ajax(request):
-    """ This function checks if the request was made using AJAX
-    Using Ajax template_extend will base_ajax.html else it will be base.html
+
+def mailmanweb(request):
+    """Add template variables to context.
     """
+    # extend_template (no page header/footer when requested via AJAX)
     if request.is_ajax():
         extend_template = "mailman-django/base_ajax.html"        
     else:        
         extend_template = "mailman-django/base.html"
-    return {"extend_template":extend_template}        
+
+    return {
+        'MAILMAN_THEME': settings.MAILMAN_THEME,
+        'extend_template': extend_template,
+        }
diff --git a/src/mailman_django/forms.py b/src/mailman_django/forms.py
index 1c74727..0034714 100644
--- a/src/mailman_django/forms.py
+++ b/src/mailman_django/forms.py
@@ -126,8 +126,8 @@
         },
         required = True,
         choices = (
-            (True, _("Advertise this list in List Index")),
-            (False, _("Hide this list in Liste Index")),
+            (True, _("Advertise this list in list index")),
+            (False, _("Hide this list in list index")),
         ))
 
     languages = forms.MultipleChoiceField(
diff --git a/src/mailman_django/templates/mailman-django/base.html b/src/mailman_django/templates/mailman-django/base.html
index feff3de..6f650d5 100644
--- a/src/mailman_django/templates/mailman-django/base.html
+++ b/src/mailman_django/templates/mailman-django/base.html
@@ -44,7 +44,6 @@
         {% block smallBoxRight %}{% endblock %}
         <div id="mm_footer">
             {% block footer %}
-            {% include "mailman-django/list_selector.html" %}
             <p><a href="/">Lists</a>
             <a href="/domains/">Domains</a>
             {% if request.user.is_authenticated %}
diff --git a/src/mailman_django/templates/mailman-django/list_selector.html b/src/mailman_django/templates/mailman-django/list_selector.html
deleted file mode 100644
index da987cd..0000000
--- a/src/mailman_django/templates/mailman-django/list_selector.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% load i18n %}
-
-{% block selector %}
-<div id="list_selector">
-{%if lists|length >= 1 and lists|length <= 15 %}
-    <form id=list_selector method="post" action="/lists/">
-        <select name="list">
-            {% for list in lists %}
-                {% if list.settings.advertised %}
-                    <option selected="" value="{{list.fqdn_listname}}">{{list.real_name}}</option>
-                {% endif %}
-            {% endfor %}
-        </select>
-    <input class="button" type="submit" value="Go to">
-    </div></form>
-    </form>
-{% else %}
-    <a href="{% url list_index %}">{% trans "List Index" %}</a>
-{%endif%}
-</div>
-{% endblock %}
diff --git a/src/mailman_django/templates/mailman-django/lists/index.html b/src/mailman_django/templates/mailman-django/lists/index.html
index fc829a5..50e2ec0 100644
--- a/src/mailman_django/templates/mailman-django/lists/index.html
+++ b/src/mailman_django/templates/mailman-django/lists/index.html
@@ -2,14 +2,7 @@
 {% load i18n %}
 
 {% block heading %}
-    All available Lists <span>on {{domain}}</span>
-{% endblock %}
-
-{% block header %}
-    <div class="mm_box mm_clear">
-        <div class="mm_boxHeader">{% trans "About" %}</div>
-        {% trans "This site shows all available lists, either on the registered Domain or the whole server."%}
-    </div>
+    Lists <span>on {{ domain_name }}</span>
 {% endblock %}
 
 {% block actionButtonsList %}
diff --git a/src/mailman_django/urls.py b/src/mailman_django/urls.py
index 5fa8a23..73753da 100644
--- a/src/mailman_django/urls.py
+++ b/src/mailman_django/urls.py
@@ -30,14 +30,13 @@
     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_summary', name = 'list_summary'), #PUBLIC
-    url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/(?:(?P<option>subscribe|unsubscribe)?)(/(?P<user_email>.+))?$', 'list_subscriptions', name = 'list_subscriptions'),#public
-    url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/mass_subscribe/$', 'mass_subscribe', name = 'mass_subscribe'),#admin
+    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'^subscriptions/(?P<fqdn_listname>[^/]+)/mass_subscribe/$', 'mass_subscribe', name = 'mass_subscribe'),
     url(r'^delete_list/(?P<fqdn_listname>[^/]+)/$', 'list_delete', name = 'list_delete'),
     url(r'^user_settings/$', 'user_settings', kwargs={"tab": "user"}, name = 'user_settings'),
-    url(r'^membership_settings/(?:(?P<fqdn_listname>[^/]+)/)?$', 'user_settings', kwargs={"tab": "membership"}, name = 'membership_settings'), #todo improve regexp of above 2 urls
-    #url(r'^settings/(?P<fqdn_listname>[^/]+)/(?P<visible_section>[^/]+)?/(?P<visible_option>.+)?$', 'list_settings', name = 'list_settings'),
+    url(r'^membership_settings/(?:(?P<fqdn_listname>[^/]+)/)?$', 'user_settings', kwargs={"tab": "membership"}, name = 'membership_settings'),
     url(r'^settings/(?P<fqdn_listname>[^/]+)/(?P<visible_section>[^/]+)?(?:/(?P<visible_option>.*))?$', 'list_settings', name = 'list_settings'),    
-    ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)#https://docs.djangoproject.com/en/dev/howto/static-files/#serving-static-files-in-production
+    ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 
diff --git a/src/mailman_django/views.py b/src/mailman_django/views.py
index 34d6a72..5f4f126 100644
--- a/src/mailman_django/views.py
+++ b/src/mailman_django/views.py
@@ -19,6 +19,8 @@
 
 import re
 import sys
+import logging
+
 
 from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required
@@ -33,11 +35,14 @@
 from urllib2 import HTTPError
 
 
+logger = logging.getLogger(__name__)
+
+
 @login_required
 @permission_required('server_admin')
 def domain_index(request, template = 'mailman-django/domain_index.html'):
     try:
-        c = Client('http://localhost:8001/3.0', settings.API_USER,
+        c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER,
                    settings.API_PASS)
         existing_domains = c.domains
     except AttributeError, e:
@@ -54,7 +59,7 @@
     if request.method == 'POST':
         form = DomainNew(request.POST)
         try:
-            c = Client('http://localhost:8001/3.0', settings.API_USER,
+            c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER,
                        settings.API_PASS)
             if form.is_valid():
                 mail_host = form.cleaned_data['mail_host']
@@ -102,7 +107,7 @@
     mailing_list = None
     if request.method == 'POST':
         try:
-            c = Client('http://localhost:8001/3.0', settings.API_USER,
+            c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER,
                        settings.API_PASS)
         except AttributeError, e:
             return render_to_response('mailman-django/errors/generic.html',
@@ -122,37 +127,64 @@
                 mailing_list = domain.create_list(form.cleaned_data['listname'])
                 list_settings = mailing_list.settings
                 list_settings["description"] = form.cleaned_data['description']
-                list_settings["owner_address"] = form.cleaned_data['list_owner'] #TODO: Readonly
+                #TODO: Readonly:
+                list_settings["owner_address"] = form.cleaned_data['list_owner']
+                #settings["???"] = form.cleaned_data['languages'] #TODO not found in REST:
                 list_settings["advertised"] = form.cleaned_data['advertised']
-                #settings["???"] = form.cleaned_data['languages'] #TODO not found in REST
                 list_settings.save()
                 return redirect("list_summary",fqdn_listname=mailing_list.fqdn_listname)
-            except HTTPError, e: #TODO catch correct Error class
+            #TODO catch correct Error class:
+            except HTTPError, e:
                 return render_to_response('mailman-django/errors/generic.html', 
                                       {'error':e},
                                       context_instance=RequestContext(request))
     else:
         try:
-            c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
+            c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
         except AttributeError, e:
             return render_to_response('mailman-django/errors/generic.html', 
-                                      {'error': "REST API not found / Offline"},context_instance=RequestContext(request))
+                                      {'error': "REST API not found / Offline"},
+                                      context_instance=RequestContext(request))
         choosable_domains = [("",_("Choose a Domain"))]
         for domain in c.domains:
             choosable_domains.append((domain.mail_host,domain.mail_host))
         form = ListNew(choosable_domains)
-    return render_to_response(template, {'form': form, error:None}, context_instance=RequestContext(request))
+    return render_to_response(template, {'form': form, error:None},
+                              context_instance=RequestContext(request))
 
 
 def list_index(request, template = 'mailman-django/lists/index.html'):
     """Show a table of all mailing lists.
     """
-    error=None
+    lists = []
+    error = None
+    domain_name = None
+    if "HTTP_HOST" in request.META.keys():
+        scheme = 'http'
+        if "HTTPS" in request.META.keys():
+            scheme = 'https'
+        domain_name = request.META["HTTP_HOST"].split(":")[0]
+        web_host = '%s://%s' % (scheme, domain_name)
+        try:
+            c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
+            d = c.get_domain(web_host=web_host)
+            if d is not None:
+                domain_name = d.mail_host
+                for list in c.lists:
+                    if list.mail_host == domain_name:
+                        lists.append(list)
+            else:
+                lists = c.lists
+        except AttributeError, e:
+            error = _('REST API not available')
     if request.method == 'POST':
         return redirect("list_summary", fqdn_listname=request.POST["list"])
     else:
-        return render_to_response(template, {'error':error},context_instance=RequestContext(request)) #lists by context processor
-
+        return render_to_response(template,
+                                  {'error': error,
+                                   'lists': lists,
+                                   'domain_name': domain_name,},
+                                  context_instance=RequestContext(request))
 
 def list_summary(request,fqdn_listname=None,option=None,template='mailman-django/lists/summary.html'):
     """
@@ -165,7 +197,7 @@
         return redirect("list_summary", fqdn_listname=request.POST["list"])
     else:
         try:
-            c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
+            c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
             the_list = c.get_list(fqdn_listname)
             try:
                 the_list.get_member(request.user.username)
@@ -199,7 +231,7 @@
         fqdn_listname = request.POST.get('fqdn_listname', '')
     # connect REST and catch issues getting the list
     try:
-        c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
+        c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
         the_list = c.get_list(fqdn_listname)
     except AttributeError, e:
         return render_to_response('mailman-django/errors/generic.html', 
@@ -272,7 +304,7 @@
     """
     # create a connection to Mailman and get the list
     try:
-        c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
+        c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
         the_list = c.get_list(fqdn_listname)
         if request.method == 'POST':
             the_list.delete()
@@ -311,23 +343,24 @@
     
     #Create the Connection
     try:
-        c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
+        c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
         the_list = c.get_list(fqdn_listname)
     except AttributeError, e:
         return render_to_response('mailman-django/errors/generic.html', 
-                                  {'error': "REST API not found / Offline"},context_instance=RequestContext(request))
+                                  {'error': "REST API not found / Offline"},
+                                  context_instance=RequestContext(request))
     except HTTPError,e :
         return render_to_response('mailman-django/errors/generic.html', 
-                                  {'error': _("List ")+fqdn_listname+_(" does not exist")},context_instance=RequestContext(request))
+                                  {'error': _("List ") + fqdn_listname+_(" does not exist")},context_instance=RequestContext(request))
     #Save a Form Processed by POST  
     if request.method == 'POST':
         form = ListSettings(visible_section,visible_option,data=request.POST)
         form.truncate()
         if form.is_valid():
-            settings = the_list.settings
+            list_settings = the_list.settings
             for key in form.fields.keys():
-                settings[key] = form.cleaned_data[key]
-                settings.save()    
+                list_settings[key] = form.cleaned_data[key]
+                list_settings.save()    
             message = _("The list has been updated.")
         else:
             message = _("Validation Error - The list has not been updated.")
@@ -347,7 +380,6 @@
         #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
@@ -372,7 +404,7 @@
     """
     message = ""
     try:
-        c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
+        c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
         the_list = c.get_list(fqdn_listname)
     except AttributeError, e:
         return render_to_response('mailman-django/errors/generic.html', 
@@ -432,7 +464,7 @@
     membership_lists = []
 
     try:
-        c = Client('http://localhost:8001/3.0', settings.API_USER, settings.API_PASS)
+        c = Client('%s/3.0' % settings.REST_SERVER, settings.API_USER, settings.API_PASS)
         if tab == "membership":
             if fqdn_listname:
                 the_list = c.get_list(fqdn_listname)