diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html
index b289eb9..e2c51d6 100644
--- a/src/postorius/templates/postorius/base.html
+++ b/src/postorius/templates/postorius/base.html
@@ -6,11 +6,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>
-    {% block title %}
-        {% block subtitle %}{% endblock %} | Mailman/Postorius
-    {% endblock %}
-    </title>
+    <title>{% block head_title %}{{ site_name|title }}{% endblock %}</title>
     <link rel="shortcut icon" href="{% static 'postorius/img/favicon.ico' %}">
     <link rel="stylesheet" href="{% static 'postorius/libs/bootstrap/css/bootstrap.min.css' %}">
     <link rel="stylesheet" href="{% static 'postorius/css/style.css' %}">
@@ -61,7 +57,7 @@
         {% for message in messages %}
             <div class="alert alert-{{ message.tags }}">{{ message }}</div>
         {% endfor %}
-        {% block main %}{% endblock main %}
+        {% block content %}{% endblock content %}
     </div>
 
     <footer class="footer">
diff --git a/src/postorius/templates/postorius/domain/confirm_delete.html b/src/postorius/templates/postorius/domain/confirm_delete.html
index e58c750..c969aa5 100644
--- a/src/postorius/templates/postorius/domain/confirm_delete.html
+++ b/src/postorius/templates/postorius/domain/confirm_delete.html
@@ -1,13 +1,13 @@
 {% extends postorius_base_template %}
 {% load i18n %}
 
-{% block subtitle %}
-{% trans 'Confirm domain removal' %} | {{ domain}}
+{% block head_title %}
+{% trans 'Confirm domain removal' %} | {{ domain}} - {{ block.super }}
 {% endblock %}
 
 {% load nav_helpers %}
 
-{% block main %}
+{% block content %}
 
     <div class="page-header">
         <h2>{% trans 'Confirm deletion' %}</h2>
@@ -21,4 +21,4 @@
         <a class="btn btn-default" href="{% url 'domain_index' %}">{% trans 'Cancel' %}</a>
     </form>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/domain/index.html b/src/postorius/templates/postorius/domain/index.html
index da4c017..6a24684 100644
--- a/src/postorius/templates/postorius/domain/index.html
+++ b/src/postorius/templates/postorius/domain/index.html
@@ -1,11 +1,11 @@
 {% extends postorius_base_template %}
 {% load i18n %}
 
-{% block subtitle %}
-{% trans 'Domains' %}
+{% block head_title %}
+{% trans 'Domains' %} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     <div class="page-header">
         <h1>{% trans 'Domains' %}</h1>
@@ -36,4 +36,4 @@
         </table>
     </div>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/domain/new.html b/src/postorius/templates/postorius/domain/new.html
index 5b514d1..c9d3fc3 100644
--- a/src/postorius/templates/postorius/domain/new.html
+++ b/src/postorius/templates/postorius/domain/new.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load bootstrap_tags %}
 
-{% block subtitle %}
-{% trans 'Add domain' %}
+{% block head_title %}
+{% trans 'Add domain' %} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     <div class="page-header">
         <h2>{% trans 'Add a new domain' %}</h2>
@@ -16,4 +16,4 @@
         {% bootstrap_form_horizontal form 2 8 'Create domain' %}
     </form>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/errors/generic.html b/src/postorius/templates/postorius/errors/generic.html
index 21498f9..954dd07 100644
--- a/src/postorius/templates/postorius/errors/generic.html
+++ b/src/postorius/templates/postorius/errors/generic.html
@@ -1,7 +1,7 @@
 {% extends postorius_base_template %}
 {% load i18n %}
 
-{% block main %}
+{% block content %}
     <h1>{% trans 'Something went wrong' %}</h1>
     {% if error %}<div class="alert alert-danger">{{ error }}</div>{% endif %}
 {% endblock %}
diff --git a/src/postorius/templates/postorius/index.html b/src/postorius/templates/postorius/index.html
index dfce39b..5d532e8 100644
--- a/src/postorius/templates/postorius/index.html
+++ b/src/postorius/templates/postorius/index.html
@@ -1,11 +1,11 @@
 {% extends postorius_base_template %}
 {% load i18n %}
 
-{% block subtitle %}
-{% trans 'List Index' %}
+{% block head_title %}
+{% trans 'List Index' %} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     <div class="page-header">
         <h1>{% trans 'Mailing Lists' %}</h1>
