diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index e553ae8..f4bef91 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -21,48 +21,48 @@
                 {{ member_form.email.label_tag }}
                 {{ member_form.email|add_form_control }}
             </div>
-          <button type="submit" class="btn btn-default">{{ form_action }}</button>
+            <button type="submit" class="btn btn-default">{{ form_action }}</button>
         </form>
     {% endif %}
 
     {% if role == 'subscriber' %}
-        <div class="row margin-bottom">
-            <div class="col-md-6">
-                <form action="{% url 'list_members' list.list_id role %}" method="get" class="form-inline">
-                    <div class="input-group">
-                        <input type="text" name="q" value="{{ query }}" class="form-control" autofocus placeholder="{% trans 'Search members...' %}" />
-                        <span class="input-group-btn">
-                            <button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search"></span></button>
-                        </span>
-                    </div>
-                </form>
-            </div>
-            <div class="col-md-6 text-right">
-                <a href="{% url 'csv_view' list.list_id %}" class="btn btn-default">
-                   {% trans 'CSV Export' %}
-                </a>
-            </div>
+        {% if form.choices.errors %}
+            <div class="alert alert-danger">{{ form.choices.errors }}</div>
+        {% endif %}
+        <div class="pull-left margin-bottom">
+            <form action="{% url 'list_members' list.list_id role %}" method="get" class="form-inline">
+                <div class="input-group">
+                    <input type="text" name="q" value="{{ query }}" class="form-control" placeholder="{% trans 'Search members...' %}" />
+                    <span class="input-group-btn">
+                        <button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search"></span></button>
+                    </span>
+                </div>
+            </form>
         </div>
     {% endif %}
 
     {% if members|length > 0 %}
-        <form action="{% url 'list_members' list.list_id role %}" method="post">
+        {% if role == 'subscriber' %}
+            <form action="{% url 'list_members' list.list_id role %}" method="post" id="unsubscribe-form">
             {% csrf_token %}
-            {% if form.choices.errors %}
-                <div class="alert alert-danger">{{ form.choices.errors }}</div>
-            {% endif %}
-            <div class="table-responsive">
+            <input type="submit" class="hidden" />
+            <div class="pull-right">
+                <a href="{% url 'csv_view' list.list_id %}" class="btn btn-default">
+                   {% trans 'CSV Export' %}
+                </a>
+                <button class="btn btn-warning" id="unsubscribe-selected-btn">Unsubscribe Selected</button>
+                <a href="{% url 'unsubscribe_all' list.list_id %}" class="btn btn-danger">{% trans 'Unsubscribe All' %}</a>
+            </div>
+        {% endif %}
+            <div class="table-responsive" style="clear:both">
                 <table class="table table-bordered table-striped">
                     <thead>
                         <tr>
-                            {% if role == 'subscriber' %}
-                                <th><input type="checkbox" id="all-members-checkbox"/></th>
-                            {% endif %}
-                            <th>{% trans 'Address' %}</th>
-                            <th>
+                            <th colspan="2">
                               {% if role == 'subscriber' %}
-                                  <input type="submit" class="btn btn-xs btn-warning" value="{% trans 'Remove selected' %}" />
+                                    <input type="checkbox" id="all-members-checkbox"/>
                               {% endif %}
+                              {% trans 'Address' %}
                             </th>
                         </tr>
                     </thead>
@@ -70,9 +70,15 @@
                         {% for member in members %}
                             <tr>
                                 {% if role == 'subscriber' %}
-                                  <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>
+                                  <td>
+                                    <label class="checkbox-inline">
+                                    <input type="checkbox" class="member-checkbox" name="choices" id="id_choices_{{ forloop.counter0 }}" value="{{ member.email }}" />
+                                    {{ member.email }}
+                                    </label>
+                                  </td>
+                                  <td>
+                                    <a href="{% url 'list_member_options' list.list_id member.email %}">{% trans 'Member Options' %}</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>
@@ -82,11 +88,8 @@
                     </tbody>
                 </table>
             </div>
-        </form>
         {% if role == 'subscriber' %}
-            <div class="margin-bottom">
-                <a href="{% url 'unsubscribe_all' list.list_id %}" class="btn btn-danger">{% trans 'Unsubscribe all' %}</a>
-            </div>
+            </form>
             {% include 'postorius/lib/pagination.html' with page=members %}
         {% endif %}
     {% else %}
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 5ddfa51..4aa827c 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -39,9 +39,11 @@
             </p>
             {% endblocktrans %}
             <p>
-                <a href="{% url 'list_unsubscribe' list.list_id subscribed_address %}" class="btn btn-danger">
-                    {% trans 'Unsubscribe' %} {{ subscribed_address }}
-                </a>
+                <form method="post" action="{% url 'list_unsubscribe' list.list_id %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="email" value="{{ subscribed_address }}" />
+                    <button type="submit" class="btn btn-danger">{% trans 'Unsubscribe' %}</button>
+                </form>
             </p>
         {% else %}
             <h2>{% trans 'Subscribe to this list' %}</h2>
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index b22c656..5d2e0c1 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -34,8 +34,7 @@
     url(r'^subscribe$', list_views.ListSubscribeView.as_view(), name='list_subscribe'),
     url(r'^change_subscription$', list_views.ChangeSubscriptionView.as_view(),
         name='change_subscription'),
-    url(r'^unsubscribe/(?P<email>[^/]+)$', list_views.ListUnsubscribeView.as_view(),
-        name='list_unsubscribe'),
+    url(r'^unsubscribe/$', list_views.ListUnsubscribeView.as_view(), name='list_unsubscribe'),
     url(r'^subscription_requests$', list_views.list_subscription_requests,
         name='list_subscription_requests'),
     url(r'^handle_subscription_request/(?P<request_id>[^/]+)/(?P<action>[accept|reject|discard|defer]+)$',
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index b325630..5c7ff62 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -94,6 +94,7 @@
             paginator_class=utils.MailmanPaginator)
         context['empty_error'] = _('List has no Subscribers')
         context['count_options'] = [25, 50, 100, 200]
+        context['form'] = form
     else:
         context['member_form'] = member_form
         if role == 'owner':
@@ -272,8 +273,8 @@
     """Unsubscribe from a mailing list."""
 
     @method_decorator(login_required)
-    def get(self, request, *args, **kwargs):
-        email = kwargs['email']
+    def post(self, request, *args, **kwargs):
+        email = request.POST['email']
         try:
             self.mailing_list.unsubscribe(email)
             messages.success(request, _('%s has been unsubscribed from this list.') % email)
@@ -307,9 +308,9 @@
                     messages.error(request, _('The email address %s is not valid.') % email)
     else:
         form = ListMassSubscription()
-    return render_to_response('postorius/lists/mass_subscribe.html',
-                              {'form': form, 'list': mailing_list},
-                              context_instance=RequestContext(request))
+    return render(request, 'postorius/lists/mass_subscribe.html',
+                  {'form': form, 'list': mailing_list},
+                  context_instance=RequestContext(request))
 
 
 class ListMassRemovalView(MailingListView):
@@ -320,9 +321,9 @@
     @method_decorator(list_owner_required)
     def get(self, request, *args, **kwargs):
         form = ListMassRemoval()
-        return render_to_response('postorius/lists/mass_removal.html',
-                                  {'form': form, 'list': self.mailing_list},
-                                  context_instance=RequestContext(request))
+        return render(request, 'postorius/lists/mass_removal.html',
+                      {'form': form, 'list': self.mailing_list},
+                      context_instance=RequestContext(request))
 
     @method_decorator(list_owner_required)
     def post(self, request, *args, **kwargs):