diff --git a/context_processors.py b/context_processors.py
index 1ee234c..c8f63ac 100644
--- a/context_processors.py
+++ b/context_processors.py
@@ -1,5 +1,5 @@
 from mailman.client import Client
-from settings import API_USER, API_PASS, MAILMAN_THEME
+from mailmanweb.settings import API_USER, API_PASS, MAILMAN_THEME
 from django.utils.translation import gettext as _
 from urllib2 import HTTPError
 
@@ -12,23 +12,23 @@
     message = ""
     if "HTTP_HOST" in request.META.keys() :#TODO only lists of current domains if possible
         #get the URL
-        web_host = request.META["HTTP_HOST"].split(":")[0]
+        web_host = ('http://%s' % request.META["HTTP_HOST"].split(":")[0])
         domainname = "unregistered Domain"
         #querry the Domain object
         try:
             c = Client('http://localhost:8001/3.0', API_USER, API_PASS)
-            try:            
-                d = c.get_domain(None,web_host)
-                #workaround LP:802971 - only lists of the current domain #todo a8
-                domainname= d.email_host
-                for list in c.lists:
-                    if list.host_name == domainname:
-                        domain_lists.append(list)
-            except HTTPError, e:
-                domain_lists = c.lists
-                message = str(e.code) + _(" - Accesing from an unregistered Domain - showing all lists")
         except AttributeError, e:
             message="REST API not found / Offline"
+        try:            
+    	    d = c.get_domain(web_host=web_host)
+    	    #workaround LP:802971 - only lists of the current domain #todo a8
+	    domainname= d.mail_host
+	    for list in c.lists:
+	        if list.mail_host == domainname:
+		    domain_lists.append(list)
+        except HTTPError, e:
+	    domain_lists = c.lists
+	    message = str(e.code) + _(" - Accesing from an unregistered Domain - showing all lists")
 
     #return a Dict with the key used in templates
     return {"lists":domain_lists,"domain":domainname, "message":message}