@@ -52,4 +52,4 @@
         <p>{% trans 'There are currently no mailing lists.' %}</p>
     {% endif %}
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/lists/archival_options.html b/src/postorius/templates/postorius/lists/archival_options.html
index 570e6ed..a844cdb 100644
--- a/src/postorius/templates/postorius/lists/archival_options.html
+++ b/src/postorius/templates/postorius/lists/archival_options.html
@@ -1,13 +1,13 @@
 {% extends postorius_base_template %}
 {% load i18n %}
 
-{% block subtitle %}
-{% trans 'Archival options' %} | {{ list.fqdn_listname }}
+{% block head_title %}
+{% trans 'Archival options' %} | {{ list.fqdn_listname }} - {{ block.super }}
 {% endblock %}
 
 {% load nav_helpers %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_archival_options' 'Archivers' %}
 
diff --git a/src/postorius/templates/postorius/lists/bans.html b/src/postorius/templates/postorius/lists/bans.html
index d9d3507..2436c33 100644
--- a/src/postorius/templates/postorius/lists/bans.html
+++ b/src/postorius/templates/postorius/lists/bans.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Banned addresses' %} | {{ list.fqdn_listname }}
+{% block head_title %}
+{% trans 'Banned addresses' %} | {{ list.fqdn_listname }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_bans' 'Banned addresses' %}
 
diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html
index c36c832..015f904 100644
--- a/src/postorius/templates/postorius/lists/confirm_delete.html
+++ b/src/postorius/templates/postorius/lists/confirm_delete.html
@@ -1,13 +1,13 @@
 {% extends postorius_base_template %}
 {% load i18n %}
 
-{% block subtitle %}
-{% trans 'Delete' %} | {{ list.fqdn_listname }}
+{% block head_title %}
+{% trans 'Delete' %} | {{ list.fqdn_listname }} - {{ block.super }}
 {% endblock %}
 
 {% load nav_helpers %}
 
-{% block main %}
+{% block content %}
     {% list_nav 'list_delete' 'Delete List' %}
 
     <p>{% trans 'Are you sure you want to permanently delete this list?' %}</p>
@@ -27,4 +27,4 @@
         </div>
     </form>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/lists/confirm_remove_role.html b/src/postorius/templates/postorius/lists/confirm_remove_role.html
index 86ef856..d1a6823 100644
--- a/src/postorius/templates/postorius/lists/confirm_remove_role.html
+++ b/src/postorius/templates/postorius/lists/confirm_remove_role.html
@@ -1,13 +1,13 @@
 {% extends postorius_base_template %}
 {% load i18n %}
 
-{% block subtitle %}
-{% trans 'Confirm remove role' %} | {{ address }}
+{% block head_title %}
+{% trans 'Confirm remove role' %} | {{ address }} - {{ block.super }}
 {% endblock %}
 
 {% load nav_helpers %}
 
-{% block main %}
+{% block content %}
     <div class="panel panel-default">
         <div class="panel-heading"><h1 class="panel-title">{% trans 'Confirm remove role' %}</h1></div>
         <div class="panel-body">
@@ -20,4 +20,4 @@
         </div>
     </div>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
index de11603..f29f137 100644
--- a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
+++ b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load nav_helpers %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'mass_removal' 'Confirm Removal of All Members' %}
 
@@ -18,4 +18,4 @@
         <a class="btn btn-default" href="{% url 'mass_removal' list.list_id %}">{% trans 'Cancel' %}</a>
     </form>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/lists/header_matches.html b/src/postorius/templates/postorius/lists/header_matches.html
index ee85979..ea53f01 100644
--- a/src/postorius/templates/postorius/lists/header_matches.html
+++ b/src/postorius/templates/postorius/lists/header_matches.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Header filters' %} | {{ list.fqdn_listname}}
+{% block head_title %}
+{% trans 'Header filters' %} | {{ list.fqdn_listname}} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_header_matches' 'Header filters' %}
 
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index c433565..23b1571 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -3,11 +3,11 @@
 {% load nav_helpers %}
 {% load staticfiles %}
 
-{% block subtitle %}
-{% trans 'Held messages' %} | {{ list.fqdn_listname }}
+{% block head_title %}
+{% trans 'Held messages' %} | {{ list.fqdn_listname }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_held_messages' 'Held messages' %}
 
diff --git a/src/postorius/templates/postorius/lists/mass_removal.html b/src/postorius/templates/postorius/lists/mass_removal.html
index c1328b7..0c0baf9 100644
--- a/src/postorius/templates/postorius/lists/mass_removal.html
+++ b/src/postorius/templates/postorius/lists/mass_removal.html
@@ -3,7 +3,7 @@
 {% load nav_helpers %}
 {% load bootstrap_tags %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_mass_ops' 'Mass Removal' %}
 
@@ -18,4 +18,4 @@
         </div>
     </form>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index 521b958..45b6045 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Mass subscribe' %} | {{ list.fqdn_listname }}
+{% block head_title %}
+{% trans 'Mass subscribe' %} | {{ list.fqdn_listname }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_mass_ops' 'Mass subscription' %}
 
@@ -15,4 +15,4 @@
         {% bootstrap_form_horizontal form 2 8 'Subscribe users' %}
     </form>
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html
index 70175c9..4f816be 100644
--- a/src/postorius/templates/postorius/lists/memberoptions.html
+++ b/src/postorius/templates/postorius/lists/memberoptions.html
@@ -3,11 +3,11 @@
 {% load nav_helpers %}
 {% load bootstrap_tags %}
 
-{% block subtitle %}
-{% trans 'Member options' %} | {{ mm_member.email }}
+{% block head_title %}
+{% trans 'Member options' %} | {{ mm_member.email }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_members' 'Member options' mm_member.email %}
 
@@ -30,4 +30,4 @@
         </div>
 
     {% endif %}
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index f4bef91..1014de8 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'List members' %} | {{ list.fqdn_listname}}
+{% block head_title %}
+{% trans 'List members' %} | {{ list.fqdn_listname}} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_members' page_title %}
 
@@ -96,7 +96,7 @@
         <p>{{ empty_error }}</p>
     {% endif %}
 
-{% endblock main %}
+{% endblock content %}
 {% block additionaljs %}
 <script>
 $('#all-members-checkbox').change(function() {
diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html
index 012a1e2..9389e3e 100644
--- a/src/postorius/templates/postorius/lists/new.html
+++ b/src/postorius/templates/postorius/lists/new.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load bootstrap_tags %}
 
-{% block subtitle %}
-{% trans 'Create list' %}
+{% block head_title %}
+{% trans 'Create list' %} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     <div class="page-header">
         <h1>{% trans 'Create a new list' %}</h1>
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index 1fd1c18..e1f1d14 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Settings' %} | {{ list.fqdn_listname}}
+{% block head_title %}
+{% trans 'Settings' %} | {{ list.fqdn_listname}} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_settings' 'List Settings' %}
 
diff --git a/src/postorius/templates/postorius/lists/subscription_requests.html b/src/postorius/templates/postorius/lists/subscription_requests.html
index bc61870..7d5bd22 100644
--- a/src/postorius/templates/postorius/lists/subscription_requests.html
+++ b/src/postorius/templates/postorius/lists/subscription_requests.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load nav_helpers %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_subscription_requests' 'Subscription Requests' %}
 
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 5f46500..72b7b04 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Info' %} | {{ list.fqdn_listname }}
+{% block head_title %}
+{% trans 'Info' %} | {{ list.fqdn_listname }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% list_nav 'list_summary' 'Summary' %}
 
diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html
index 4f46af3..aef6f91 100644
--- a/src/postorius/templates/postorius/login.html
+++ b/src/postorius/templates/postorius/login.html
@@ -4,15 +4,15 @@
 {% load browserid %}
 {% load bootstrap_tags %}
 
-{% block subtitle %}
-{% trans 'Login' %}
+{% block head_title %}
+{% trans 'Login' %} - {{ block.super }}
 {% endblock %}
 {% block additionalcss %}
     {% browserid_css %}
 {% endblock %}
 
 
-{% block main %}
+{% block content %}
 
     <div class="page-header">
         <h3>{% trans 'Login with username and password or with Mozilla Persona' %}</h3>
diff --git a/src/postorius/templates/postorius/user/address_preferences.html b/src/postorius/templates/postorius/user/address_preferences.html
index 8fac8c4..a92e8f2 100644
--- a/src/postorius/templates/postorius/user/address_preferences.html
+++ b/src/postorius/templates/postorius/user/address_preferences.html
@@ -4,11 +4,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Subscription preferences' %} | {{ user.username }}
+{% block head_title %}
+{% trans 'Subscription preferences' %} | {{ user.username }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% user_nav 'settings' 'Subscription settings' %}
 
@@ -67,7 +67,7 @@
         </form>
     {% endif %}
 
-{% endblock main %}
+{% endblock content %}
 {% block additionaljs %}
 <script>
     $(function () {
diff --git a/src/postorius/templates/postorius/user/list_options.html b/src/postorius/templates/postorius/user/list_options.html
index 7ec9e69..7c7535e 100644
--- a/src/postorius/templates/postorius/user/list_options.html
+++ b/src/postorius/templates/postorius/user/list_options.html
@@ -3,11 +3,11 @@
 {% load nav_helpers %}
 {% load bootstrap_tags %}
 
-{% block subtitle %}
-{% trans 'Member options' %} | {{ list.fqdn_listname }}
+{% block head_title %}
+{% trans 'Member options' %} | {{ list.fqdn_listname }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 <h2>{% trans 'Subscription options for' %} {{ list.fqdn_listname }}</h2>
 <hr />
 <p class="col-md-offset-2">
@@ -21,4 +21,4 @@
   {% bootstrap_form_horizontal form 3 8 'Save changes' %}
   <input type="hidden" name="formname" value="preferences" />
 </form>
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/user/mailman_settings.html b/src/postorius/templates/postorius/user/mailman_settings.html
index d2fb9ad..264cc01 100644
--- a/src/postorius/templates/postorius/user/mailman_settings.html
+++ b/src/postorius/templates/postorius/user/mailman_settings.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Subscription settings' %} | {{ user.username }}
+{% block head_title %}
+{% trans 'Subscription settings' %} | {{ user.username }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% user_nav 'settings' 'Subscription settings' %}
 
@@ -28,4 +28,4 @@
         </form>
     {% endif %}
 
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/user/profile.html b/src/postorius/templates/postorius/user/profile.html
index 7e6124c..0abd18e 100644
--- a/src/postorius/templates/postorius/user/profile.html
+++ b/src/postorius/templates/postorius/user/profile.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Profile' %} | {{ user.username }}
+{% block head_title %}
+{% trans 'Profile' %} | {{ user.username }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% user_nav 'profile' 'User Profile' %}
 
@@ -75,4 +75,4 @@
             </tr>
         </tbody>
     </table>
-{% endblock main %}
+{% endblock content %}
diff --git a/src/postorius/templates/postorius/user/subscription_preferences.html b/src/postorius/templates/postorius/user/subscription_preferences.html
index 4038eaa..4f7ad70 100644
--- a/src/postorius/templates/postorius/user/subscription_preferences.html
+++ b/src/postorius/templates/postorius/user/subscription_preferences.html
@@ -3,11 +3,11 @@
 {% load bootstrap_tags %}
 {% load nav_helpers %}
 
-{% block subtitle %}
-{% trans 'Subscription preferences' %} | {{ user.username }}
+{% block head_title %}
+{% trans 'Subscription preferences' %} | {{ user.username }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% user_nav 'settings' 'Subscription settings' %}
 
@@ -67,7 +67,7 @@
         </form>
     {% endif %}
 
-{% endblock main %}
+{% endblock content %}
 {% block additionaljs %}
 <script>
     $(function () {
diff --git a/src/postorius/templates/postorius/user/subscriptions.html b/src/postorius/templates/postorius/user/subscriptions.html
index 349c8ec..a6f93dd 100644
--- a/src/postorius/templates/postorius/user/subscriptions.html
+++ b/src/postorius/templates/postorius/user/subscriptions.html
@@ -4,11 +4,11 @@
 {% load nav_helpers %}
 {% load membership_helpers %}
 
-{% block subtitle %}
-{% trans 'Subscriptions' %} | {{ user.username }}
+{% block head_title %}
+{% trans 'Subscriptions' %} | {{ user.username }} - {{ block.super }}
 {% endblock %}
 
-{% block main %}
+{% block content %}
 
     {% user_nav 'subscriptions' 'List Subscriptions' %}
     {% if memberships %}
@@ -49,4 +49,4 @@
     {% else %}
         <p>{% trans 'You are not yet subscribed to any lists.' %}</p>
     {% endif %}
-{% endblock main %}
+{% endblock content %}