diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index 1efaf84..f4bef91 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -21,42 +21,40 @@
                 {{ 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="" 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>
-            <div class="col-md-6 text-right">
+        {% 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 %}
+        {% if role == 'subscriber' %}
+            <form action="{% url 'list_members' list.list_id role %}" method="post" id="unsubscribe-form">
+            {% csrf_token %}
+            <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>
-        </div>
-    {% endif %}
-
-    {% if members|length > 0 %}
-        {% if role == 'subscriber' %}
-            <form action="" method="post" id="unsubscribe-form">
-            {% csrf_token %}
-            <input type="submit" class="hidden" />
-            {% if form.choices.errors %}
-                <div class="alert alert-danger">{{ form.choices.errors }}</div>
-            {% endif %}
         {% endif %}
-            <div class="table-responsive">
+            <div class="table-responsive" style="clear:both">
                 <table class="table table-bordered table-striped">
                     <thead>
                         <tr>
@@ -104,8 +102,5 @@
 $('#all-members-checkbox').change(function() {
   $('.member-checkbox').prop('checked', this.checked);
 });
-$('#unsubscribe-selected-btn').click(function() {
-  $('#unsubscribe-form').submit();
-});
 </script>
 {% endblock %}