diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index 6d2fbbd6..b4b0440d 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -51,6 +51,7 @@ if DEBUG:
 
 # Application definition
 INSTALLED_APPS = (
+    'django_gulp',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
diff --git a/RIGS/finance.py b/RIGS/finance.py
index 061c81a8..38d8b883 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -21,7 +21,7 @@ forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
 
 class InvoiceIndex(generic.ListView):
     model = models.Invoice
-    template_name = 'RIGS/invoice_list_active.html'
+    template_name = 'invoice_list_active.html'
 
     def get_context_data(self, **kwargs):
         context = super(InvoiceIndex, self).get_context_data(**kwargs)
@@ -57,7 +57,7 @@ class InvoicePrint(generic.View):
     def get(self, request, pk):
         invoice = get_object_or_404(models.Invoice, pk=pk)
         object = invoice.event
-        template = get_template('RIGS/event_print.xml')
+        template = get_template('event_print.xml')
 
         context = {
             'object': object,
@@ -120,7 +120,7 @@ class InvoiceDelete(generic.DeleteView):
 
 class InvoiceArchive(generic.ListView):
     model = models.Invoice
-    template_name = 'RIGS/invoice_list_archive.html'
+    template_name = 'invoice_list_archive.html'
     paginate_by = 25
 
     def get_queryset(self):
@@ -155,7 +155,7 @@ class InvoiceArchive(generic.ListView):
 class InvoiceWaiting(generic.ListView):
     model = models.Event
     paginate_by = 25
-    template_name = 'RIGS/event_invoice.html'
+    template_name = 'event_invoice.html'
 
     def get_context_data(self, **kwargs):
         context = super(InvoiceWaiting, self).get_context_data(**kwargs)
diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py
index 6aeff551..ab276223 100644
--- a/RIGS/rigboard.py
+++ b/RIGS/rigboard.py
@@ -228,7 +228,7 @@ class EventPrint(generic.View):
 class EventArchive(generic.ListView):
     model = models.Event
     paginate_by = 25
-    template_name = "RIGS/event_archive.html"
+    template_name = "event_archive.html"
 
     def get_context_data(self, **kwargs):
         # get super context
@@ -396,12 +396,12 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
 
         msg = EmailMultiAlternatives(
             "N%05d | %s - Event Authorisation Request" % (self.object.pk, self.object.name),
-            get_template("RIGS/eventauthorisation_client_request.txt").render(context),
+            get_template("eventauthorisation_client_request.txt").render(context),
             to=[email],
             reply_to=[self.request.user.email],
         )
         css = staticfiles_storage.path('css/email.css')
-        html = premailer.Premailer(get_template("RIGS/eventauthorisation_client_request.html").render(context),
+        html = premailer.Premailer(get_template("eventauthorisation_client_request.html").render(context),
                                    external_styles=css).transform()
         msg.attach_alternative(html, 'text/html')
 
@@ -411,7 +411,7 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
 
 
 class EventAuthoriseRequestEmailPreview(generic.DetailView):
-    template_name = "RIGS/eventauthorisation_client_request.html"
+    template_name = "eventauthorisation_client_request.html"
     model = models.Event
 
     def render_to_response(self, context, **response_kwargs):
diff --git a/RIGS/templates/RIGS/activity_feed.html b/RIGS/templates/activity_feed.html
similarity index 79%
rename from RIGS/templates/RIGS/activity_feed.html
rename to RIGS/templates/activity_feed.html
index 78d5f9b0..31658c5a 100644
--- a/RIGS/templates/RIGS/activity_feed.html
+++ b/RIGS/templates/activity_feed.html
@@ -48,19 +48,18 @@
 </script>
 {% endblock %}
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h4 class="panel-title">Recent Changes</h4>
-      </div>
-      
-      <div class="list-group">
-        <div id="activity_loading" class="list-group-item loading-animation">
-          <div class="circle"></div>
-          <div class="circle1"></div>
-        </div>
-        <div id="activity">
-        </div>
-      </div> 
-      
-    </div>
+<div class="card card-default">
+  <div class="card-heading">
+    <h4 class="card-title">Recent Changes</h4>
+  </div>
+
+  <div class="list-group">
+    <div id="activity_loading" class="list-group-item loading-animation">
+      <div class="circle"></div>
+      <div class="circle1"></div>
+    </div>
+    <div id="activity">
+    </div>
+  </div>
+</div>
 
diff --git a/RIGS/templates/RIGS/activity_feed_data.html b/RIGS/templates/activity_feed_data.html
similarity index 89%
rename from RIGS/templates/RIGS/activity_feed_data.html
rename to RIGS/templates/activity_feed_data.html
index cff6c323..f6f590e6 100644
--- a/RIGS/templates/RIGS/activity_feed_data.html
+++ b/RIGS/templates/activity_feed_data.html
@@ -5,7 +5,7 @@
 {% load to_class_name from filters %}
 
 {% block content %}
-  
+
     <div class="list-group-item">
       <div class="media">
         {% for version in object_list %}
@@ -36,10 +36,10 @@
                         {% if version.changes.old == None %}
                           Created
                         {% else %}
-                          Changed {% include 'RIGS/version_changes.html' %} in
+                          Changed {% include 'version_changes.html' %} in
                         {% endif %}
-                          
-                        {% include 'RIGS/object_button.html' with object=version.changes.new %}
+
+                        {% include 'object_button.html' with object=version.changes.new %}
                         {% if version.revision.comment %}
                           ({{ version.revision.comment }})
                         {% endif %}
@@ -50,5 +50,5 @@
         </div>
       </div>
     </div>
-  
-{% endblock %}
\ No newline at end of file
+
+{% endblock %}
diff --git a/RIGS/templates/RIGS/activity_table.html b/RIGS/templates/activity_table.html
similarity index 97%
rename from RIGS/templates/RIGS/activity_table.html
rename to RIGS/templates/activity_table.html
index f9addd87..3873f9ba 100644
--- a/RIGS/templates/RIGS/activity_table.html
+++ b/RIGS/templates/activity_table.html
@@ -74,7 +74,7 @@
                                   {% if version.changes.old == None %}
                                     {{version.changes.new|to_class_name}} Created
                                   {% else %}
-                                    {% include 'RIGS/version_changes.html' %}
+                                    {% include 'version_changes.html' %}
                                   {% endif %}                        </td>
                                   <td>{{ version.changes.revision.comment }}</td>
                             </tr>
diff --git a/RIGS/templates/RIGS/admin_associate_merge.html b/RIGS/templates/admin_associate_merge.html
similarity index 100%
rename from RIGS/templates/RIGS/admin_associate_merge.html
rename to RIGS/templates/admin_associate_merge.html
diff --git a/RIGS/templates/RIGS/admin_awaiting_approval.html b/RIGS/templates/admin_awaiting_approval.html
similarity index 100%
rename from RIGS/templates/RIGS/admin_awaiting_approval.html
rename to RIGS/templates/admin_awaiting_approval.html
diff --git a/RIGS/templates/RIGS/admin_awaiting_approval.txt b/RIGS/templates/admin_awaiting_approval.txt
similarity index 100%
rename from RIGS/templates/RIGS/admin_awaiting_approval.txt
rename to RIGS/templates/admin_awaiting_approval.txt
diff --git a/RIGS/templates/RIGS/calendar.html b/RIGS/templates/calendar.html
similarity index 100%
rename from RIGS/templates/RIGS/calendar.html
rename to RIGS/templates/calendar.html
diff --git a/RIGS/templates/RIGS/client_eventdetails.html b/RIGS/templates/client_eventdetails.html
similarity index 84%
rename from RIGS/templates/RIGS/client_eventdetails.html
rename to RIGS/templates/client_eventdetails.html
index 4f3810f8..e56bef3c 100644
--- a/RIGS/templates/RIGS/client_eventdetails.html
+++ b/RIGS/templates/client_eventdetails.html
@@ -1,8 +1,8 @@
 <div class="row">
     <div class="col-sm-12 col-md-6 col-lg-5">
-        <div class="panel panel-default">
-            <div class="panel-heading">Contact Details</div>
-            <div class="panel-body">
+        <div class="card card-default">
+            <div class="card-heading">Contact Details</div>
+            <div class="card-body">
                 <dl class="dl-horizontal">
                     <dt>Person</dt>
                     <dd>
@@ -22,9 +22,9 @@
             </div>
         </div>
         {% if event.organisation %}
-            <div class="panel panel-default">
-                <div class="panel-heading">Organisation</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Organisation</div>
+                <div class="card-body">
                     <dl class="dl-horizontal">
                         <dt>Organisation</dt>
                         <dd>
@@ -40,9 +40,9 @@
     </div>
 
     <div class="col-sm-12 col-md-6 col-lg-7">
-        <div class="panel panel-info">
-            <div class="panel-heading">Event Info</div>
-            <div class="panel-body">
+        <div class="card card-info">
+            <div class="card-heading">Event Info</div>
+            <div class="card-body">
                 <dl class="dl-horizontal">
                     <dt>Event Venue</dt>
                     <dd>
diff --git a/RIGS/templates/RIGS/event_archive.html b/RIGS/templates/event_archive.html
similarity index 97%
rename from RIGS/templates/RIGS/event_archive.html
rename to RIGS/templates/event_archive.html
index 18459073..0efa1614 100644
--- a/RIGS/templates/RIGS/event_archive.html
+++ b/RIGS/templates/event_archive.html
@@ -45,7 +45,7 @@
     <div class="row">
         <div class="col-sm-12">
             {% with object_list as events %}
-                {% include 'RIGS/event_table.html' %}
+                {% include 'event_table.html' %}
             {% endwith %}
         </div>
     </div>
diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/event_detail.html
similarity index 90%
rename from RIGS/templates/RIGS/event_detail.html
rename to RIGS/templates/event_detail.html
index 10a947fe..cd5bf530 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/event_detail.html
@@ -12,7 +12,7 @@
     </div>
         {% if perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
-            {% include 'RIGS/event_detail_buttons.html' %}
+            {% include 'event_detail_buttons.html' %}
         </div>
         {% endif %}
 
@@ -20,9 +20,9 @@
     {% if object.is_rig and perms.RIGS.view_event %}
         {# only need contact details for a rig #}
         <div class="col-sm-12 col-md-6 col-lg-5">
-            <div class="panel panel-default">
-                <div class="panel-heading">Contact Details</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Contact Details</div>
+                <div class="card-body">
                     <dl class="dl-horizontal">
                         <dt>Person</dt>
                         <dd>
@@ -46,9 +46,9 @@
                 </div>
             </div>
             {% if event.organisation %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">Organisation</div>
-                    <div class="panel-body">
+                <div class="card card-default">
+                    <div class="card-heading">Organisation</div>
+                    <div class="card-body">
                         <dl class="dl-horizontal">
                             <dt>Organisation</dt>
                             <dd>
@@ -75,9 +75,9 @@
         </div>
     {% endif %}
     <div class="col-sm-12 {% if event.is_rig and perms.RIGS.view_event %}col-md-6 col-lg-7{% endif %}">
-        <div class="panel panel-info">
-            <div class="panel-heading">Event Info</div>
-            <div class="panel-body">
+        <div class="card card-info">
+            <div class="card-heading">Event Info</div>
+            <div class="card-body">
                 <dl class="dl-horizontal">
                     <dt>Event Venue</dt>
                     <dd>
@@ -160,17 +160,17 @@
     </div>
     {% if event.is_rig and event.internal and perms.RIGS.view_event %}
     <div class="col-sm-12">
-        <div class="panel panel-default
+        <div class="card card-default
             {% if object.authorised %}
-                panel-success
+                card-success
             {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
-                panel-warning
+                card-warning
             {% elif event.auth_request_to %}
-                panel-info
+                card-info
             {% endif %}
             ">
-            <div class="panel-heading">Client Authorisation</div>
-            <div class="panel-body">
+            <div class="card-heading">Client Authorisation</div>
+            <div class="card-body">
                 <dl class="dl-horizontal col-sm-6">
                     <dt>Authorisation Request</dt>
                     <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
@@ -216,27 +216,27 @@
     {% endif %}
     {% if not request.is_ajax and perms.RIGS.view_event %}
     <div class="col-sm-12 text-right">
-        {% include 'RIGS/event_detail_buttons.html' %}
+        {% include 'event_detail_buttons.html' %}
     </div>
     {% endif %}
     {% if event.is_rig %}
         <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">Event Details</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Event Details</div>
+                <div class="card-body">
                     {% if perms.RIGS.view_event %}
                     <div class="well well-sm">
                         <h4>Notes</h4>
                         <div class="dont-break-out">{{ event.notes|linebreaksbr }}</div>
                     </div>
                     {% endif %}
-                    {% include 'RIGS/item_table.html' %}
+                    {% include 'item_table.html' %}
                 </div>
             </div>
         </div>
         {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
-            {% include 'RIGS/event_detail_buttons.html' %}
+            {% include 'event_detail_buttons.html' %}
         </div>
         {% endif %}
     {% endif %}
@@ -253,7 +253,7 @@
 {% endblock %}
 
 {% if request.is_ajax %}
-    {% block footer %}
+    {% block barter %}
         <div class="row">
             {% if perms.RIGS.view_event %}
             <div class="col-sm-10 align-left">
diff --git a/RIGS/templates/RIGS/event_detail_buttons.html b/RIGS/templates/event_detail_buttons.html
similarity index 100%
rename from RIGS/templates/RIGS/event_detail_buttons.html
rename to RIGS/templates/event_detail_buttons.html
diff --git a/RIGS/templates/RIGS/event_embed.html b/RIGS/templates/event_embed.html
similarity index 100%
rename from RIGS/templates/RIGS/event_embed.html
rename to RIGS/templates/event_embed.html
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/event_form.html
similarity index 96%
rename from RIGS/templates/RIGS/event_form.html
rename to RIGS/templates/event_form.html
index 954ebdbd..a1bc4cba 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -166,9 +166,9 @@
 
     {# Contact details #}
     <div class="col-sm-12 col-md-6">
-        <div class="panel panel-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
-            <div class="panel-heading">Contact Details</div>
-            <div class="panel-body">
+        <div class="card card-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
+            <div class="card-heading">Contact Details</div>
+            <div class="card-body">
                 <div class="form-group" data-toggle="tooltip" title="The main contact for the event, can be left blank if purely an organisation">
                     <label for="{{ form.person.id_for_label }}"
                            class="col-sm-4 control-label">{{ form.person.label }}</label>
@@ -225,9 +225,9 @@
                 </div>
             </div>
         </div>
-        <div class="panel panel-default form-hws form-non_rig">
-            <div class="panel-heading">Event Description</div>
-            <div class="panel-body">
+        <div class="card card-default form-hws form-non_rig">
+            <div class="card-heading">Event Description</div>
+            <div class="card-body">
                 <div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">
                     <label for="{{ form.description.id_for_label }}"
                            class="col-sm-4 control-label">{{ form.description.label }}</label>
@@ -243,9 +243,9 @@
 
     {# Event details #}
     <div class="col-sm-12 col-md-6">
-        <div class="panel panel-default form-hws form-non_rig">
-            <div class="panel-heading">Event Details</div>
-            <div class="panel-body">
+        <div class="card card-default form-hws form-non_rig">
+            <div class="card-heading">Event Details</div>
+            <div class="card-body">
                 <div id="form-hws">
                     <div class="form-group" data-toggle="tooltip" title="Name of the event, displays on rigboard and on paperwork">
                         <label for="{{ form.name.id_for_label }}"
@@ -424,15 +424,15 @@
 
     {# Notes and item shit #}
     <div class="col-sm-12">
-        <div class="panel panel-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
-            <div class="panel-body">
+        <div class="card card-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
+            <div class="card-body">
                 <div class="col-sm-12">
                     <div class="form-group" data-toggle="tooltip" title="Notes on the event. This is only visible to keyholders, and is not displayed on the paperwork">
                         <label for="{{ form.notes.id_for_label }}">{{ form.notes.label }}</label>
                         {% render_field form.notes class+="form-control" %}
                     </div>
                 </div>
-                {% include "RIGS/item_table.html" %}
+                {% include 'item_table.html" %}
             </div>
         </div>
     </div>
@@ -445,5 +445,5 @@
     </div>
     </form>
 
-    {% include 'RIGS/item_modal.html' %}
+    {% include 'item_modal.html' %}
 {% endblock %}
diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/event_invoice.html
similarity index 100%
rename from RIGS/templates/RIGS/event_invoice.html
rename to RIGS/templates/event_invoice.html
diff --git a/RIGS/templates/RIGS/event_print.xml b/RIGS/templates/event_print.xml
similarity index 99%
rename from RIGS/templates/RIGS/event_print.xml
rename to RIGS/templates/event_print.xml
index f91409ac..308c0c34 100644
--- a/RIGS/templates/RIGS/event_print.xml
+++ b/RIGS/templates/event_print.xml
@@ -127,7 +127,7 @@
     </template>
 
     <story firstPageTemplate="Headed">
-            {% include "RIGS/event_print_page.xml" %}
+            {% include 'event_print_page.xml" %}
     </story>
 
 </document>
diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/event_print_page.xml
similarity index 100%
rename from RIGS/templates/RIGS/event_print_page.xml
rename to RIGS/templates/event_print_page.xml
diff --git a/RIGS/templates/RIGS/event_print_signature.xml b/RIGS/templates/event_print_signature.xml
similarity index 100%
rename from RIGS/templates/RIGS/event_print_signature.xml
rename to RIGS/templates/event_print_signature.xml
diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/event_table.html
similarity index 100%
rename from RIGS/templates/RIGS/event_table.html
rename to RIGS/templates/event_table.html
diff --git a/RIGS/templates/RIGS/eventauthorisation_client_request.html b/RIGS/templates/eventauthorisation_client_request.html
similarity index 100%
rename from RIGS/templates/RIGS/eventauthorisation_client_request.html
rename to RIGS/templates/eventauthorisation_client_request.html
diff --git a/RIGS/templates/RIGS/eventauthorisation_client_request.txt b/RIGS/templates/eventauthorisation_client_request.txt
similarity index 100%
rename from RIGS/templates/RIGS/eventauthorisation_client_request.txt
rename to RIGS/templates/eventauthorisation_client_request.txt
diff --git a/RIGS/templates/RIGS/eventauthorisation_client_success.html b/RIGS/templates/eventauthorisation_client_success.html
similarity index 100%
rename from RIGS/templates/RIGS/eventauthorisation_client_success.html
rename to RIGS/templates/eventauthorisation_client_success.html
diff --git a/RIGS/templates/RIGS/eventauthorisation_client_success.txt b/RIGS/templates/eventauthorisation_client_success.txt
similarity index 100%
rename from RIGS/templates/RIGS/eventauthorisation_client_success.txt
rename to RIGS/templates/eventauthorisation_client_success.txt
diff --git a/RIGS/templates/RIGS/eventauthorisation_form.html b/RIGS/templates/eventauthorisation_form.html
similarity index 95%
rename from RIGS/templates/RIGS/eventauthorisation_form.html
rename to RIGS/templates/eventauthorisation_form.html
index e2ae78ce..29c1c51c 100644
--- a/RIGS/templates/RIGS/eventauthorisation_form.html
+++ b/RIGS/templates/eventauthorisation_form.html
@@ -33,23 +33,23 @@
     </div>
 
     <div class="row">
-        {% include 'RIGS/client_eventdetails.html' %}
+        {% include 'client_eventdetails.html' %}
     </div>
 
     <div class="row">
         <div class="col-sm-12">
             {% with object=event %}
-                {% include 'RIGS/item_table.html' %}
+                {% include 'item_table.html' %}
             {% endwith %}
         </div>
     </div>
 
     <div class="row">
         <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading" id="eventauth">Event Authorisation</div>
+            <div class="card card-default">
+                <div class="card-heading" id="eventauth">Event Authorisation</div>
 
-                <div class="panel-body">
+                <div class="card-body">
                     <form class="form-horizontal itemised_form" role="form" method="POST" action="#eventauth">
                         {% csrf_token %}
                         {% include 'form_errors.html' %}
diff --git a/RIGS/templates/RIGS/eventauthorisation_mic_success.txt b/RIGS/templates/eventauthorisation_mic_success.txt
similarity index 100%
rename from RIGS/templates/RIGS/eventauthorisation_mic_success.txt
rename to RIGS/templates/eventauthorisation_mic_success.txt
diff --git a/RIGS/templates/RIGS/eventauthorisation_request.html b/RIGS/templates/eventauthorisation_request.html
similarity index 100%
rename from RIGS/templates/RIGS/eventauthorisation_request.html
rename to RIGS/templates/eventauthorisation_request.html
diff --git a/RIGS/templates/RIGS/eventauthorisation_request_error.html b/RIGS/templates/eventauthorisation_request_error.html
similarity index 100%
rename from RIGS/templates/RIGS/eventauthorisation_request_error.html
rename to RIGS/templates/eventauthorisation_request_error.html
diff --git a/RIGS/templates/RIGS/eventauthorisation_success.html b/RIGS/templates/eventauthorisation_success.html
similarity index 88%
rename from RIGS/templates/RIGS/eventauthorisation_success.html
rename to RIGS/templates/eventauthorisation_success.html
index cb24738a..2110d3c2 100644
--- a/RIGS/templates/RIGS/eventauthorisation_success.html
+++ b/RIGS/templates/eventauthorisation_success.html
@@ -15,22 +15,22 @@
         </div>
     </div>
 
-    {% include 'RIGS/client_eventdetails.html' %}
+    {% include 'client_eventdetails.html' %}
 
     <div class="row">
         <div class="col-sm-12">
             {% with object=event %}
-                {% include 'RIGS/item_table.html' %}
+                {% include 'item_table.html' %}
             {% endwith %}
         </div>
     </div>
 
     <div class="row">
         <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">Event Authorisation</div>
+            <div class="card card-default">
+                <div class="card-heading">Event Authorisation</div>
 
-                <div class="panel-body">
+                <div class="card-body">
                     <div class="row">
                         <div class="col-sm-12 col-md-6">
                             <dl class="dl-horizontal">
diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/index.html
similarity index 95%
rename from RIGS/templates/RIGS/index.html
rename to RIGS/templates/index.html
index 2408a4f4..2eb8ffbb 100644
--- a/RIGS/templates/RIGS/index.html
+++ b/RIGS/templates/index.html
@@ -20,8 +20,8 @@
     <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">
+        <div class="card card-default">
+            <div class="card-heading">
                  <h4 class="list-group-item-heading">Quick Links</h4>
             </div>
             <div class="list-group">
@@ -42,9 +42,9 @@
             </div>
         </div>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-              <h4 class="panel-title">Search Rigboard
+        <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="glyphicon glyphicon-question-sign"</span></a></h4>
             </div>
             <script>
@@ -88,7 +88,7 @@
     </div>
     {% if perms.RIGS.view_event %}
     <div class="col-sm-6">
-        {% include 'RIGS/activity_feed.html' %}
+        {% include 'activity_feed.html' %}
     </div>
     {% endif %}
 </div>
diff --git a/RIGS/templates/RIGS/invoice_confirm_delete.html b/RIGS/templates/invoice_confirm_delete.html
similarity index 100%
rename from RIGS/templates/RIGS/invoice_confirm_delete.html
rename to RIGS/templates/invoice_confirm_delete.html
diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/invoice_detail.html
similarity index 91%
rename from RIGS/templates/RIGS/invoice_detail.html
rename to RIGS/templates/invoice_detail.html
index 72c87a49..e4f55961 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/invoice_detail.html
@@ -28,9 +28,9 @@
 
         <div class="row">
             <div class="col-sm-6">
-                <div class="panel panel-default">
-                    <div class="panel-heading">Invoice Details</div>
-                    <div class="panel-body">
+                <div class="card card-default">
+                    <div class="card-heading">Invoice Details</div>
+                    <div class="card-body">
                         {% if object.event.organisation %}
                             {{ object.event.organisation.name }}<br/>
                             {{ object.event.organisation.address|linebreaksbr }}
@@ -42,12 +42,12 @@
                 </div>
             </div>
             <div class="col-sm-6">
-                <div class="panel panel-{% if object.is_closed %}success{% else %}warning{% endif %}">
-                    <div class="panel-heading">Event Details<span class="pull-right">
+                <div class="card card-{% if object.is_closed %}success{% else %}warning{% endif %}">
+                    <div class="card-heading">Event Details<span class="pull-right">
                         {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(OUTSTANDING){% endif %}
                         </span>
                     </div>
-                    <div class="panel-body">
+                    <div class="card-body">
                         <dl class="dl-horizontal">
                             <dt>Event Number</dt>
                             <dd>N{{ object.event.pk|stringformat:"05d" }}</dd>
@@ -121,8 +121,8 @@
 
         <div class="row">
             <div class="col-sm-6">
-                <div class="panel panel-default">
-                    <div class="panel-body">
+                <div class="card card-default">
+                    <div class="card-body">
                         <div class="pull-right">
                             <a href="{% url 'payment_create' %}?invoice={{ object.pk }}"
                                class="btn btn-default modal-href"
@@ -163,10 +163,10 @@
             </div>
 
             <div class="col-sm-6">
-                <div class="panel panel-default">
-                    <div class="panel-body">
+                <div class="card card-default">
+                    <div class="card-body">
                         {% with object.event as object %}
-                            {% include 'RIGS/item_table.html' %}
+                            {% include 'item_table.html' %}
                         {% endwith %}
                     </div>
                 </div>
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/invoice_list.html
similarity index 100%
rename from RIGS/templates/RIGS/invoice_list.html
rename to RIGS/templates/invoice_list.html
diff --git a/RIGS/templates/RIGS/invoice_list_active.html b/RIGS/templates/invoice_list_active.html
similarity index 100%
rename from RIGS/templates/RIGS/invoice_list_active.html
rename to RIGS/templates/invoice_list_active.html
diff --git a/RIGS/templates/RIGS/invoice_list_archive.html b/RIGS/templates/invoice_list_archive.html
similarity index 100%
rename from RIGS/templates/RIGS/invoice_list_archive.html
rename to RIGS/templates/invoice_list_archive.html
diff --git a/RIGS/templates/RIGS/item_modal.html b/RIGS/templates/item_modal.html
similarity index 98%
rename from RIGS/templates/RIGS/item_modal.html
rename to RIGS/templates/item_modal.html
index e9802230..d4b89368 100644
--- a/RIGS/templates/RIGS/item_modal.html
+++ b/RIGS/templates/item_modal.html
@@ -60,7 +60,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer">
+                <div class="modal-barter">
                     <div class="col-sm-12">
                         <div class="pull-right">
                             <input type="submit" class="btn btn-primary">
diff --git a/RIGS/templates/RIGS/item_row.html b/RIGS/templates/item_row.html
similarity index 100%
rename from RIGS/templates/RIGS/item_row.html
rename to RIGS/templates/item_row.html
diff --git a/RIGS/templates/RIGS/item_table.html b/RIGS/templates/item_table.html
similarity index 96%
rename from RIGS/templates/RIGS/item_table.html
rename to RIGS/templates/item_table.html
index 34f1697f..5a14ad3c 100644
--- a/RIGS/templates/RIGS/item_table.html
+++ b/RIGS/templates/item_table.html
@@ -1,4 +1,4 @@
-<div class="panel table-responsive">
+<div class="card table-responsive">
 	<table class="table table-hover" id="item-table" {% if edit %}data-orderurl="{#% url 'item_order' %#}"{% endif %}>
 		<thead>
 			<tr>
@@ -23,11 +23,11 @@
 		</thead>
 		<tbody id="item-table-body">
 			{% for item in object.items.all %}
-				{% include 'RIGS/item_row.html' %}
+				{% include 'item_row.html' %}
 			{% endfor %}
 		</tbody>
         {% if perms.RIGS.view_event %}
-		<tfoot>
+		<tbart>
 			<tr>
 				<td rowspan="3" colspan="2"></td>
 				<td>Total (ex. VAT)</td>
@@ -47,7 +47,7 @@
 				<td>Total</td>
 				<td colspan="2">£ <span id="total">{{object.total|default:0|floatformat:2}}</span></td>
 			</tr>
-		</tfoot>
+		</tbart>
         {% endif %}
 	</table>
 </div>
diff --git a/RIGS/templates/RIGS/object_button.html b/RIGS/templates/object_button.html
similarity index 100%
rename from RIGS/templates/RIGS/object_button.html
rename to RIGS/templates/object_button.html
diff --git a/RIGS/templates/RIGS/organisation_detail.html b/RIGS/templates/organisation_detail.html
similarity index 87%
rename from RIGS/templates/RIGS/organisation_detail.html
rename to RIGS/templates/organisation_detail.html
index ca16aaa6..7fa0aa8d 100644
--- a/RIGS/templates/RIGS/organisation_detail.html
+++ b/RIGS/templates/organisation_detail.html
@@ -18,9 +18,9 @@
             </div>
         {% endif %}
         <div class="col-sm-6">
-            <div class="panel panel-info">
-                <div class="panel-heading">Organisation Details</div>
-                <div class="panel-body">
+            <div class="card card-info">
+                <div class="card-heading">Organisation Details</div>
+                <div class="card-body">
                     <dl class="dl-horizontal">
                         <dt>Name</dt>
                         <dd>{{ object.name }}</dd>
@@ -45,9 +45,9 @@
         </div>
 
         <div class="col-sm-6">
-            <div class="panel panel-default">
-                <div class="panel-heading">Associated People</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Associated People</div>
+                <div class="card-body">
                     <div class="list-group">
                         {% for person,count in object.persons %}
                             <a class="list-group-item" href="{% url 'person_detail' person.pk %}">{{ person.pk|stringformat:"05d" }} | {{ person.name }} <span class="badge" title="{{count}} events with {{person.name}} for {{object.name}}">{{count}}</span></a>
@@ -60,11 +60,11 @@
 
     <div class="row">
         <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">Associated Events</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Associated Events</div>
+                <div class="card-body">
                     {% with object.latest_events as events %}
-                        {% include 'RIGS/event_table.html' %}
+                        {% include 'event_table.html' %}
                     {% endwith %}
                 </div>
             </div>
@@ -91,7 +91,7 @@
 {% endblock %}
 
 {% if request.is_ajax %}
-    {% block footer %}
+    {% block barter %}
         <div class="row">
             <div class="col-sm-12 text-right">
                 <div class="btn-group btn-page">
diff --git a/RIGS/templates/RIGS/organisation_form.html b/RIGS/templates/organisation_form.html
similarity index 100%
rename from RIGS/templates/RIGS/organisation_form.html
rename to RIGS/templates/organisation_form.html
diff --git a/RIGS/templates/RIGS/organisation_list.html b/RIGS/templates/organisation_list.html
similarity index 100%
rename from RIGS/templates/RIGS/organisation_list.html
rename to RIGS/templates/organisation_list.html
diff --git a/RIGS/templates/RIGS/payment_confirm_delete.html b/RIGS/templates/payment_confirm_delete.html
similarity index 100%
rename from RIGS/templates/RIGS/payment_confirm_delete.html
rename to RIGS/templates/payment_confirm_delete.html
diff --git a/RIGS/templates/RIGS/payment_form.html b/RIGS/templates/payment_form.html
similarity index 100%
rename from RIGS/templates/RIGS/payment_form.html
rename to RIGS/templates/payment_form.html
diff --git a/RIGS/templates/RIGS/person_detail.html b/RIGS/templates/person_detail.html
similarity index 87%
rename from RIGS/templates/RIGS/person_detail.html
rename to RIGS/templates/person_detail.html
index e8a4f3ad..246ea844 100644
--- a/RIGS/templates/RIGS/person_detail.html
+++ b/RIGS/templates/person_detail.html
@@ -18,9 +18,9 @@
             </div>
         {% endif %}
         <div class="col-sm-6">
-            <div class="panel panel-info">
-                <div class="panel-heading">Person Details</div>
-                <div class="panel-body">
+            <div class="card card-info">
+                <div class="card-heading">Person Details</div>
+                <div class="card-body">
                     <dl class="dl-horizontal">
                         <dt>Name</dt>
                         <dd>{{ object.name }}</dd>
@@ -42,9 +42,9 @@
         </div>
 
         <div class="col-sm-6">
-            <div class="panel panel-default">
-                <div class="panel-heading">Associated Organisations</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Associated Organisations</div>
+                <div class="card-body">
                     <div class="list-group">
                         {% for organisation,count in object.organisations %}
                             <a class="list-group-item" href="{% url 'organisation_detail' organisation.pk %}">{{ organisation.pk|stringformat:"05d" }} | {{ organisation.name }} <span class="badge" title="{{count}} events with {{object.name}} for {{organisation.name}}">{{count}}</span></a>
@@ -57,11 +57,11 @@
 
     <div class="row">
         <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">Associated Events</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Associated Events</div>
+                <div class="card-body">
                     {% with object.latest_events as events %}
-                        {% include 'RIGS/event_table.html' %}
+                        {% include 'event_table.html' %}
                     {% endwith %}
                 </div>
             </div>
@@ -88,7 +88,7 @@
 {% endblock %}
 
 {% if request.is_ajax %}
-    {% block footer %}
+    {% block barter %}
         <div class="row">
             <div class="col-sm-12 text-right">
                 <div class="btn-group btn-page">
diff --git a/RIGS/templates/RIGS/person_form.html b/RIGS/templates/person_form.html
similarity index 100%
rename from RIGS/templates/RIGS/person_form.html
rename to RIGS/templates/person_form.html
diff --git a/RIGS/templates/RIGS/person_list.html b/RIGS/templates/person_list.html
similarity index 100%
rename from RIGS/templates/RIGS/person_list.html
rename to RIGS/templates/person_list.html
diff --git a/RIGS/templates/RIGS/profile_button.html b/RIGS/templates/profile_button.html
similarity index 100%
rename from RIGS/templates/RIGS/profile_button.html
rename to RIGS/templates/profile_button.html
diff --git a/RIGS/templates/RIGS/profile_detail.html b/RIGS/templates/profile_detail.html
similarity index 98%
rename from RIGS/templates/RIGS/profile_detail.html
rename to RIGS/templates/profile_detail.html
index d0a86444..b8649517 100644
--- a/RIGS/templates/RIGS/profile_detail.html
+++ b/RIGS/templates/profile_detail.html
@@ -148,7 +148,7 @@
 	    <div class="col-sm-12">
 	        <h4>Events</h4>
 	        {% with object.latest_events as events %}
-	            {% include 'RIGS/event_table.html' %}
+	            {% include 'event_table.html' %}
 	        {% endwith %}
 	    </div>
 	</div>
diff --git a/RIGS/templates/RIGS/profile_form.html b/RIGS/templates/profile_form.html
similarity index 100%
rename from RIGS/templates/RIGS/profile_form.html
rename to RIGS/templates/profile_form.html
diff --git a/RIGS/templates/RIGS/rigboard.html b/RIGS/templates/rigboard.html
similarity index 96%
rename from RIGS/templates/RIGS/rigboard.html
rename to RIGS/templates/rigboard.html
index 786f9385..68ece82f 100644
--- a/RIGS/templates/RIGS/rigboard.html
+++ b/RIGS/templates/rigboard.html
@@ -30,7 +30,7 @@
             </div>
             {# .row #}
 
-            {% include 'RIGS/event_table.html' %}
+            {% include 'event_table.html' %}
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/search_help.html b/RIGS/templates/search_help.html
similarity index 84%
rename from RIGS/templates/RIGS/search_help.html
rename to RIGS/templates/search_help.html
index 9b460043..d1204754 100644
--- a/RIGS/templates/RIGS/search_help.html
+++ b/RIGS/templates/search_help.html
@@ -10,11 +10,11 @@
             </div>
         {% endif %}
         <div class="col-sm-12">
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h3 class="panel-title">Searching Events</h3>
+            <div class="card card-default">
+              <div class="card-heading">
+                <h3 class="card-title">Searching Events</h3>
               </div>
-              <div class="panel-body">
+              <div class="card-body">
                 <p>
                 Searches for entire query in:
                     <button type="button" class="btn btn-default btn-xs">name</button>
@@ -27,11 +27,11 @@
               </div>
             </div>
 
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h3 class="panel-title">Searching People/Organisations/Venues</h3>
+            <div class="card card-default">
+              <div class="card-heading">
+                <h3 class="card-title">Searching People/Organisations/Venues</h3>
               </div>
-              <div class="panel-body">
+              <div class="card-body">
                 <p>
                 Searches for entire search phrase in:
                     <button type="button" class="btn btn-default btn-xs">name</button>
@@ -46,11 +46,11 @@
             </div>
 
             {% if perms.RIGS.view_invoice %}
-                <div class="panel panel-default">
-                  <div class="panel-heading">
-                    <h3 class="panel-title">Searching Invoices</h3>
+                <div class="card card-default">
+                  <div class="card-heading">
+                    <h3 class="card-title">Searching Invoices</h3>
                   </div>
-                  <div class="panel-body">
+                  <div class="card-body">
                     <p>
                     Searches for entire search phrase in:
                         <button type="button" class="btn btn-default btn-xs">event__name</button>
diff --git a/RIGS/templates/RIGS/venue_detail.html b/RIGS/templates/venue_detail.html
similarity index 89%
rename from RIGS/templates/RIGS/venue_detail.html
rename to RIGS/templates/venue_detail.html
index 25d3daef..2e29cb8c 100644
--- a/RIGS/templates/RIGS/venue_detail.html
+++ b/RIGS/templates/venue_detail.html
@@ -18,9 +18,9 @@
             </div>
         {% endif %}
         <div class="col-sm-12">
-            <div class="panel panel-info">
-                <div class="panel-heading">Venue Details</div>
-                <div class="panel-body">
+            <div class="card card-info">
+                <div class="card-heading">Venue Details</div>
+                <div class="card-body">
                     <dl class="dl-horizontal">
                         <dt>Name</dt>
                         <dd>{{ object.name }}</dd>
@@ -47,11 +47,11 @@
 
     <div class="row">
         <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">Associated Events</div>
-                <div class="panel-body">
+            <div class="card card-default">
+                <div class="card-heading">Associated Events</div>
+                <div class="card-body">
                     {% with object.latest_events as events %}
-                        {% include 'RIGS/event_table.html' %}
+                        {% include 'event_table.html' %}
                     {% endwith %}
                 </div>
             </div>
@@ -78,7 +78,7 @@
 
 
 {% if request.is_ajax %}
-    {% block footer %}
+    {% block barter %}
         <div class="row">
             <div class="col-sm-12 text-right">
                 <div class="btn-group btn-page">
diff --git a/RIGS/templates/RIGS/venue_form.html b/RIGS/templates/venue_form.html
similarity index 100%
rename from RIGS/templates/RIGS/venue_form.html
rename to RIGS/templates/venue_form.html
diff --git a/RIGS/templates/RIGS/venue_list.html b/RIGS/templates/venue_list.html
similarity index 100%
rename from RIGS/templates/RIGS/venue_list.html
rename to RIGS/templates/venue_list.html
diff --git a/RIGS/templates/RIGS/version_changes.html b/RIGS/templates/version_changes.html
similarity index 88%
rename from RIGS/templates/RIGS/version_changes.html
rename to RIGS/templates/version_changes.html
index 3c1647bf..704d5f12 100644
--- a/RIGS/templates/RIGS/version_changes.html
+++ b/RIGS/templates/version_changes.html
@@ -3,7 +3,7 @@
     {% for change in version.changes.field_changes %}
 
     	<button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
-            {% include "RIGS/version_changes_change.html" %}
+            {% include 'version_changes_change.html' %}
             {% endspaceless %}'>{{ change.field.verbose_name }}</button>
 
     {% endfor %}
@@ -14,11 +14,11 @@
             {% for change in itemChange.field_changes %}
                   <li class="list-group-item">
                     <h4 class="list-group-item-heading">{{ change.field.verbose_name }}</h4>
-                    <div class="dont-break-out">{% include "RIGS/version_changes_change.html" %}</div>
+                    <div class="dont-break-out">{% include 'version_changes_change.html' %}</div>
                   </li>
             {% endfor %}
             </ul>
-            
+
             {% endspaceless %}'>item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'</button>
     {% endfor %}
 {% else %}
diff --git a/RIGS/templates/RIGS/version_changes_change.html b/RIGS/templates/version_changes_change.html
similarity index 100%
rename from RIGS/templates/RIGS/version_changes_change.html
rename to RIGS/templates/version_changes_change.html
diff --git a/RIGS/templates/RIGS/version_history.html b/RIGS/templates/version_history.html
similarity index 96%
rename from RIGS/templates/RIGS/version_history.html
rename to RIGS/templates/version_history.html
index 676d231e..5d94ef27 100644
--- a/RIGS/templates/RIGS/version_history.html
+++ b/RIGS/templates/version_history.html
@@ -49,7 +49,7 @@
                                     {% if version.changes.old is None %}
                                         {{object|to_class_name}} Created
                                     {% else %}
-                                        {% include 'RIGS/version_changes.html' %}
+                                        {% include 'version_changes.html' %}
                                     {% endif %}
                                 </td>
                                 <td>
diff --git a/RIGS/versioning.py b/RIGS/versioning.py
index cd99d353..c652a9fa 100644
--- a/RIGS/versioning.py
+++ b/RIGS/versioning.py
@@ -201,7 +201,7 @@ class RIGSVersion(Version):
 
 class VersionHistory(generic.ListView):
     model = RIGSVersion
-    template_name = "RIGS/version_history.html"
+    template_name = "version_history.html"
     paginate_by = 25
 
     def get_queryset(self, **kwargs):
@@ -219,7 +219,7 @@ class VersionHistory(generic.ListView):
 
 class ActivityTable(generic.ListView):
     model = RIGSVersion
-    template_name = "RIGS/activity_table.html"
+    template_name = "activity_table.html"
     paginate_by = 25
 
     def get_queryset(self):
@@ -229,7 +229,7 @@ class ActivityTable(generic.ListView):
 
 class ActivityFeed(generic.ListView):
     model = RIGSVersion
-    template_name = "RIGS/activity_feed_data.html"
+    template_name = "activity_feed_data.html"
     paginate_by = 25
 
     def get_queryset(self):
diff --git a/RIGS/views.py b/RIGS/views.py
index ca8bc66e..7d0e1a87 100644
--- a/RIGS/views.py
+++ b/RIGS/views.py
@@ -27,7 +27,7 @@ Displays the current rig count along with a few other bits and pieces
 
 
 class Index(generic.TemplateView):
-    template_name = 'RIGS/index.html'
+    template_name = 'index.html'
 
     def get_context_data(self, **kwargs):
         context = super(Index, self).get_context_data(**kwargs)
@@ -36,7 +36,7 @@ class Index(generic.TemplateView):
 
 
 class SearchHelp(generic.TemplateView):
-    template_name = 'RIGS/search_help.html'
+    template_name = 'search_help.html'
 
 
 # This view should be exempt from requiring CSRF token.
diff --git a/gulpfile.js b/gulpfile.js
index b4df582f..15007699 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,7 +20,11 @@ gulp.task('sass', function () {
 });
 
 gulp.task('scripts', function() {
-    return gulp.src(['web_assets/js/**/*.js', 'node_modules/bootstrap/**/bootstrap.js'])
-        .pipe(uglify())
-        .pipe(gulp.dest('RIGS/static/js'));
+    return gulp.src(['web_assets/js/**/*.js', 'node_modules/bootstrap/**/bootstrap.min.js', 'node_modules/jquery/**/jquery.min.js'])
+    .pipe(flatten())
+    .pipe(uglify())
+    .pipe(gulp.dest('RIGS/static/js'));
 });
+
+exports.default = gulp.parallel('sass', 'scripts');
+exports.build = gulp.parallel('sass', 'scripts');
diff --git a/requirements.txt b/requirements.txt
index e737650a..8b4ad3f0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,7 @@ django-recaptcha==2.0.6
 django-registration-redux==2.7
 django-reversion==3.0.7
 django-widget-tweaks==1.4.5
+django-gulp==4.1.0
 gunicorn==20.0.4
 icalendar==4.0.4
 lxml==4.5.0
diff --git a/templates/base.html b/templates/base.html
index 39cf5e58..0ebe7ac8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,7 +16,6 @@
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,700,300,400' rel='stylesheet'
           type='text/css'>
 
-
     <link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
     {% block css %}
     {% endblock %}
@@ -33,62 +32,53 @@
 
 <body>
 {% include "analytics.html" %}
-<div class="navbar navbar-fixed-top navbar-inverse hidden-print" role="navigation">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            {% block titleheader %}
-            {% endblock %}
-        </div>
-        <div class="navbar-collapse">
-            <ul class="nav navbar-nav">
-                {% block titleelements %}
-                {% endblock %}
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-                <li class="dropdown" id="user">
-                    {% if user.is_authenticated %}
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            <span class="glyphicon glyphicon-user"></span>
-                            Hi {{ user.first_name }}
-                            <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu nav media-list pull-right" id="userdropdown">
-                            <li class="media">
-                                <a href="{% url 'profile_detail' %}">
-                                    <div class="media-left">
-                                        <img src="{{ request.user.profile_picture }}" class="media-object"/>
-                                    </div>
-
-                                    <div class="media-body">
-                                        <b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
-
-                                        <p class="muted">{{ request.user.email }}</p>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <div class="col-sm-12 text-right">
-                                    <a href="{% url 'logout' %}" class="btn btn-primary">Logout</a>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
+  {% block titleheader %}
+  {% endblock %}
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav mr-auto">
+        {% block titleelements %}
+        {% endblock %}
+        <li class="dropdown" id="user">
+                {% if user.is_authenticated %}
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        <span class="glyphicon glyphicon-user"></span>
+                        Hi {{ user.first_name }}
+                        <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu nav media-list pull-right" id="userdropdown">
+                        <li class="media">
+                            <a href="{% url 'profile_detail' %}">
+                                <div class="media-left">
+                                    <img src="{{ request.user.profile_picture }}" class="media-object"/>
                                 </div>
-                            </li>
-                        </ul>
-                    {% else %}
-                        <a href="{% url "login" %}">
-                            <span class="icon-user"></span>
-                            Login
-                        </a>
-                    {% endif %}
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>
+
+                                <div class="media-body">
+                                    <b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
+
+                                    <p class="muted">{{ request.user.email }}</p>
+                                </div>
+                            </a>
+                        </li>
+                        <li>
+                            <div class="col-sm-12 text-right">
+                                <a href="{% url 'logout' %}" class="btn btn-primary">Logout</a>
+                            </div>
+                        </li>
+                    </ul>
+                {% else %}
+                    <a href="{% url 'login' %}">
+                        <span class="icon-user"></span>
+                        Login
+                    </a>
+                {% endif %}
+            </li>
+    </ul>
+  </div>
+</nav>
 
 <div class="container">
     <div id="content" class="row">
@@ -112,6 +102,7 @@
     </div>
 
     <div id="sidebar" class="column">
+        test
         {% block sidebar %}
         {% endblock %}
     </div>
diff --git a/templates/base_rigs.html b/templates/base_rigs.html
index febaba98..34bfd04b 100644
--- a/templates/base_rigs.html
+++ b/templates/base_rigs.html
@@ -5,10 +5,12 @@
 
 {% block titleelements %}
     {% if user.is_authenticated %}
-        <li><a href="/">Home</a></li>
-        <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Rigboard<b class="caret"></b></a>
-            <ul class="dropdown-menu">
+        <a href="/">Home</a>
+            <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Rigboard
+        </a>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                 <li><a href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span>
                     Rigboard</a></li>
                 <li><a href="{% url 'event_archive' %}"><span class="glyphicon glyphicon-book"></span>
@@ -23,7 +25,7 @@
                     <li><a href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span>
                         New Event</a></li>
                 {% endif %}
-
+        </div>
             </ul>
         </li>
     {% endif %}
@@ -51,4 +53,4 @@
     {% if perms.RIGS.view_venue %}
         <li><a href="{% url 'venue_list' %}">Venues</a></li>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}