diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/RIGS/index.html
index f3b4d1a7..d9ee6fb7 100644
--- a/RIGS/templates/RIGS/index.html
+++ b/RIGS/templates/RIGS/index.html
@@ -11,7 +11,7 @@
     </div>
     <div class="row">
     <div class="col-sm-{% if perms.RIGS.view_event %}6{% else %}12{% endif %}">
-        
+
         <div class="panel panel-default">
             <div class="panel-heading">
                  <h4 class="list-group-item-heading">Quick Links</h4>
@@ -29,58 +29,26 @@
                     <a class="list-group-item" href="http://members.nottinghamtec.co.uk/wiki/images/2/22/Event_Risk_Assesment.pdf" target="_blank"><span class="glyphicon glyphicon-link"></span> Pre-Event Risk Assessment</a>
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="glyphicon glyphicon-link"></span> Price List</a>
                     <a class="list-group-item" href="https://goo.gl/forms/jdPWov8PCNPoXtbn2" target="_blank"><span class="glyphicon glyphicon-link"></span> Subhire Insurance Form</a>
-                
+
             </div>
         </div>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-              <h4 class="panel-title">Search Rigboard 
-                <a href="{% url 'search_help' %}" class="pull-right modal-href"><span class="glyphicon glyphicon-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">
-                            <input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search Phrase" />
-                            <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="glyphicon glyphicon-search"></span> <span class="caret"></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 class="panel panel-default">
+          <div class="panel-heading">
+            <h4 class="panel-title">Search Rigboard
+                        <a href="{% url 'search_help' %}" class="pull-right modal-href"><span class="glyphicon glyphicon-question-sign"</span></a></h4>
+          </div>
+          <div class="list-group">
+            <div class="list-group-item">
+                {% include 'RIGS/omnibar.html' %}
             </div>
+          </div>
         </div>
+
     </div>
     {% if perms.RIGS.view_event %}
     <div class="col-sm-6">
-        {% include 'RIGS/activity_feed.html' %}    
+        {% include 'RIGS/activity_feed.html' %}
     </div>
     {% endif %}
 </div>
diff --git a/RIGS/templates/RIGS/omnibar.html b/RIGS/templates/RIGS/omnibar.html
new file mode 100644
index 00000000..88788b89
--- /dev/null
+++ b/RIGS/templates/RIGS/omnibar.html
@@ -0,0 +1,33 @@
+<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>
+<form id="searchForm" class="form {{form_class}}" role="form" method="GET">
+  <div class="input-group">
+    <input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search Phrase" />
+    <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="glyphicon glyphicon-search"></span> <span class="caret"></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>
diff --git a/templates/base_rigs.html b/templates/base_rigs.html
index febaba98..8ab18d50 100644
--- a/templates/base_rigs.html
+++ b/templates/base_rigs.html
@@ -23,7 +23,6 @@
                     <li><a href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span>
                         New Event</a></li>
                 {% endif %}
-
             </ul>
         </li>
     {% endif %}
@@ -51,4 +50,7 @@
     {% if perms.RIGS.view_venue %}
         <li><a href="{% url 'venue_list' %}">Venues</a></li>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+    {% if user.is_authenticated %}
+        <li class="navbar-right">{% include 'RIGS/omnibar.html' with form_class="navbar-form" %}</li>
+    {% endif %}
+{% endblock %}