diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html
index 308231b..253cfed 100644
--- a/src/postorius/templates/postorius/base.html
+++ b/src/postorius/templates/postorius/base.html
@@ -3,7 +3,7 @@
 	<meta charset="UTF-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-	<title></title>
+	<title>{% block title %}Mailman/Postorius{% endblock %}</title>
 	<meta name="description" content="">
 	<meta name="author" content="">
 
diff --git a/src/postorius/templates/postorius/domain_confirm_delete.html b/src/postorius/templates/postorius/domain_confirm_delete.html
index a33cc84..5f889cf 100644
--- a/src/postorius/templates/postorius/domain_confirm_delete.html
+++ b/src/postorius/templates/postorius/domain_confirm_delete.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Confirm Domain Removal | "|add:domain}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/domain_index.html b/src/postorius/templates/postorius/domain_index.html
index 4feb1d3..b60b5d7 100644
--- a/src/postorius/templates/postorius/domain_index.html
+++ b/src/postorius/templates/postorius/domain_index.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Domains -Mailman/Postorius" }}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html
index a6b3685..bd8ea31 100644
--- a/src/postorius/templates/postorius/domain_new.html
+++ b/src/postorius/templates/postorius/domain_new.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Add Domain -Mailman/Postorius" }}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html
index d868e29..01716d5 100644
--- a/src/postorius/templates/postorius/lists/confirm_delete.html
+++ b/src/postorius/templates/postorius/lists/confirm_delete.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Delete | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/confirm_remove_role.html b/src/postorius/templates/postorius/lists/confirm_remove_role.html
index b7e1ccb..179ace9 100644
--- a/src/postorius/templates/postorius/lists/confirm_remove_role.html
+++ b/src/postorius/templates/postorius/lists/confirm_remove_role.html
@@ -1,5 +1,6 @@
 {% extends "postorius/base.html" %}
 {% load url from future %}
+{% block title %}{{ "Confirm Role Remove | "|add:address}}{% endblock %}
 {% load i18n %}
 {% load nav_helpers %}
 
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index 0a8b3c6..9559455 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Held Messages | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html
index 052ce37..9683230 100644
--- a/src/postorius/templates/postorius/lists/index.html
+++ b/src/postorius/templates/postorius/lists/index.html
@@ -1,5 +1,6 @@
 {% extends postorius_base_template %}
 {% load url from future %}
+{% block title %}{{ "List Index -Mailman/Postorius " }}{% endblock %}
 {% load i18n %}
 {% block main %}
 
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index c9ea714..6bf63e5 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Mass Subscribe | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html
index 766fc89..7008149 100644
--- a/src/postorius/templates/postorius/lists/memberoptions.html
+++ b/src/postorius/templates/postorius/lists/memberoptions.html
@@ -1,10 +1,11 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Member Options | "|add:user.username}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
 
 {% block main %}
-    {% list_nav '' '' %}
+    {% list_nav '' 'Member Options' %}
 
 {% if not user.is_superuser or not user.is_list_owner %}
     <div class="mm_subHeader" >
diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index 5fccd41..9d889e6 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Members | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/metrics.html b/src/postorius/templates/postorius/lists/metrics.html
index 75030e4..8d85704 100644
--- a/src/postorius/templates/postorius/lists/metrics.html
+++ b/src/postorius/templates/postorius/lists/metrics.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "List Metrics | "|add:list.fqdn_listname }}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html
index 7091031..2583e38 100644
--- a/src/postorius/templates/postorius/lists/new.html
+++ b/src/postorius/templates/postorius/lists/new.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Create List -Mailman/Postorius" }}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index a410776..db7b13b 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Settings | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/subscribe.html b/src/postorius/templates/postorius/lists/subscribe.html
index 66bba21..7216f6a 100644
--- a/src/postorius/templates/postorius/lists/subscribe.html
+++ b/src/postorius/templates/postorius/lists/subscribe.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Subscribe | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index f6b0fec..a9f3230 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Info | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
@@ -6,7 +7,7 @@
 {% block body_class %}list_summary{% endblock %}
 
 {% block main %}
