diff --git a/src/postorius/models.py b/src/postorius/models.py
index 5a0144a..25e18af 100644
--- a/src/postorius/models.py
+++ b/src/postorius/models.py
@@ -25,7 +25,6 @@
 from django.dispatch import receiver
 from django.http import Http404
 from mailmanclient import Client, MailmanConnectionError
-from social_auth.signals import socialauth_registered
 from urllib2 import HTTPError
 
 
@@ -176,9 +175,3 @@
     """Member model class.
     """
     objects = MailmanRestManager('member', 'members')
-
-
-@receiver(socialauth_registered, sender=None)
-def social_auth_update_handler(sender, **kwargs):
-    print 'user was registered by social auth'
-
diff --git a/src/postorius/static/postorius/css/style.css b/src/postorius/static/postorius/css/style.css
index c02d90c..dfc317e 100755
--- a/src/postorius/static/postorius/css/style.css
+++ b/src/postorius/static/postorius/css/style.css
@@ -1,3 +1,7 @@
+html {
+    overflow-y: scroll;
+}
+
 body {
     color: #444;
     font-size: 13px;
@@ -56,18 +60,30 @@
     background: -o-linear-gradient(top, #fff 0%,#efefef 100%);
     background: -ms-linear-gradient(top, #fff 0%,#efefef 100%);
     background: linear-gradient(to bottom, #fff 0%,#efefef 100%);
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    box-shadow: 0 2px 5px #d8d8d8;
+}
+.mm_header .mm_logo {
+    float: left;
 }
 .mm_metaNav {
-    float: right;
+    float: left;
     list-style: none;
-    margin: 0;
+    margin: 0 0 0 20px;
     padding: 5px 0 0 0;
 }
 .mm_loginName {
-    position: absolute;
-    right: 0;
-    bottom: 0;
+    float: right;
+    padding-top: 5px;
 }
+.mm_logout {
+    margin-left: 10px;
+}
+
 .mm_metaNav li {
     float: left;
     margin-left: 20px;
@@ -78,26 +94,6 @@
     padding: 5px 0 5px 5px;
     text-shadow: #fff 0px 1px 1px;
 }
-.mm_metaNav .mm_tasks,
-.mm_metaNav .mm_settings,
-.mm_metaNav .mm_logout,
-.mm_metaNav .mm_lists,
-.mm_metaNav .mm_users {
-    background-color: transparent;
-    background-image: url(../img/icons.png);
-    background-repeat: no-repeat;
-    padding-left: 20px;
-}
-.mm_tasks { background-position: 0px 5px; }
-.mm_settings { background-position: 0px -30px; }
-.mm_users { background-position: 0px -65px; }
-.mm_logout { background-position: 0px -240px; }
-.mm_lists { background-position: 0px -311px; }
-.mm_tasks:hover { background-position: 0px -100px; }
-.mm_settings:hover { background-position: 0px -135px; }
-.mm_users:hover { background-position: 0px -170px; }
-.mm_logout:hover { background-position: 0px -205px; }
-.mm_lists:hover { background-position: 0px -276px; }
 
 .mm_main {
     background-color: #fff;
@@ -107,7 +103,7 @@
     border-radius: 5px;
     border-top-left-radius: 0px;
     border-top-right-radius: 0px;
-    padding: 20px 40px;
+    padding: 60px 40px 20px 40px;
 }
 
 .mm_subHeader {
diff --git a/src/postorius/static/postorius/img/mailman_logo_small_trans.png b/src/postorius/static/postorius/img/mailman_logo_small_trans.png
new file mode 100644
index 0000000..66ab32c
--- /dev/null
+++ b/src/postorius/static/postorius/img/mailman_logo_small_trans.png
Binary files differ
diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html
index c55289c..5548534 100644
--- a/src/postorius/templates/postorius/base.html
+++ b/src/postorius/templates/postorius/base.html
@@ -20,21 +20,24 @@
     <header>
         <div class="mm_header">
             <div class="mm_canvas">
+                <a href="{% url 'list_index' %}" class="mm_logo"><img src="{% static 'postorius/img/mailman_logo_small_trans.png' %}" alt="{% trans 'Home' %}" /></a>
                 <ul class="mm_metaNav">
-                    <li><a class="mm_lists" href="{% url 'list_index' %}">Lists</a></li>
+                    <li><i class="icon-envelope"></i> <a href="{% url 'list_index' %}">Lists</a></li>
                     {% if user.is_authenticated %}
-                        <li><a class="mm_tasks" href="{% url 'user_tasks' %}">{% trans "To Do" %}</a></li>
+                        <li><i class="icon-tasks"></i><a href="{% url 'user_tasks' %}">{% trans "To Do" %}</a></li>
                     {% endif %}
                     {% if user.is_superuser %}
-                        <li><a class="mm_users" href="{% url 'user_index' %}">Users</a></li>
-                        <li><a class="mm_settings" href="{% url 'site_settings' %}">Settings</a></li>
+                        <li><i class="icon-user"></i> <a href="{% url 'user_index' %}">Users</a></li>
+                        <li><i class="icon-cog"></i> <a href="{% url 'site_settings' %}">Settings</a></li>
                     {% endif %}
-                	<li>{% if user.is_authenticated %}<a class="mm_logout" href="{% url 'user_logout' %}">Logout</a>{% else %}<a class="mm_user" href="{% url 'user_login' %}">Login</a>{% endif %}</li>
                 </ul>
-                <a href="{% url 'list_index' %}" class="mm_logo"><img src="{% static 'postorius/img/mailman_logo_trans.png' %}" alt="{% trans 'Home' %}" /></a>
+                <div class="mm_loginName">
                 {% if user.is_authenticated %}
-                    <div class="mm_loginName">Logged in as: <a href="{% url 'user_profile' %}">{{ user.username }}</a></div>
+                        Logged in as: <a href="{% url 'user_profile' %}">{{ user.username }}</a> <a href="{% url 'user_logout' %}" title="{% trans 'Logout' %}" class="mm_logout"><i class="icon-off"></i></a>
+                {% else %}
+                    <a href="{% url 'user_login' %}">Login</a>
                 {% endif %}
+                </div>
             </div>
         </div>
     </header>
diff --git a/src/postorius/templates/postorius/domain_confirm_delete.html b/src/postorius/templates/postorius/domain_confirm_delete.html
index df40cfe..9745984 100644
--- a/src/postorius/templates/postorius/domain_confirm_delete.html
+++ b/src/postorius/templates/postorius/domain_confirm_delete.html
@@ -4,6 +4,8 @@
 {% load nav_helpers %}
 
 {% block main %}
+    <h1>{% trans 'Confirm Deletion' %}</h1>
+
     <p>{% trans "Are you sure you want to permanently delete this Domain?" %}</p>
     <form action="{{submit_url}}" method="post"> {% csrf_token %}
         <button class="btn btn-danger" type="submit">{% trans "Delete" %} {{ domain }}</button>
diff --git a/src/postorius/templates/postorius/domain_index.html b/src/postorius/templates/postorius/domain_index.html
index 3feaf29..308571e 100644
--- a/src/postorius/templates/postorius/domain_index.html
+++ b/src/postorius/templates/postorius/domain_index.html
@@ -23,7 +23,7 @@
     			<td>{{ domain.base_url }}</td>
     			<td>{{ domain.contact_address }}</td>
     			<td>{{ domain.description }}</td>
-    			<td><a href="{% url 'domain_delete' domain.base_url %}" class="btn btn-mini btn-danger">{% trans 'Delete' %}</a></td>
+    			<td><a href="{% url 'domain_delete' domain.mail_host %}" class="btn btn-mini btn-danger">{% trans 'Delete' %}</a></td>
     		</tr>
             {% endfor %}
     	</tbody>
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index 891d2f6..eef19ef 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -26,10 +26,10 @@
     			<td>{{ msg.reason }}</td>
     			<td>{{ msg.hold_date }}</td>
                 <td class="mm_action">
-                    <a href="{% url 'accept_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
-                    <a href="{% url 'defer_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>
-                    <a href="{% url 'reject_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a>
-                    <a href="{% url 'discard_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a>
+                    <a href="{% url 'accept_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
+                    <a href="{% url 'defer_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>
+                    <a href="{% url 'reject_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a>
+                    <a href="{% url 'discard_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a>
                 </td>
                 </td>
     		</tr>
diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html
index 1ca70e7..2bebdd0 100644
--- a/src/postorius/templates/postorius/lists/index.html
+++ b/src/postorius/templates/postorius/lists/index.html
@@ -5,13 +5,12 @@
 {% block main %}
     <div class="mm_subHeader">
         <span class="mm_context">{% trans "Mailing Lists" %}</span>
-    {% if user.is_superuser %}
-        <ul class="mm_nav">
-            <li class="mm_nav_item"><a href="{% url 'list_index' %}">{% trans "List Index" %}</a></li>
-            <li class="mm_new_list mm_action"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "Create List" %}</a></li>
-        </ul>    
-    {% endif %}
     </div>
+    {% if user.is_superuser %}
+        <p>
+            <a class="btn btn-success" href="{% url 'list_new' %}">{% trans "Create New List" %}</a>
+        </p>
+    {% endif %}
 
     <table class="table table-bordered table-striped">
     	<thead>
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 95af2f4..40dbd8b 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -24,10 +24,6 @@
     </form>
     {% else %}
         <p>To subscribe or unsubscribe this list you have to be logged in.</p>
-<<<<<<< TREE
         <p><a href="{% url 'user_login' %}"class="btn btn-primary">Log In</a></p>
-=======
-        <p><a href="{% url user_login %}" class="btn btn-small btn-primary">Login</a></p>
->>>>>>> MERGE-SOURCE
     {% endif %}
 {% endblock %}