diff --git a/RIGS/templates/partials/generic_list.html b/RIGS/templates/partials/generic_list.html
index 002bb027..8d75db38 100644
--- a/RIGS/templates/partials/generic_list.html
+++ b/RIGS/templates/partials/generic_list.html
@@ -1,20 +1,33 @@
 {% load url_replace from filters %}
 {% load orderby from filters %}
 {% load paginator from filters %}
-<div class="col-sm-12">{% paginator %}</div>
+<div class="row justify-content-end">
+    <a href="{% url create %}" class="btn btn-success">New <span
+            class="fas fa-plus"></span></a>
+</div>
+<div class="row justify-content-end">
+    <form class="form-inline py-3">
+        {% csrf_token %}
+        <div class="input-group pull-right">
+            <input type="search" name="query" placeholder="Search" value="{{ request.GET.query }}"
+                   class="form-control"/>
+            <span class="input-group-append"><button type="submit" class="btn btn-primary" id="id_search">Search</button></span>
+        </div>
+    </form>
+</div>
 <div class="table-responsive">
     <table class="table table-striped">
         <thead>
             <tr>
-                <td scope="col">#</td>
-                <td scope="col">Name<a href="?{% orderby request 'orderBy' 'name' %}"><span class="caret"></span></a></td>
-                <td scope="col">Email</td>
-                <td scope="col">Phone</td>
-                <td scope="col">Notes</td>
+                <th scope="col">#</th>
+                <th scope="col">Name<a href="?{% orderby request 'orderBy' 'name' %}"><span class="caret"></span></a></td>
+                <th scope="col">Email</th>
+                <th scope="col">Phone</th>
+                <th scope="col">Notes</th>
                 {% if union_account %} {#TODO#}
-                <td scope="col">Union Account</td>
+                <th scope="col">Union Account</th>
                 {% endif %}
-                <td scope="col">Quick Links</td>
+                <th scope="col">Quick Links</th>
             </tr>
         </thead>
         <tbody>
@@ -45,4 +58,6 @@
         </tbody>
     </table>
 </div>
+{% if is_paginated %}
 <div class="col-sm-12">{% paginator %}</div>
+{% endif %}
diff --git a/RIGS/templates/person_list.html b/RIGS/templates/person_list.html
index 70cbc605..296dfb47 100644
--- a/RIGS/templates/person_list.html
+++ b/RIGS/templates/person_list.html
@@ -11,18 +11,6 @@
         <div class="col-sm-10">
             <h3>People</h3>
         </div>
-        <div class="col-sm-2">
-            <a href="{% url 'person_create' %}" class="btn btn-primary pull-right">New <span
-                    class="fas fa-plus"></span></a>
-        </div>
-        <div class="col-sm-3 col-sm-offset-9">
-            <form class="form form-horizontal col-sm-12">
-                <div class="form-group">
-                    <input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
-                           class="form-control"/>
-                </div>
-            </form>
-        </div>
     </div>
-    {% include 'partials/generic_list.html' with edit="person_update" detail="person_detail" %}
+    {% include 'partials/generic_list.html' with edit="person_update" detail="person_detail" create="person_create" %}
 {% endblock %}
diff --git a/RIGS/views.py b/RIGS/views.py
index 85208e70..3b93dcd9 100644
--- a/RIGS/views.py
+++ b/RIGS/views.py
@@ -78,7 +78,7 @@ class PersonList(generic.ListView):
     paginate_by = 20
 
     def get_queryset(self):
-        q = self.request.GET.get('q', "")
+        q = self.request.GET.get('query', "")
 
         filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
 
@@ -143,7 +143,7 @@ class OrganisationList(generic.ListView):
     paginate_by = 20
 
     def get_queryset(self):
-        q = self.request.GET.get('q', "")
+        q = self.request.GET.get('query', "")
 
         filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
 
@@ -207,7 +207,7 @@ class VenueList(generic.ListView):
     paginate_by = 20
 
     def get_queryset(self):
-        q = self.request.GET.get('q', "")
+        q = self.request.GET.get('query', "")
 
         filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
 
diff --git a/assets/templates/supplier_list.html b/assets/templates/supplier_list.html
index 6ba6ba92..e7826c4f 100644
--- a/assets/templates/supplier_list.html
+++ b/assets/templates/supplier_list.html
@@ -9,15 +9,6 @@
     <h1>Supplier List</h1>
 </div>
 
-<form id="supplier-search-form" method="get" class="form-inline pull-right">
-    {% csrf_token %}
-    <div class="input-group pull-right" style="width: auto;">
-        {% render_field form.query|add_class:'form-control' placeholder='Search by Name' style="width: 250px"%}
-        <label for="query" class="sr-only">Name:</label>
-        <span class="input-group-btn"><button type="submit" class="btn btn-default" id="id_search">Search</button></span>
-    </div>
-</form>
-
-{% include 'partials/generic_list.html' with edit="supplier_update" detail="supplier_detail" %}
+{% include 'partials/generic_list.html' with edit="supplier_update" detail="supplier_detail" create="supplier_create" %}
 
 {% endblock %}