diff --git a/src/postorius/templates/postorius/lists/archival_options.html b/src/postorius/templates/postorius/lists/archival_options.html
index 2ace6a2..17deb37 100644
--- a/src/postorius/templates/postorius/lists/archival_options.html
+++ b/src/postorius/templates/postorius/lists/archival_options.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% block subtitle %}
-{% trans "Archival Options | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% trans 'Archival Options' %} | {{ list.fqdn_listname }}
{% endblock %}
{% load nav_helpers %}
@@ -10,18 +10,21 @@
{% block main %}
{% if message %}
-
-
-
+
+
{% trans 'Archivers' %}
+
{% endblock %}
diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html
index 7685c74..e74a3f4 100644
--- a/src/postorius/templates/postorius/lists/confirm_delete.html
+++ b/src/postorius/templates/postorius/lists/confirm_delete.html
@@ -2,18 +2,23 @@
{% load i18n %}
{% block subtitle %}
-{% trans "Delete | " as page_title %}{{ page_title|add:list.fqdn_listname}}
+{% trans 'Delete' %} | {{ list.fqdn_listname }}
{% endblock %}
{% load nav_helpers %}
{% block main %}
- {% list_nav 'list_delete' "Delete List" %}
-
-
{% trans "Are you sure you want to permanently delete this list?" %}
-
{% trans "All settings and membership data will be lost!" %}
-
+ {% list_nav 'list_delete' 'Delete List' %}
+
+
{% trans 'Delete List' %}
+
+
{% trans 'Are you sure you want to permanently delete this list?' %}
+
{% trans 'All settings and membership data will be lost!' %}
+
+
+
{% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/confirm_remove_role.html b/src/postorius/templates/postorius/lists/confirm_remove_role.html
index f763a69..4d7cfae 100644
--- a/src/postorius/templates/postorius/lists/confirm_remove_role.html
+++ b/src/postorius/templates/postorius/lists/confirm_remove_role.html
@@ -1,18 +1,23 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
{% load i18n %}
{% block subtitle %}
-{% trans "Confirm Remove Role | " as page_title %}{{ page_title|add:address}}
+{% trans 'Confirm Remove Role' %} | {{ address }}
{% endblock %}
{% load nav_helpers %}
{% block main %}
-
{% trans 'Confirm Remove Role' %}
-
{% trans "Are you sure you want to remove?" %}
-
+
+
{% trans 'Confirm Remove Role' %}
+
+
{% trans 'Are you sure?' %}
+
+
+
+
{% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
index a2550f2..cf44861 100644
--- a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
+++ b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
@@ -1,14 +1,18 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
{% load i18n %}
{% load nav_helpers %}
{% block main %}
-
{% trans 'Confirm Removal of All Members' %}
-
{% trans "Are you sure you want to unsubscribe all members from " %}{{list_id}}{% trans " ?"%}
-
-
+
+
{% trans 'Confirm Removal of All Members' %}
+
+
{% trans 'Are you sure you want to unsubscribe all members from' %} {{ list_id }}{% trans '?' %}
+
+
+
+
{% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index 163dd6a..fc91842 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -8,81 +8,87 @@
{% block main %}
{% list_nav 'list_held_messages' 'Held Messages' %}
- {% if held_messages|length > 0 %}
-