diff --git a/src/mailmanweb/static/mailmanweb/default/css/style.css b/src/mailmanweb/static/mailmanweb/default/css/style.css
index 801647d..fb53d9b 100755
--- a/src/mailmanweb/static/mailmanweb/default/css/style.css
+++ b/src/mailmanweb/static/mailmanweb/default/css/style.css
@@ -50,6 +50,7 @@
 .mm_metaNav .mm_todos,
 .mm_metaNav .mm_settings,
 .mm_metaNav .mm_logout,
+.mm_metaNav .mm_lists,
 .mm_metaNav .mm_user {
     background-color: transparent;
     background-image: url(../img/icons.png);
@@ -60,13 +61,25 @@
 .mm_settings { background-position: 0px -30px; }
 .mm_user { background-position: 0px -65px; }
 .mm_logout { background-position: 0px -240px; }
+.mm_lists { background-position: 0px -311px; }
 .mm_todos:hover { background-position: 0px -100px; }
 .mm_settings:hover { background-position: 0px -135px; }
 .mm_user:hover { background-position: 0px -170px; }
 .mm_logout:hover { background-position: 0px -205px; }
+.mm_lists:hover { background-position: 0px -276px; }
 
+.mm_subHeader {
+    padding-top: 10px;
+}
+.mm_context {
+    display: block;
+    float: left;
+    padding-top: 9px;
+    font-size: 20px;
+    font-style: italic;
+}
 .mm_nav {
-    padding: 20px 0 30px 0;
+    padding: 10px 0 30px 0;
     margin: 0;
     float: right;
 }
diff --git a/src/mailmanweb/static/mailmanweb/default/img/icons.png b/src/mailmanweb/static/mailmanweb/default/img/icons.png
index 9065265..844cee0 100644
--- a/src/mailmanweb/static/mailmanweb/default/img/icons.png
+++ b/src/mailmanweb/static/mailmanweb/default/img/icons.png
Binary files differ
diff --git a/src/mailmanweb/templates/mailmanweb/base.html b/src/mailmanweb/templates/mailmanweb/base.html
index 91f98b9..370c886 100644
--- a/src/mailmanweb/templates/mailmanweb/base.html
+++ b/src/mailmanweb/templates/mailmanweb/base.html
@@ -21,8 +21,11 @@
     <header>
         <div class="mm_header">
             <div class="mm_canvas">
-                <a href="{% url list_index %}" class="mm_logo"><img src="{{ STATIC_URL }}/mailmanweb/default/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
+                <a href="{% url user_profile %}" class="mm_logo"><img src="{{ STATIC_URL }}/mailmanweb/default/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
                 <ul class="mm_metaNav">
+                    <li>
+                        <a class="mm_lists" href="{% url list_index %}">Lists</a>
+                    </li>
                     {% if user.is_authenticated %}
                         <li>
                             <a class="mm_todos" href="#">Todos</a>
diff --git a/src/mailmanweb/templates/mailmanweb/menu/list_nav.html b/src/mailmanweb/templates/mailmanweb/menu/list_nav.html
index dc8608b..de46757 100644
--- a/src/mailmanweb/templates/mailmanweb/menu/list_nav.html
+++ b/src/mailmanweb/templates/mailmanweb/menu/list_nav.html
@@ -1,9 +1,12 @@
 {% 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 "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>
-    <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
-</ul>    
+<div class="mm_subHeader">
+    <span class="mm_context">{{ list.fqdn_listname }}</span>
+    <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 "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>
+        <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
+    </ul>    
+</div>
diff --git a/src/mailmanweb/urls.py b/src/mailmanweb/urls.py
index e33fc06..01a887f 100644
--- a/src/mailmanweb/urls.py
+++ b/src/mailmanweb/urls.py
@@ -22,7 +22,7 @@
 
 
 urlpatterns = patterns('mailmanweb.views',
-    (r'^$', 'list_index'),
+    (r'^$', 'user_profile'),
     url(r'^accounts/login/$', 'user_login', name='user_login'),
     url(r'^accounts/logout/$', 'user_logout', name='user_logout'),
     url(r'^accounts/profile/$', 'user_profile', name='user_profile'),
diff --git a/src/mailmanweb/views.py b/src/mailmanweb/views.py
index 967cf24..e8a0ae0 100644
--- a/src/mailmanweb/views.py
+++ b/src/mailmanweb/views.py
@@ -544,7 +544,7 @@
 
 def user_logout(request):
     logout(request)
-    return redirect('list_index')
+    return redirect('user_login')
 
 def user_login(request,template = 'mailmanweb/login.html'):
     if request.method == 'POST':
@@ -555,7 +555,7 @@
             logger.debug(user)
             if user.is_active:
                 login(request,user)
-                return redirect(request.GET.get('next', 'list_index'))
+                return redirect(request.GET.get('next', 'user_profile'))
     else:
         form = AuthenticationForm()
     return render_to_response(template, {'form': form,},