diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index 39f940e..eec1361 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -256,7 +256,7 @@
             'in the process.'))
     default_member_action = forms.ChoiceField(
         widget=forms.RadioSelect(),
-        label=_('Default action to take when a member posts to the list:'),
+        label=_('Default action to take when a member posts to the list'),
         error_messages={
             'required': _("Please choose a default member action.")},
         required=True,
@@ -275,7 +275,7 @@
     default_nonmember_action = forms.ChoiceField(
         widget=forms.RadioSelect(),
         label=_('Default action to take when a non-member posts to the'
-                'list:'),
+                'list'),
         error_messages={
             'required': _("Please choose a default non-member action.")},
         required=True,
diff --git a/src/postorius/templates/postorius/lists/archival_options.html b/src/postorius/templates/postorius/lists/archival_options.html
index 17deb37..5cf76dd 100644
--- a/src/postorius/templates/postorius/lists/archival_options.html
+++ b/src/postorius/templates/postorius/lists/archival_options.html
@@ -8,23 +8,21 @@
 {% load nav_helpers %}
 
 {% block main %}
-    {% if message %}<p class="alert">{{ message }}</p>{% endif %}
+
     {% list_nav 'list_archival_options' 'Archivers' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Archivers' %}</h1></div>
-        <div class="panel-body">
-            <form action="{% url 'list_archival_options' list.list_id %}" method="POST">
-                {% csrf_token %}
-                {% for choice in form.archivers %}
-                    <div class="col-md-offset-2 checkbox">
-                        <label>
-                            {{ choice }} {{ choice.label }}
-                        </label>
-                    </div>
-                {% endfor %}
-                <button class="col-md-offset-2 btn btn-primary" type="submit">{% trans 'Save Archivers' %}</button>
-            </form>
+
+    <form action="{% url 'list_archival_options' list.list_id %}" method="POST">
+        {% csrf_token %}
+        {% for choice in form.archivers %}
+            <div class="checkbox">
+                <label>
+                    {{ choice }} {{ choice.label }}
+                </label>
+            </div>
+        {% endfor %}
+        <div class="form-group">
+            <button class="btn btn-primary" type="submit">{% trans 'Save Archivers' %}</button>
         </div>
-    </div>
+    </form>
 
 {% endblock %}
diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html
index e74a3f4..c36c832 100644
--- a/src/postorius/templates/postorius/lists/confirm_delete.html
+++ b/src/postorius/templates/postorius/lists/confirm_delete.html
@@ -9,16 +9,22 @@
 
 {% block main %}
     {% list_nav 'list_delete' 'Delete List' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Delete List' %}</h1></div>
-        <div class="panel-body">
-            <p class="col-md-offset-2">{% trans 'Are you sure you want to permanently delete this list?' %}</p>
-            <p class="col-md-offset-2">{% trans 'All settings and membership data will be lost!' %}</p>
-            <form action="{{submit_url}}" method="post">
-                {% csrf_token %}
-                <button class="col-md-offset-2 btn btn-danger" type="submit">{% trans "Delete" %} {{ list.fqdn_listname }}</button>
-                <a class="btn btn-default" href="{% url 'list_summary' list_id=list.list_id %}">{% trans 'Cancel' %}</a>
-            </form>
+
+    <p>{% trans 'Are you sure you want to permanently delete this list?' %}</p>
+    <p>{% trans 'All settings and membership data will be lost!' %}</p>
+
+    <form action="{{submit_url}}" method="post">
+        {% csrf_token %}
+        <div class="form-group">
+            <button class="btn btn-danger" type="submit">
+                {% blocktrans with listname=list.fqdn_listname %}
+                Delete {{ listname }}
+                {% endblocktrans %}
+            </button>
+            <a class="btn btn-default" href="{% url 'list_summary' list_id=list.list_id %}">
+                {% trans 'Cancel' %}
+            </a>
         </div>
-    </div>
+    </form>
+
 {% 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 816fcb5..6681c2b 100644
--- a/src/postorius/templates/postorius/lists/confirm_remove_role.html
+++ b/src/postorius/templates/postorius/lists/confirm_remove_role.html
@@ -15,7 +15,7 @@
             <form method="post" action="{% url 'remove_role' list_id role address %}">
                 {% csrf_token %}
                 <button class="btn btn-danger" type="submit">{% trans 'Remove' %} {{ address }}</button>
-                <a class="btn btn-default" href="{% url 'list_members' list_id role|add:"s" %}">{% trans 'Cancel' %}</a>
+                <a class="btn btn-default" href="{% url 'list_members' list_id role %}">{% trans 'Cancel' %}</a>
             </form>
         </div>
     </div>
diff --git a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
index cf44861..de11603 100644
--- a/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
+++ b/src/postorius/templates/postorius/lists/confirm_removeall_subscribers.html
@@ -3,16 +3,19 @@
 {% load nav_helpers %}
 
 {% block main %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Confirm Removal of All Members' %}</h1></div>
-        <div class="panel-body">
-            <p>{% trans 'Are you sure you want to unsubscribe all members from' %} {{ list_id }}{% trans '?' %}</p>
-            <hr />
-            <form method="post" action="{% url 'unsubscribe_all' list_id %}">
-                {% csrf_token %}
-                <button class="btn btn-danger" type="submit" >{% trans 'Unsubscribe All' %}</button>
-                <a class="btn btn-default" href="{% url 'mass_removal' list_id %}">{% trans 'Cancel' %}</a>
-            </form>
-        </div>
-    </div>
+
+    {% list_nav 'mass_removal' 'Confirm Removal of All Members' %}
+
+    <p>
+    {% blocktrans with listname=list.fqdn_listname %}
+        Are you sure you want to unsubscribe all members from {{ listname }}?
+    {% endblocktrans %}
+    </p>
+
+    <form method="post" action="{% url 'unsubscribe_all' list.list_id %}">
+        {% csrf_token %}
+        <button class="btn btn-danger" type="submit" >{% trans 'Unsubscribe All' %}</button>
+        <a class="btn btn-default" href="{% url 'mass_removal' list.list_id %}">{% trans 'Cancel' %}</a>
+    </form>
+
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index fc91842..95e210d 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -7,11 +7,10 @@
 {% endblock %}
 
 {% block main %}
-  {% list_nav 'list_held_messages' 'Held Messages' %}
-  <div class="panel panel-default">
-    <div class="panel-heading"><h1 class="panel-title">{% trans 'Held Messages' %}</h1></div>
-    <div class="panel-body">
-      {% if held_messages|length > 0 %}
+
+    {% list_nav 'list_held_messages' 'Held Messages' %}
+
+    {% if held_messages|length > 0 %}
         <form method="post">
           {% if form.choices.errors %}
             {% for error in form.choices.errors %}
@@ -84,11 +83,9 @@
           </div>
         </form>
         {% include 'postorius/_pagination.html' with page=held_messages %}
-      {% else %}
+    {% else %}
         <p>{% trans 'There are currently no held messages.' %}</p>
-      {% endif %}
-    </div>
-  </div>
+    {% endif %}
 {% endblock %}
 
 {% block additionaljs %}
diff --git a/src/postorius/templates/postorius/lists/mass_removal.html b/src/postorius/templates/postorius/lists/mass_removal.html
index 68cd4e1..5e5b3c6 100644
--- a/src/postorius/templates/postorius/lists/mass_removal.html
+++ b/src/postorius/templates/postorius/lists/mass_removal.html
@@ -4,31 +4,32 @@
 {% load bootstrap_tags %}
 
 {% block main %}
+
     {% list_nav 'mass_removal' 'Mass Removal' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Mass Removal' %}</h1></div>
-        <div class="panel-body">
-            <form action="{% url 'mass_removal' list.list_id %}" method="post" class="form-horizontal">
-                {% csrf_token %}
-                {% if form.non_field_errors %}
-                    <div class="alert alert-danger">
-                        {{ form.non_field_errors }}
-                    </div>
-                {% endif %}
-                <div class="form-group">
-                    {% if form.emails.errors %}
-                        <div class="alert alert-danger">
-                            {{ form.emails.errors }}
-                        </div>
-                    {% endif %}
-                    <label class="control-label col-md-2" for="{{ form.emails.id_for_label }}">{{ form.emails.label }}:</label>
-                    <div class="col-md-8">{{ form.emails|add_form_control }}</div>
+
+    <form action="{% url 'mass_removal' list.list_id %}" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% if form.non_field_errors %}
+            <div class="alert alert-danger">
+                {{ form.non_field_errors }}
+            </div>
+        {% endif %}
+        <div class="form-group {% if form.emails.errors %}has-error{% endif %}">
+            {% if form.emails.errors %}
+                <div class="alert alert-danger">
+                    {{ form.emails.errors }}
                 </div>
-                <hr />
-                <button class="col-md-offset-2 btn btn-warning" type="submit">{% trans 'Unsubscribe users' %}</button>
-                <a href="{% url 'unsubscribe_all' list.list_id %}" class="btn btn-danger col-md-offset-5">{% trans 'Unsubscribe All' %}</a>
-            </form>
+            {% endif %}
+            <label class="control-label col-md-2" for="{{ form.emails.id_for_label }}">{{ form.emails.label }}</label>
+            <div class="col-md-8">{{ form.emails|add_form_control }}</div>
         </div>
-    </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-8">
+                <button class="btn btn-warning" type="submit">{% trans 'Unsubscribe users' %}</button>
+                <a href="{% url 'unsubscribe_all' list.list_id %}" class="btn btn-danger pull-right">
+                    {% trans 'Unsubscribe All' %}</a>
+            </div>
+        </div>
+    </form>
 
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index 5f0258c..aff0d83 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -8,26 +8,28 @@
 {% endblock %}
 
 {% block main %}
+
     {% list_nav 'mass_subscribe' 'Mass Subscription' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Mass Subscription' %}</h1></div>
-        <div class="panel-body">
-            <form action="{% url 'mass_subscribe' list.list_id %}" method="post" class="form-horizontal">
-                {% csrf_token %}
-                {% if form.non_field_errors %}
-                    <div class="alert alert-danger">
-                        {{ form.non_field_errors }}
-                    </div>
-                {% endif %}
-                <div class="form-group">
-                    {% if form.emails.errors %}
-                        <div class="alert alert-danger">{{ form.emails.errors }}</div>
-                    {% endif %}
-                    <label class="control-label col-md-2" for="{{ form.emails.id_for_label }}">{{ form.emails.label }}:</label>
-                    <div class="col-md-8">{{ form.emails|add_form_control }}</div>
-                </div>
-                <button class="col-md-offset-2 btn btn-primary" type="submit">{% trans 'Subscribe users' %}</button>
-            </form>
+
+    <form action="{% url 'mass_subscribe' list.list_id %}" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% if form.non_field_errors %}
+            <div class="alert alert-danger">
+                {{ form.non_field_errors }}
+            </div>
+        {% endif %}
+        <div class="form-group {% if form.emails.errors %}has-error{% endif %}">
+            {% if form.emails.errors %}
+                <div class="alert alert-danger">{{ form.emails.errors }}</div>
+            {% endif %}
+            <label class="control-label col-md-2" for="{{ form.emails.id_for_label }}">{{ form.emails.label }}</label>
+            <div class="col-md-8">{{ form.emails|add_form_control }}</div>
         </div>
-    </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-8">
+                <button class="btn btn-primary" type="submit">{% trans 'Subscribe users' %}</button>
+            </div>
+        </div>
+    </form>
+
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html
index 8360794..47ade42 100644
--- a/src/postorius/templates/postorius/lists/memberoptions.html
+++ b/src/postorius/templates/postorius/lists/memberoptions.html
@@ -8,53 +8,47 @@
 {% endblock %}
 
 {% block main %}
-    {% list_nav 'list_members' 'Member Options' %}
+
+    {% list_nav 'list_members' 'Member options' mm_member.email %}
+
     {% if not user.is_superuser and not user.is_list_owner %}
         <h1>{% trans 'No Preferences Available' %}</h1>
         <p>{% trans 'You are not the owner for this list' %}</p>
     {% else %}
-        <div class="panel panel-default">
-            <div class="panel-heading"><h1 class="panel-title">{% trans 'Preferences for Member' %} {{ mm_member.email }}</h1></div>
-            <div class="panel-body">
-                <form  action="" method="post" >
-                    {% csrf_token %}
-                    <div class="table-responsive">
-                        <table class="table table-bordered table-striped" border="2">
-                            <thead>
-                                <tr>
-                                    <th class="col-md-10">{% trans 'Preference' %}</th>
-                                    <th class="col-md-2">{% trans 'Setting' %} </th>
-                                </tr>
-                            </thead >
-                           {% for field in settingsform %}
-                           <tr>
-                                <td>
-                                    <p>{{ field.label_tag }}</p>
-                                    <span id="help-{{ field.label }}" class="help-block">
-                                        {{ field.help_text }}
-                                    </span>
-                                </td>
-                                <td class="text-center">
-                                    {% if field|fieldtype == 'RadioSelect' %}
-                                        {% for choice in field %}
-                                            <label class="radio-inline">
-                                                {{ choice.tag }}
-                                                {{ choice.choice_label }}
-                                            </label>
-                                        {% endfor %}
-                                    {% else %}
-                                        {{ field|add_form_control }}
-                                    {% endif %}
-                                </td>
-                           </tr>
-                           {% endfor %}
-                        </table>
+        <form action="{% url 'list_member_options' list.list_id mm_member.email %}" method="post" class="form-horizontal">
+            {% csrf_token %}
+            {% for field in settingsform %}
+                <div class="form-group {% if field.errors %}has-errors{% endif %}">
+                    {% if field.errors %}
+                        <div class="alert alert-danger">{{ field.errors }}</div>
+                    {% endif %}
+                    <label class="control-label col-md-3" for="{{ field.id_for_label }}">
+                        {{ field.label }}
+                    </label>
+                    <div class="col-md-8">
+                    {% if field|fieldtype == 'RadioSelect' %}
+                        {% for choice in field %}
+                            <label class="radio-inline">
+                                {{ choice.tag }}
+                                {{ choice.choice_label }}
+                            </label>
+                        {% endfor %}
+                        </td>
+                    {% else %}
+                        {{ field|add_form_control }}
+                    {% endif %}
                     </div>
-                    <div class="text-center">
-                        <button class="btn btn-success" type="submit">{% trans 'Save' %}</button>
-                    </div>
-                </form>
+                    <p id="help-{{ field.id_for_label }}" class="col-md-offset-3 col-md-8 help-block">
+                        {{ field.help_text }}
+                    </p>
+                </div>
+           {% endfor %}
+            <div class="form-group">
+                <div class="col-md-offset-3 col-md-8">
+                    <button class="btn btn-primary" type="submit">{% trans 'Save changes' %}</button>
+                </div>
             </div>
-        </div>
+        </form>
+
     {% endif %}
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index ed0d4d3..a5a0ef3 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -8,80 +8,81 @@
 {% endblock %}
 
 {% block main %}
-    {% list_nav 'list_members' 'List Members' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{{ page_title }}</h1></div>
-        <div class="panel-body">
-            {% if not member_form %}
-                <div class="row">
-                    <div class="col-md-2">
-                        <a href="{% url 'unsubscribe_all' list.list_id %}" class="btn btn-danger">{% trans 'Unsubscribe all' %}</a>
-                    </div>
-                    <form action="{% url 'csv_view' list.list_id %}" method="post" class="col-md-2 col-md-offset-8 text-right">
-                        {% csrf_token %}
-                        <button type="submit" class="btn btn-default">{% trans 'CSV Export' %}</button>
-                    </form>
-                </div>
-            {% else %}
+
+    {% list_nav 'list_members' page_title %}
+
+    {% if role != 'subscribers' %}
+        <form action="{% url 'list_members_view' list.list_id role %}" method="post" class="form-inline">
+            {% csrf_token %}
+            <div class="form-group {% if member_form.email.errors %}has-error{% endif %}">
                 {% if member_form.email.errors %}
-                <div class="alert alert-danger">
-                  {{ member_form.email.errors }}
-                </div>
+                    <div class="alert alert-danger">{{ member_form.email.errors }}</div>
                 {% endif %}
-                <form action="" method="POST" class="form-inline">
-                  {% csrf_token %}
-                  {{ member_form.email.label_tag }}
-                  {{ member_form.email|add_form_control }}
-                  <button type="submit" class="btn btn-default">{{ form_action }}</button>
-                </form>
-            {% endif %}
-            <hr />
-            {% if members|length > 0 %}
-                <form action="" method="POST">
-                    {% csrf_token %}
-                    {% if form.choices.errors %}
-                        <div class="alert alert-danger">{{ form.choices.errors }}</div>
-                    {% endif %}
-                    <div class="table-responsive">
-                        <table class="table table-bordered table-striped">
-                            <thead>
-                                <tr>
-                                    {% if not member_form %}
-                                        <th><input type="checkbox" id="all-members-checkbox"/></th>
-                                    {% endif %}
-                                    <th>{% trans 'Address' %}</th>
-                                    <th>
-                                      {% if not member_form %}
-                                          <input type="submit" class="btn btn-xs btn-warning" value="{% trans 'Remove selected' %}" />
-                                      {% endif %}
-                                    </th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for member in members %}
-                                    <tr>
-                                        {% if not member_form %}
-                                          <td><input type="checkbox" class="member-checkbox" name="choices" id="id_choices_{{ forloop.counter0 }}" value="{{ member.email }}" /></td>
-                                            <td><a href="{% url 'list_member_options' list.list_id member.email %}">{{ member.email }}</a></td>
-                                            <td><a href="{% url 'list_unsubscribe' list.list_id member.email %}" class="btn btn-xs btn-danger">{% trans 'Unsubscribe' %}</a></td>
-                                        {% else %}
-                                            <td>{{ member }}</td>
-                                            <td><a href="{% url 'remove_role' list.list_id role member %}" class="btn btn-xs btn-danger">{% trans 'Delete' %}</a></td>
-                                        {% endif %}
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                    </div>
-                </form>
-                {% if not member_form %}
-                    {% include 'postorius/_pagination.html' with page=members %}
-                {% endif %}
-            {% else %}
-                <p>{{ empty_error }}</p>
-            {% endif %}
+                {{ member_form.email.label_tag }}
+                {{ member_form.email|add_form_control }}
+            </div>
+          <button type="submit" class="btn btn-default">{{ form_action }}</button>
+        </form>
+    {% endif %}
+
+    {% if role == 'subscribers' %}
+        <div class="row">
+            <div class="col-md-2">
+                <a href="{% url 'unsubscribe_all' list.list_id %}" class="btn btn-danger">{% trans 'Unsubscribe all' %}</a>
+            </div>
+            <div class="col-md-2 col-md-offset-8 text-right">
+                <a href="{% url 'csv_view' list.list_id %}" class="btn btn-default">
+                   {% trans 'CSV Export' %}
+                </a>
+            </div>
         </div>
-    </div>
+    {% endif %}
+
+    {% if members|length > 0 %}
+        <form action="{% url 'list_members_view' list.list_id role %}" method="post">
+            {% csrf_token %}
+            {% if form.choices.errors %}
+                <div class="alert alert-danger">{{ form.choices.errors }}</div>
+            {% endif %}
+            <div class="table-responsive">
+                <table class="table table-bordered table-striped">
+                    <thead>
+                        <tr>
+                            {% if role == 'subscribers' %}
+                                <th><input type="checkbox" id="all-members-checkbox"/></th>
+                            {% endif %}
+                            <th>{% trans 'Address' %}</th>
+                            <th>
+                              {% if role == 'subscribers' %}
+                                  <input type="submit" class="btn btn-xs btn-warning" value="{% trans 'Remove selected' %}" />
+                              {% endif %}
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for member in members %}
+                            <tr>
+                                {% if role == 'subscribers' %}
+                                  <td><input type="checkbox" class="member-checkbox" name="choices" id="id_choices_{{ forloop.counter0 }}" value="{{ member.email }}" /></td>
+                                    <td><a href="{% url 'list_member_options' list.list_id member.email %}">{{ member.email }}</a></td>
+                                    <td><a href="{% url 'list_unsubscribe' list.list_id member.email %}" class="btn btn-xs btn-danger">{% trans 'Unsubscribe' %}</a></td>
+                                {% else %}
+                                    <td>{{ member }}</td>
+                                    <td><a href="{% url 'remove_role' list.list_id role member %}" class="btn btn-xs btn-danger">{% trans 'Delete' %}</a></td>
+                                {% endif %}
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </form>
+        {% if role == 'subscribers' %}
+            {% include 'postorius/_pagination.html' with page=members %}
+        {% endif %}
+    {% else %}
+        <p>{{ empty_error }}</p>
+    {% endif %}
+
 {% endblock main %}
 {% block additionaljs %}
 <script>
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index ef4804a..d37311b 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -8,47 +8,47 @@
 {% endblock %}
 
 {% block main %}
-    {% list_nav 'list_settings' 'Settings' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'List Settings' %}</h1></div>
-        <div class="panel-body">
-            <ul class="nav nav-tabs">
-                {% for section in section_names %}
-                <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url 'list_settings' list_id=list.list_id visible_section=section.0 %}">{{ section.1 }}</a></li>
-                {% endfor %}
-            </ul>
-            <br>
-            <form action="{% url 'list_settings' list_id=list.list_id visible_section=visible_section %}" method="post" class="form-horizontal list_settings">
-                {% csrf_token %}
-                {% for field in form %}
-                    <div class="form-group">
-                        {% if field.errors %}
-                            <div class="alert alert-danger">{{ field.errors }}</div>
-                        {% endif %}
-                        <label class="control-label col-md-2" for="{{ field.id_for_label }}">
-                            {{ field.label }}:
+
+    {% list_nav 'list_settings' 'List Settings' %}
+
+    <ul class="nav nav-tabs">
+        {% for section in section_names %}
+        <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url 'list_settings' list_id=list.list_id visible_section=section.0 %}">{{ section.1 }}</a></li>
+        {% endfor %}
+    </ul>
+
+    <form action="{% url 'list_settings' list_id=list.list_id visible_section=visible_section %}" method="post" class="form-horizontal list_settings">
+        {% csrf_token %}
+        {% for field in form %}
+            <div class="form-group {% if field.errors %}has-errors{% endif %}">
+                {% if field.errors %}
+                    <div class="alert alert-danger">{{ field.errors }}</div>
+                {% endif %}
+                <label class="control-label col-md-3" for="{{ field.id_for_label }}">
+                    {{ field.label }}
+                </label>
+                <div class="col-md-8">
+                {% if field|fieldtype == 'RadioSelect' %}
+                    {% for choice in field %}
+                        <label class="radio-inline">
+                            {{ choice.tag }}
+                            {{ choice.choice_label }}
                         </label>
-                        <div class="col-md-8">
-                        {% if field|fieldtype == 'RadioSelect' %}
-                            {% for choice in field %}
-                                <label class="radio-inline">
-                                    {{ choice.tag }}
-                                    {{ choice.choice_label }}
-                                </label>
-                            {% endfor %}
-                        {% else %}
-                            {{ field|add_form_control }}
-                        {% endif %}
-                        </div>
-                        <div class="row">
-                        <span id="help-{{ field.label }}" class="col-md-offset-2 col-md-8 help-block">
-                            {{ field.help_text }}
-                        </span>
-                            </div>
-                    </div>
-                {% endfor %}
-                <button class="col-md-offset-2 btn btn-primary btn-success" type="submit">{% trans 'Save changes' %}</button>
-            </form>
+                    {% endfor %}
+                {% else %}
+                    {{ field|add_form_control }}
+                {% endif %}
+                </div>
+                <p id="help-{{ field.id_for_label }}" class="col-md-offset-3 col-md-8 help-block">
+                    {{ field.help_text }}
+                </p>
+            </div>
+        {% endfor %}
+        <div class="form-group">
+            <div class="col-md-offset-3 col-md-8">
+                <button class="btn btn-primary" type="submit">{% trans 'Save changes' %}</button>
+            </div>
         </div>
-    </div>
+    </form>
+
 {% endblock %}
diff --git a/src/postorius/templates/postorius/lists/subscription_requests.html b/src/postorius/templates/postorius/lists/subscription_requests.html
index 4e043ff..bc61870 100644
--- a/src/postorius/templates/postorius/lists/subscription_requests.html
+++ b/src/postorius/templates/postorius/lists/subscription_requests.html
@@ -3,37 +3,33 @@
 {% load nav_helpers %}
 
 {% block main %}
-    {% list_nav 'list_subscription_requests' 'Subscription Requests' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Subscription Requests' %}</h1></div>
 
-        <div class="panel-body">
-            {% if list.requests|length > 0 %}
-                <div class="table-responsive">
-                    <table class="table table-bordered table-striped">
-                        <thead>
-                            <tr>
-                                <th>{% trans 'E-Mail Address' %}</th>
-                                <th>{% trans 'Actions' %}</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for request in list.requests %}
-                            <tr>
-                                <td>{{ request.email }}</td>
-                                <td>
-                                    <a href="{% url 'handle_subscription_request' list.list_id request.token 'accept' %}" class="btn btn-xs btn-success">{% trans 'Accept' %}</a>
-                                    <a href="{% url 'handle_subscription_request' list.list_id request.token 'reject' %}" class="btn btn-xs btn-danger">{% trans 'Reject' %}</a>
-                                    <a href="{% url 'handle_subscription_request' list.list_id request.token 'discard' %}" class="btn btn-xs btn-danger">{% trans 'Discard' %}</a>
-                                </td>
-                            </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-            {% else %}
-                <p>{% trans 'There are currently no subscription requests for this list.' %}</p>
-            {% endif %}
+    {% list_nav 'list_subscription_requests' 'Subscription Requests' %}
+
+    {% if list.requests|length > 0 %}
+        <div class="table-responsive">
+            <table class="table table-bordered table-striped">
+                <thead>
+                    <tr>
+                        <th>{% trans 'E-Mail Address' %}</th>
+                        <th>{% trans 'Actions' %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for request in list.requests %}
+                    <tr>
+                        <td>{{ request.email }}</td>
+                        <td>
+                            <a href="{% url 'handle_subscription_request' list.list_id request.token 'accept' %}" class="btn btn-xs btn-success">{% trans 'Accept' %}</a>
+                            <a href="{% url 'handle_subscription_request' list.list_id request.token 'reject' %}" class="btn btn-xs btn-danger">{% trans 'Reject' %}</a>
+                            <a href="{% url 'handle_subscription_request' list.list_id request.token 'discard' %}" class="btn btn-xs btn-danger">{% trans 'Discard' %}</a>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
         </div>
-    </div>
+    {% else %}
+        <p>{% trans 'There are currently no subscription requests for this list.' %}</p>
+    {% endif %}
 {% endblock %}
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 0576cb1..8974803 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -8,85 +8,96 @@
 {% endblock %}
 
 {% block main %}
+
     {% if user.is_superuser or user.is_list_owner or user.is_list_moderator %}
         {% list_nav 'list_summary' 'Summary' %}
     {% endif %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Summary' %}</h1></div>
-        <div class="panel-body">
-            <h1>{{list.display_name }} - {{ list.fqdn_listname }}</h1>
-            <p>{{ list.settings.description }}</p>
-            {% if hyperkitty_url %}
-                {% url 'hk_list_overview' list.fqdn_listname as hyperkitty_list_url %}
-                {% blocktrans %}
-                  <p>To see the prior postings to this list, visit
-                  <a href="{{ hyperkitty_list_url }}">the archives</a>.</p>
-                {% endblocktrans %}
-            {% endif %}
-            {% trans 'To contact the list owners, use the following email address' %}: <em>{{ list.settings.owner_address }}</em>
-            {% if user.is_authenticated %}
-                {% if userSubscribed %}
-                    <p>
-                        {% trans 'You are subscribed to this list with the following address' %}: <em>{{ subscribed_address }}</em>
-                    </p>
-                    <hr />
-                    <form action="{% url 'change_subscription' list.list_id %}" method="POST" class="form-horizontal">
-                        {% csrf_token %}
-                        {% if change_subscription_form.non_field_errors %}
-                            <div class="alert alert-danger">{{ change_subscription_form.non_field_erros }}</div>
-                        {% endif %}
-                        {% for field in change_subscription_form %}
-                            <div class="form-group">
-                                {% if field.errors %}
-                                    <div class="alert alert-danger">{{ field.errors }}</div>
-                                {% endif %}
-                                <label class="control-label col-md-2" for="{{ field.id_for_label }}">{{ field.label }}:</label>
-                                <div class="col-md-8">{{ field|add_form_control }}</div>
-                            </div>
-                        {% endfor %}
-                        <input class="col-md-offset-2 btn btn-success" type="submit" value="{% trans 'Change Subscription' %}">
-                    </form>
-                    <hr />
-                    <a href="{% url 'list_unsubscribe' list.list_id subscribed_address %}" class="col-md-offset-2 btn btn-danger">{% trans 'Unsubscribe' %} {{ subscribed_address }}</a>
-                {% else %}
-                    <h2>{% trans 'Subscribe to this list' %}</h2>
-                    <form action="{% url 'list_subscribe' list.list_id %}" method="post" class="form-horizontal">
-                        {% csrf_token %}
-                        {% if subscribe_form.non_field_errors %}
-                            <div class="alert alert-danger">{{ subscribe_form.non_field_erros }}</div>
-                        {% endif %}
-                        {% for field in subscribe_form %}
-                            <div class="form-group">
-                                {% if field.errors %}
-                                    <div class="alert alert-danger">{{ field.errors }}</div>
-                                {% endif %}
-                                <label class="control-label col-md-2" for="{{ field.id_for_label }}">{{ field.label }}:</label>
-                                <div class="col-md-8">{{ field|add_form_control }}</div>
-                            </div>
-                        {% endfor %}
-                        <input class="col-md-offset-2 btn btn-success" type="submit" value="{% trans 'Subscribe' %}" />
-                    </form>
+
+    <p>{{ list.settings.description }}</p>
+    <p>{% trans 'To contact the list owners, use the following email address:' %} <em>{{ list.settings.owner_address }}</em></p>
+
+    {# Archives #}
+    {% if hyperkitty_url %}
+        {% url 'hk_list_overview' list.fqdn_listname as hyperkitty_list_url %}
+        {% blocktrans %}
+          <p>To see the prior postings to this list, visit
+          <a href="{{ hyperkitty_list_url }}">the archives</a>.</p>
+        {% endblocktrans %}
+    {% endif %}
+
+    <hr />
+
+    {# Subscription #}
+    <h4>{% trans 'Subscription' %}</h4>
+    {% if user.is_authenticated %}
+        {% if userSubscribed %}
+            <p>
+                {% trans 'You are subscribed to this list with the following address:' %} <em>{{ subscribed_address }}</em>
+            </p>
+            <form action="{% url 'change_subscription' list.list_id %}" method="post" class="form-horizontal">
+                {% csrf_token %}
+                {% if change_subscription_form.non_field_errors %}
+                    <div class="alert alert-danger">{{ change_subscription_form.non_field_errors }}</div>
                 {% endif %}
-            {% else %}
-                <p>{% trans 'You have to log in to subscribe to this list.' %}</p>
-                <p><a href="{% url 'user_login' %}"class="btn btn-primary">{% trans 'Log In' %}</a></p>
-            {% endif %}
-            {% if user.is_authenticated %}
-                {% if user.is_list_owner or user.is_superuser %}
-                <hr />
-                <div class="panel panel-default">
-                    <div class="panel-heading">{% trans 'List metrics' %}</div>
-                    <div class="panel-body">
-                        <dl class="dl-horizontal">
-                          <dt>{% trans 'Created at' %}:</dt><dd>{{ list.settings.created_at }}</dd>
-                          <dt>{% trans 'Last post at' %}:</dt><dd>{{ list.settings.last_post_at }}</dd>
-                          <dt>{% trans 'Digest last sent at' %}:</dt><dd>{{ list.settings.digest_last_sent_at }}</dd>
-                          <dt>{% trans 'Volume' %}:</dt><dd>{{ list.settings.volume }}</dd>
-                        </dl>
+                {% for field in change_subscription_form %}
+                    <div class="form-group {% if field.errors %}has-error{% endif %}">
+                        {% if field.errors %}
+                            <div class="alert alert-danger">{{ field.errors }}</div>
+                        {% endif %}
+                        <label class="control-label col-md-2" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                        <div class="col-md-8">{{ field|add_form_control }}</div>
+                    </div>
+                {% endfor %}
+                <div class="form-group">
+                    <div class="col-md-offset-2 col-md-8">
+                        <input class="btn btn-primary" type="submit" value="{% trans 'Change Subscription' %}">
                     </div>
                 </div>
+            </form>
+            <p class="col-md-offset-2">
+                <a href="{% url 'list_unsubscribe' list.list_id subscribed_address %}" class="btn btn-danger">
+                    {% trans 'Unsubscribe' %} {{ subscribed_address }}
+                </a>
+            </p>
+        {% else %}
+            <h2>{% trans 'Subscribe to this list' %}</h2>
+            <form action="{% url 'list_subscribe' list.list_id %}" method="post" class="form-horizontal">
+                {% csrf_token %}
+                {% if subscribe_form.non_field_errors %}
+                    <div class="alert alert-danger">{{ subscribe_form.non_field_errors }}</div>
                 {% endif %}
-            {% endif %}
-        </div>
-    </div>
+                {% for field in subscribe_form %}
+                    <div class="form-group {% if field.errors %}has-error{% endif %}">
+                        {% if field.errors %}
+                            <div class="alert alert-danger">{{ field.errors }}</div>
+                        {% endif %}
+                        <label class="control-label col-md-2" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                        <div class="col-md-8">{{ field|add_form_control }}</div>
+                    </div>
+                {% endfor %}
+                <div class="form-group">
+                    <div class="col-md-offset-2 col-md-8">
+                        <input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" />
+                    </div>
+                </div>
+            </form>
+        {% endif %}
+    {% else %}
+        <p>{% trans 'You have to log in to subscribe to this list.' %}</p>
+        <p><a href="{% url 'user_login' %}"class="btn btn-primary">{% trans 'Log In' %}</a></p>
+    {% endif %}
+
+    {# List metrics #}
+    {% if user.is_authenticated %}
+        {% if user.is_list_owner or user.is_superuser %}
+            <hr />
+            <h4>{% trans 'List metrics' %}</h4>
+            <dl class="dl-horizontal">
+              <dt>{% trans 'Created at' %}</dt><dd>{{ list.settings.created_at }}</dd>
+              <dt>{% trans 'Last post at' %}</dt><dd>{{ list.settings.last_post_at }}</dd>
+              <dt>{% trans 'Digest last sent at' %}</dt><dd>{{ list.settings.digest_last_sent_at }}</dd>
+              <dt>{% trans 'Volume' %}</dt><dd>{{ list.settings.volume }}</dd>
+            </dl>
+        {% endif %}
+    {% endif %}
 {% endblock %}
diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html
index bc3ea1a..29122ca 100644
--- a/src/postorius/templates/postorius/menu/list_nav.html
+++ b/src/postorius/templates/postorius/menu/list_nav.html
@@ -1,5 +1,14 @@
 {% load i18n %}
 {% load nav_helpers %}
+
+<ol class="breadcrumb">
+    <li><a href="{% url 'list_index' %}">{% trans 'Lists' %}</a></li>
+    <li><a href="{% url 'list_summary' list.list_id %}">{{ list.fqdn_listname }}</a></li>
+    {% if title %}
+    <li class="active">{{ title }}</li>
+    {% endif %}
+</ol>
+
 <nav class="navbar navbar-default">
     <div class="container-fluid">
         <div class="navbar-header">
@@ -9,7 +18,6 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand">{{ list.fqdn_listname }}</a>
         </div>
         <div class="collapse navbar-collapse" id="settings-nav">
             {% if user.is_authenticated  %}
@@ -41,3 +49,11 @@
         </div>
     </div>
 </nav>
+
+<div class="page-header">
+    {% if current == 'list_summary' %}
+        <h1>{{ list.display_name }} <small>{{ list.fqdn_listname }}</small></h1>
+    {% else %}
+        <h2>{{ title }} {% if subtitle %}<small>{{ subtitle }}</small>{% endif %}</h2>
+    {% endif %}
+</div>
diff --git a/src/postorius/templatetags/nav_helpers.py b/src/postorius/templatetags/nav_helpers.py
index 198050b..d85f248 100644
--- a/src/postorius/templatetags/nav_helpers.py
+++ b/src/postorius/templatetags/nav_helpers.py
@@ -24,22 +24,18 @@
 
 
 @register.inclusion_tag('postorius/menu/list_nav.html', takes_context=True)
-def list_nav(context, current, title=None):
-    if title is None:
-        title = ''
+def list_nav(context, current, title='', subtitle=''):
     return dict(list=context['list'],
                 current=current,
                 user=context['request'].user,
-                title=title)
+                title=title, subtitle=subtitle)
 
 
 @register.inclusion_tag('postorius/menu/user_nav.html', takes_context=True)
-def user_nav(context, current, title=None):
-    if title is None:
-        title = ''
+def user_nav(context, current, title='', subtitle=''):
     return dict(current=current,
                 user=context['request'].user,
-                title=title)
+                title=title, subtitle=subtitle)
 
 
 @register.simple_tag
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index d7c94d1..7da7df0 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -44,11 +44,10 @@
 logger = logging.getLogger(__name__)
 
 
-"""Display all members of a given list.
-"""
 @login_required
 @list_owner_required
 def list_members_view(request, list_id, role=None):
+    """Display all members of a given list."""
     if role not in ['owners', 'moderators', 'subscribers']:
         return redirect('list_members', list_id, 'subscribers')
     mailing_list = List.objects.get_or_404(fqdn_listname=list_id)
@@ -81,6 +80,7 @@
         member_form = MemberForm()
     context = {
         'list': mailing_list,
+        'role': role,
     }
     if role == 'subscribers':
         context['members'] = utils.paginate(
@@ -96,13 +96,11 @@
             context['members'] = mailing_list.owners
             context['page_title'] = _('List Owners')
             context['form_action'] = _('Add Owner')
-            context['role'] = 'owner'
         elif role == 'moderators':
             context['members'] = mailing_list.moderators
             context['page_title'] = _('List Moderators')
             context['empty_error'] = _('List has no Moderators')
             context['form_action'] = _('Add Moderator')
-            context['role'] = 'moderator'
     return render(request, 'postorius/lists/members.html', context)
 
 
@@ -696,23 +694,26 @@
 @list_owner_required
 def remove_role(request, list_id=None, role=None, address=None,
                 template='postorius/lists/confirm_remove_role.html'):
-    """Removes a list moderator or owner.
-    """
+    """Removes a list moderator or owner."""
     try:
         the_list = List.objects.get_or_404(fqdn_listname=list_id)
     except MailmanApiError:
         return utils.render_api_error(request)
 
-    redirect_on_success = redirect('list_members', the_list.list_id, '{}s'.format(role))
+    redirect_on_success = redirect('list_members', the_list.list_id, role)
+    role_singular = role.rstrip('s')
 
-    if role == 'owner':
-        owners = the_list.owners
-        if address not in owners:
-            messages.error(request, _('The user %s is not an owner') % address)
-            return redirect('list_members', the_list.list_id, 'owners')
-        if len(owners) == 1:
+    roster = getattr(the_list, role)
+    if address not in roster:
+        messages.error(request,
+            _('The user %(email)s is not in the %(role)s group',
+            email=address, role=role))
+        return redirect('list_members', the_list.list_id, role)
+
+    if role == 'owners':
+        if len(roster) == 1:
             messages.error(request, _('Removing the last owner is impossible'))
-            return redirect('list_members', the_list.list_id, 'owners')
+            return redirect('list_members', the_list.list_id, role)
         # the user may not have a other_emails property if it's a superuser
         user_addresses = set([request.user.email]) | \
             set(getattr(request.user, 'other_emails', []))
@@ -720,21 +721,18 @@
             # The user is removing themselves, redirect to the list info page
             # because they won't have access to the members page anyway.
             redirect_on_success = redirect('list_summary', the_list.list_id)
-    elif role == 'moderator':
-        if address not in the_list.moderators:
-            messages.error(request, _('The user %s is not a moderator') % address)
-            return redirect('list_members', the_list.list_id, 'moderators')
+
     if request.method == 'POST':
         try:
-            the_list.remove_role(role, address)
+            the_list.remove_role(role_singular, address)
         except MailmanApiError:
             return utils.render_api_error(request)
         except HTTPError as e:
-            messages.error(request, _('The %(role)s could not be removed: %(msg)s') %
-                           {'role':role, 'msg': e.msg})
-            return redirect('list_members', the_list.list_id, '{}s'.format(role))
-        messages.success(request, _('The user %(address)s has been removed as %(role)s.') %
-                         {'address': address, 'role': role})
+            messages.error(request, _('The user could not be removed: %(msg)s',
+                           msg=e.msg))
+            return redirect('list_members', the_list.list_id, role)
+        messages.success(request, _('The user %(address)s has been removed from the %(role)s group.',
+                         address=address, role=role))
         return redirect_on_success
     return render_to_response(template,
                               {'role': role, 'address': address,
@@ -796,7 +794,7 @@
             except Exception as e:
                 messages.error(request, e)
         return render_to_response('postorius/lists/confirm_removeall_subscribers.html',
-                                 {'list_id': mlist.list_id},
+                                 {'list': mlist},
                                  context_instance=RequestContext(request))
     except MailmanApiError:
         return utils.render_api_error(request)