-    {% if user.is_superuser %}
+    {% if user.is_superuser or user.is_list_owner or user.is_list_moderator %}
         {% include 'postorius/menu/list_nav.html' %}
     {% endif %}
     <h1>{{list.display_name}}</h1>
diff --git a/src/postorius/templates/postorius/lists/unsubscribe.html b/src/postorius/templates/postorius/lists/unsubscribe.html
index 29644e1..1d0eefe 100644
--- a/src/postorius/templates/postorius/lists/unsubscribe.html
+++ b/src/postorius/templates/postorius/lists/unsubscribe.html
@@ -1,4 +1,6 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Confirm List Delete | "|add:list.fqdn_listname}}{% endblock %}
+
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html
index a139223..d469816 100644
--- a/src/postorius/templates/postorius/login.html
+++ b/src/postorius/templates/postorius/login.html
@@ -20,7 +20,8 @@
 
   </div>
   <div class="mm_login_b">
-    <a rel="nofollow" id="browserid" href="#">
+
+    <a rel="nofollow" class="browserid-login persona-button" id="browserid" href="#">
       <img src="{% static 'postorius/img/sign_in_blue.png' %}"
            alt="{% trans 'Login using BrowserID' %}" />
     </a>
@@ -38,22 +39,5 @@
 {% endblock %}
 
 {% block additionaljs %}
-<!-- Include BrowserID JavaScript -->
-<script src="https://login.persona.org/include.js" type="text/javascript"></script>
-<script src="{% static 'browserid/api.js' %}" type="text/javascript"></script>
-<script src="{% static 'browserid/browserid.js' %}" type="text/javascript"></script>
-<!-- Setup click handler that receives BrowserID assertion code and sends
-     POST data -->
-<script type="text/javascript">
-    $(function () {
-      $('#browserid').click(function (e) {
-        django_browserid.login().then(function(verifyResult) {
-          window.location = verifyResult.redirect;
-        }, function(jqXHR) {
-          window.alert('There was an error logging in, please try again.');
-        });
-      });
-    });
-</script>
-<!-- end browserid stuff -->
+    {% browserid_js %}
 {% endblock additionaljs %}
diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html
index 1af4c90..8eb2721 100644
--- a/src/postorius/templates/postorius/menu/list_nav.html
+++ b/src/postorius/templates/postorius/menu/list_nav.html
@@ -9,13 +9,13 @@
         {% if user.is_superuser or user.is_list_owner %}
             <li class="mm_nav_item"><a class="{% nav_active_class current 'list_members' %}" href="{% url 'list_members' list.list_id %}">{% trans "Members" %}</a></li>
         {% endif %}
-        {% if user.is_superuser or user.is_list_moderator %}
+        {% if user.is_superuser or user.is_list_owner or user.is_list_moderator %}
             <li class="mm_nav_item"><a class="{% nav_active_class current 'list_held_messages' %}" href="{% url 'list_held_messages' list.list_id %}">{% trans "Held Messages" %}</a></li>
         {% endif %}
         {% if user.is_superuser or user.is_list_owner %}
             <li class="mm_nav_item"><a class="{% nav_active_class current 'list_settings' %}" href="{% url 'list_settings' list.list_id %}">{% trans "Settings" %}</a></li>
         {% endif %}
-        {% if user.is_superuser or user.is_list_moderator %}
+        {% if user.is_superuser or user.is_list_owner %}
             <li class="mm_nav_item"><a class="{% nav_active_class current 'mass_subscribe' %}" href="{% url 'mass_subscribe' list.list_id %}">{% trans "Mass Subscribe" %}</a></li>
         {% endif %}
         {% if user.is_superuser or user.is_list_owner %}