diff --git a/forms.py b/forms.py
index 006b707..1c74727 100644
--- a/forms.py
+++ b/forms.py
@@ -749,7 +749,7 @@
     )
     #Descriptions used in the Settings Overview Page
     section_descriptions = {
-        "List Indentity":_("General List settings use"),
+        "List Identity":_("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"),
@@ -802,7 +802,7 @@
         """        
         # just a really temporary layout to see that it works. -- Anna
         layout = [
-            ["List Indentity", "real_name", "include_list_post_header", 
+            ["List Identity", "real_name", "include_list_post_header", 
              "include_rfc2369_headers"], 
              #"info", "list_name", "host_name", "list_id", "fqdn_listname", 
              #"http_etag", "volume", "web_host"
diff --git a/media/mailman_django/default/css/forms.css b/media/mailman_django/default/css/forms.css
index bfc5fe9..a673edf 100644
--- a/media/mailman_django/default/css/forms.css
+++ b/media/mailman_django/default/css/forms.css
@@ -21,6 +21,11 @@
     float:none;
     }
 
+input[type="submit"], 
+input.button { 
+    width: auto;
+    margin-right: 10px;
+}
 .errorlist {
 	float: right;
 	width: 300px;
diff --git a/media/mailman_django/default/css/style.css b/media/mailman_django/default/css/style.css
index c3c0118..418bebf 100755
--- a/media/mailman_django/default/css/style.css
+++ b/media/mailman_django/default/css/style.css
@@ -120,7 +120,7 @@
 }
 .mm_actionButtons a,
 .mm_actionButtons a:hover {
-    padding-left: 40px;
+    padding-left: 10px;
     text-decoration: none;
     font-weight: bold;
     color: #444;
@@ -150,6 +150,7 @@
     padding: 5px 10px;
     margin-left: -10px;
     margin-right: -10px;
+    margin-bottom: 10px;
     border-bottom: 1px solid #E4E5E2;
 }
 
diff --git a/templates/mailman-django/base.html b/templates/mailman-django/base.html
index a79e83d..b788a6c 100644
--- a/templates/mailman-django/base.html
+++ b/templates/mailman-django/base.html
@@ -13,8 +13,7 @@
 	<link rel="apple-touch-icon" href="{{MEDIA_URL}}images/apple-touch-icon.png">
 	
 	<link rel="stylesheet" href="{{MEDIA_URL}}{{MAILMAN_THEME}}/css/style.css?v=2">
-    <link rel="stylesheet" href="{{MEDIA_URL}}{{MAILMAN_THEME}}/css/forms.css">
-    <link rel="stylesheet" href="{{MEDIA_URL}}{{MAILMAN_THEME}}/css/icons.css">
+        <link rel="stylesheet" href="{{MEDIA_URL}}{{MAILMAN_THEME}}/css/forms.css">
 	<script src="{{MEDIA_URL}}{{MAILMAN_THEME}}/js/libs/modernizr-1.7.min.js"></script>
 </head>
 <body>
@@ -46,11 +45,14 @@
         <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 %}
-                <p id="login"><a href="{% url user_login %}">{% trans "Login" %}</a> {{request.user.username}}</p>
+                <a href="{% url user_login %}">{% trans "Login" %}</a> {{request.user.username}}
             {% else %}
-                <p id="logout"><a href="{% url user_logout %}">{% trans "Logout" %}</a> {{request.user.username}}</p>
+                <a href="{% url user_logout %}">{% trans "Logout" %}</a> {{request.user.username}}
             {% endif %}
+            </p>
             {% endblock %}
         </div>
     </div>
diff --git a/templates/mailman-django/domain_index.html b/templates/mailman-django/domain_index.html
index 15e1a61..87b9080 100644
--- a/templates/mailman-django/domain_index.html
+++ b/templates/mailman-django/domain_index.html
@@ -8,7 +8,7 @@
 {% block header %}
     <div class="mm_box mm_clear">
         <div class="mm_boxHeader">{% trans "About" %}</div>
-            This site allows to register a new Domain, due to restriction in the REST API we can't delete them here yet. Please modify the Mailman DB directly if you need to remove a Domain. If interested take a look at the <a href="https://bugs.launchpad.net/mailmanwebgsoc2011/+bug/799689"> Launchapd Bug Report.</a> In addition we can't modify them yet.
+            Register new Domains.
         </p>
     </div>
 {% endblock %}
diff --git a/templates/mailman-django/list_selector.html b/templates/mailman-django/list_selector.html
index d58df96..da987cd 100644
--- a/templates/mailman-django/list_selector.html
+++ b/templates/mailman-django/list_selector.html
@@ -11,7 +11,7 @@
                 {% endif %}
             {% endfor %}
         </select>
-    <input type="submit" value="Go to">
+    <input class="button" type="submit" value="Go to">
     </div></form>
     </form>
 {% else %}
diff --git a/templates/mailman-django/lists/index.html b/templates/mailman-django/lists/index.html
index 214adc1..fc829a5 100644
--- a/templates/mailman-django/lists/index.html
+++ b/templates/mailman-django/lists/index.html
@@ -8,7 +8,7 @@
 {% 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. Please bare in mind that we can only show public advertised lists. - Because of missing ACL functionality we show non-advertised list as well, but ammending a litle comment (non-public) <br>Please be aware that this will change in future releases "%}
+        {% trans "This site shows all available lists, either on the registered Domain or the whole server."%}
     </div>
 {% endblock %}
 
@@ -28,10 +28,10 @@
                 {% if not list.settings.advertised %}(non-public){% endif %}
             </a>
         </div>
-            <ul>
-                <li><a href="{% url list_subscriptions fqdn_listname=list.fqdn_listname %}">{%trans "Subscriptions" %}</a></li>
-                <li><a href="{% url list_settings list.fqdn_listname %}">{%trans "Settings" %}</a></li>
-                <li><a href="{% url list_delete list.fqdn_listname %}">{%trans "Delete list" %}</a></li>
+        <ul>
+            <li><a href="{% url list_subscriptions fqdn_listname=list.fqdn_listname %}">{%trans "Subscriptions" %}</a></li>
+            <li><a href="{% url list_settings list.fqdn_listname %}">{%trans "Settings" %}</a></li>
+            <li><a href="{% url list_delete list.fqdn_listname %}">{%trans "Delete list" %}</a></li>
         </ul>
     </div>
     {% endfor %}
diff --git a/templates/mailman-django/lists/settings.html b/templates/mailman-django/lists/settings.html
index 9c7e874..e642e32 100644
--- a/templates/mailman-django/lists/settings.html
+++ b/templates/mailman-django/lists/settings.html
@@ -8,17 +8,16 @@
 {% block header %}
 {% if visible_section %}
     <div class="mm_box mm_clear">
-        <div class="mm_boxHeader">{% trans "List Settings " %}{{ fqdn_listname }}<br>
-        </div>
+        <div class="mm_boxHeader">{% trans "List Settings " %}{{ fqdn_listname }}</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">
-        {{ form.as_div }}
-            <div class="field">
-                <button type="submit">{%trans "Save changes" %}</button>
-            </div>
-        </form>
     </div>
+    <form action="{% url list_settings fqdn_listname=list.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>
 {% endif %}
 {% endblock %}
 
diff --git a/templates/mailman-django/lists/summary.html b/templates/mailman-django/lists/summary.html
index a43b80f..e63ef3a 100644
--- a/templates/mailman-django/lists/summary.html
+++ b/templates/mailman-django/lists/summary.html
@@ -15,7 +15,7 @@
 {% block actionButtonsList %}
     <ul class="mm_actionButtons">
         <li class="mm_subscribe"><a href="{% url list_subscriptions fqdn_listname=list.fqdn_listname option='subscribe' %}">{% trans "Subscribe" %}</a></li>
-        <li class="mm_archives"><a href="#archives">{% trans "View Archives" %}TODO</a></li>
+        <li class="mm_archives"><a href="#archives">{% trans "View Archives" %}</a></li>
         <li class="mm_options"><a href="{% url list_settings fqdn_listname=list.fqdn_listname %}">{% trans "Edit Options" %}</a></li>
         <li class="mm_unsubscribe"><a href="{% url list_subscriptions fqdn_listname=list.fqdn_listname option='unsubscribe' %}">{% trans "Unsubscribe" %}</a></li>
         {% if user_is_subscribed %}
@@ -31,6 +31,6 @@
     </div>
     <div class="mm_box mm_smallBox">
         <div class="mm_boxHeader">{% trans "Other Lists" %}</div>
-        <a href="{% url list_index %}">{% trans "View overview of all URL TODO mailing lists" %}</a>
+        <a href="{% url list_index %}">{% trans "View overview of all mailing lists" %}</a>
     </div>
 {% endblock %}
diff --git a/views.py b/views.py
index 0172bd4..34774e8 100644
--- a/views.py
+++ b/views.py
@@ -26,7 +26,7 @@
 import re
 from mailman.client import Client
 from forms import *
-from settings import API_USER, API_PASS
+from mailmanweb.settings import API_USER, API_PASS
 import sys #Error handing info
 from urllib2 import HTTPError
 
@@ -101,7 +101,7 @@
                                       {'error': "REST API not found / Offline"},context_instance=RequestContext(request))
         choosable_domains = [("",_("Choose a Domain"))]
         for domain in c.domains:
-            choosable_domains.append((domain.email_host,domain.email_host))
+            choosable_domains.append((domain.mail_host,domain.mail_host))
         form = ListNew(choosable_domains,request.POST)
 
         if form.is_valid():
@@ -129,7 +129,7 @@
                                       {'error': "REST API not found / Offline"},context_instance=RequestContext(request))
         choosable_domains = [("",_("Choose a Domain"))]
         for domain in c.domains:
-            choosable_domains.append((domain.email_host,domain.email_host))
+            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))
 
@@ -165,12 +165,12 @@
             return render_to_response('mailman-django/errors/generic.html', 
                                       {'error': "REST API not found / Offline"},context_instance=RequestContext(request))
     return render_to_response(template, 
-                                  {'list':the_list,
-                                   'message':  None,
-                                   'user_is_subscribed':user_is_subscribed,
-                                  },
-                                  context_instance=RequestContext(request)
-                                  )
+                              {'list':the_list,
+                               'message':  None,
+                               'user_is_subscribed':user_is_subscribed,
+                              },
+                              context_instance=RequestContext(request)
+                              )
 
 def list_subscriptions(request, option=None, fqdn_listname=None, user_email = None,
                        template = 'mailman-django/lists/subscriptions.html', *args, **kwargs):#TODO **only kwargs ?
@@ -297,6 +297,7 @@
     <param> is optional / is used to differ in between section and option might result in using //option
     """
     message = ""
+    form_sections = []
     
     #Create the Connection
     try:
@@ -324,7 +325,6 @@
     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]]))