diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html
index 1d4abe5..4c0c435 100644
--- a/src/postorius/templates/postorius/base.html
+++ b/src/postorius/templates/postorius/base.html
@@ -26,13 +26,12 @@
                 <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><i class="icon-envelope"></i> <a href="{% url 'list_index' %}">{% trans "Lists" %}</a></li>
-                    {% if user.is_authenticated %}
-                        <li><i class="icon-tasks"></i><a href="{% url 'user_tasks' %}">{% trans "To Do" %}</a></li>
-                        <li><i class="icon-cog"></i> <a href="{% url 'user_mailmansettings' %}">{% trans "My Settings" %}</a></li>
-                    {% endif %}
                     {% if user.is_superuser %}
                         <li><i class="icon-globe"></i> <a href="{% url 'domain_index' %}">{% trans "Domains" %}</a></li>
                     {% endif %}
+                    {% if user.is_authenticated %}
+                        <li><i class="icon-cog"></i> <a href="{% url 'user_mailmansettings' %}">{% trans "My Settings" %}</a></li>
+                    {% endif %}
                 </ul>
                 <div class="mm_loginName">
                 {% if user.is_authenticated %}
diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html
index 0232917..63a692a 100644
--- a/src/postorius/templates/postorius/lists/index.html
+++ b/src/postorius/templates/postorius/lists/index.html
@@ -22,24 +22,37 @@
         </p>
     {% endif %}
 
-    <table class="table table-bordered table-striped">
-    	<thead>
-    		<tr>
-    			<th>{% trans 'List name' %}</th>
-    			<th>{% trans 'List address' %}</th>
-    			<th>{% trans 'Description' %}</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-            {% for list in lists %}
-    		<tr>
-    			<td>
-                    <a href="{% url 'list_summary' list_id=list.list_id %}">{{ list.display_name }}</a>
-                </td>
-    			<td>{{ list.fqdn_listname }}</td>
-    			<td>{{ list.settings.description }}</td>
-    		</tr>
-            {% endfor %}
-    	</tbody>
-    </table>
+    {% if lists|length > 0 %}
+
+        <table class="table table-bordered table-striped">
+            <thead>
+                <tr>
+                    <th>{% trans 'List name' %}</th>
+                    <th>{% trans 'Post address' %}</th>
+                    <th>{% trans 'Description' %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for list in lists %}
+                <tr>
+                    <td>
+                        <a href="{% url 'list_summary' list_id=list.list_id %}">{{ list.display_name }}</a>{% if not list.settings.advertised %} (private*){% endif %}
+                    </td>
+                    <td>{{ list.fqdn_listname }}</td>
+                    <td>{{ list.settings.description }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+
+        {% if user.is_superuser %}
+            <small>* Private lists can only be seen by admins.</small>
+        {% endif %}
+
+    {% else %}
+
+        <p>There are currently no mailing lists.</p>
+
+    {% endif %}
+
 {% endblock main %}