diff --git a/src/postorius/templates/postorius/user_address_activation.html b/src/postorius/templates/postorius/user_address_activation.html
index aee976c..a0122a5 100644
--- a/src/postorius/templates/postorius/user_address_activation.html
+++ b/src/postorius/templates/postorius/user_address_activation.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Add Email | "|add:user.username }}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/user_address_activation_sent.html b/src/postorius/templates/postorius/user_address_activation_sent.html
index 72cb84f..4e22ab6 100644
--- a/src/postorius/templates/postorius/user_address_activation_sent.html
+++ b/src/postorius/templates/postorius/user_address_activation_sent.html
@@ -1,4 +1,6 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Confirmation Sent -Mailman/Postorius" }}{% endblock %}
+
 {% load url from future %}
 {% load i18n %}
 {% block main %}
@@ -7,4 +9,3 @@
     <h1>{% trans 'Email address activation sent' %}</h1>
     <p>{% trans "A confirmation link has been sent to the email address you submitted. Please check your email account and click on the confirmation link to add this address for your account." %}</p>
 {% endblock main %}
-
diff --git a/src/postorius/templates/postorius/user_address_preferences.html b/src/postorius/templates/postorius/user_address_preferences.html
index 71b1789..1397b12 100644
--- a/src/postorius/templates/postorius/user_address_preferences.html
+++ b/src/postorius/templates/postorius/user_address_preferences.html
@@ -1,4 +1,6 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Subscription Settings | "|add:user.username }}{% endblock %}
+
 {% load url from future %}
 {% load i18n %}
 {% block main %}
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index 12a709d..479a65a 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Subscription Settings | "|add:user.username }}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% block main %}
diff --git a/src/postorius/templates/postorius/user_profile.html b/src/postorius/templates/postorius/user_profile.html
index ec10d8b..14611f8 100644
--- a/src/postorius/templates/postorius/user_profile.html
+++ b/src/postorius/templates/postorius/user_profile.html
@@ -1,6 +1,8 @@
 {% extends postorius_base_template %}
+
 {% load url from future %}
 {% load i18n %}
+{% block title %}{{ "Profile | "|add:user.username }}{% endblock %}
 
 {% block main %}
     {% include 'postorius/menu/user_nav.html' %}
diff --git a/src/postorius/templates/postorius/user_settings.html b/src/postorius/templates/postorius/user_settings.html
index 141b796..1ad6d62 100644
--- a/src/postorius/templates/postorius/user_settings.html
+++ b/src/postorius/templates/postorius/user_settings.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "User Settings -Mailman/Postorius | "|add:list.fqdn_listname}}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/user_subscription_preferences.html b/src/postorius/templates/postorius/user_subscription_preferences.html
index 2accf2f..f811998 100644
--- a/src/postorius/templates/postorius/user_subscription_preferences.html
+++ b/src/postorius/templates/postorius/user_subscription_preferences.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Subscription Settings | "|add:user.username }}{% endblock %}
 {% load url from future %}
 {% load i18n %}
 {% block main %}
diff --git a/src/postorius/templates/postorius/user_subscriptions.html b/src/postorius/templates/postorius/user_subscriptions.html
index 43b6a03..92ff5ba 100644
--- a/src/postorius/templates/postorius/user_subscriptions.html
+++ b/src/postorius/templates/postorius/user_subscriptions.html
@@ -1,4 +1,6 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "Subscriptions | "|add:user.username }}{% endblock %}
+
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/user_tasks.html b/src/postorius/templates/postorius/user_tasks.html
index a5421a4..55aa9f7 100644
--- a/src/postorius/templates/postorius/user_tasks.html
+++ b/src/postorius/templates/postorius/user_tasks.html
@@ -1,4 +1,5 @@
 {% extends postorius_base_template %}
+{% block title %}{{ "To Do -Mailman/Postorius" }}{% endblock %}
 {% load url from future %}
 {% load i18n %}