diff --git a/RIGS/templates/index.html b/RIGS/templates/index.html
index 66f78ccf..2247de51 100644
--- a/RIGS/templates/index.html
+++ b/RIGS/templates/index.html
@@ -41,50 +41,6 @@
                     {% endif %}
             </div>
         </div>
-
-        <div class="card card-default">
-            <div class="card-heading">
-              <h4 class="card-title">Search Rigboard
-                <a href="{% url 'search_help' %}" class="pull-right modal-href"><span class="fas fa-question-sign"</span></a></h4>
-            </div>
-            <script>
-                $(document).ready(function(){
-                    $('#search-options li a').click(function(){
-                        $('#searchForm').attr('action', $(this).data('action')).submit();
-                    });
-                    $('#id_search_input').keypress(function (e) {
-                      if (e.which == 13) {
-                        $('#searchForm').attr('action', $('#search-options li a').first().data('action')).submit();
-                        return false;
-                      }
-                    });
-
-                });
-            </script>
-            <div class="list-group">
-                <div class="list-group-item">
-                    <form id="searchForm" class="form" role="form" method="GET">
-                        <div class="input-group" data-toggle="tooltip" title="Use the dropdown button to select what to search. The default is Event Archive.">
-                            <input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search..." />
-                            <span class="input-group-btn">
-                                <div class="btn-group" role="group">
-                                    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="fas fa-search"></span> Search <span class="caret"></span></button>
-                                     <ul id="search-options" class="dropdown-menu">
-                                      <li><a data-action="{% url 'event_archive' %}" href="#">Events</a></li>
-                                      <li><a data-action="{% url 'person_list' %}" href="#">People</a></li>
-                                      <li><a data-action="{% url 'organisation_list' %}" href="#">Organisations</a></li>
-                                      <li><a data-action="{% url 'venue_list' %}" href="#">Venues</a></li>
-                                      {% if perms.RIGS.view_invoice %}
-                                      <li><a data-action="{% url 'invoice_archive' %}" href="#">Invoices</a></li>
-                                      {% endif %}
-                                    </ul>
-                                </div>
-                            </span>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
     </div>
     {% if perms.RIGS.view_event %}
     <div class="col-sm-6">
diff --git a/templates/base.html b/templates/base.html
index ad7bb1ff..f254dce9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,6 +21,8 @@
     {% block css %}
     {% endblock %}
 
+    <script src="{% static 'js/moment.js' %}"></script>
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
     <script src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script>
     <script>Raven.config('{% sentry_public_dsn %}').install()</script>
     {% block preload_js %}
@@ -85,10 +87,8 @@
 
 <div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
 
-<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
 <script src="{% static 'js/popper.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
-<script src="{% static 'js/moment.js' %}"></script>
 <script src="{% static 'js/fontawesome.min.js' %}"></script>
 <script>
     Date.prototype.getISOString = function () {
diff --git a/templates/base_rigs.html b/templates/base_rigs.html
index 9de44829..2589018b 100644
--- a/templates/base_rigs.html
+++ b/templates/base_rigs.html
@@ -51,4 +51,33 @@
 {% if perms.RIGS.view_venue %}
 <li class="nav-item"><a class="nav-link" href="{% url 'venue_list' %}">Venues</a></li>
 {% endif %}
+<script>
+    $(document).ready(function(){
+        $('#search-options option').click(function(){
+            $('#searchForm').attr('action', $(this).data('action')).submit();
+        });
+        $('#id_search_input').keypress(function (e) {
+          if (e.which == 13) {
+            $('#searchForm').attr('action', $('#search-options option').first().data('action')).submit();
+            return false;
+          }
+        });
+    });
+</script>
+<form id="searchForm" class="form form-inline" role="form" method="GET">
+  <input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search..." />
+  <div class="input-group-append">
+    <select class="custom-select form-control">
+      <option selected data-action="{% url 'event_archive' %}" href="#">Events</option>
+      <option data-action="{% url 'person_list' %}" href="#">People</option>
+      <option data-action="{% url 'organisation_list' %}" href="#">Organisations</option>
+      <option data-action="{% url 'venue_list' %}" href="#">Venues</option>
+      {% if perms.RIGS.view_invoice %}
+      <option data-action="{% url 'invoice_archive' %}" href="#">Invoices</option>
+      {% endif %}
+    </select>
+  </div>
+  <button class="btn btn-primary form-control"><span class="fas fa-search"></span> Search</button>
+</form>
+<a href="{% url 'search_help' %}" class="nav-link modal-href"><span class="fas fa-question"></span></a></h4>
 {% endblock %}