diff --git a/RIGS/static/js/autocompleter.js b/RIGS/static/js/autocompleter.js
index 8a9ad4ba..9524c8f5 100644
--- a/RIGS/static/js/autocompleter.js
+++ b/RIGS/static/js/autocompleter.js
@@ -1 +1 @@
-function changeSelectedValue(e,t,a,r){e.find("option").remove(),e.append($("<option></option>").attr("value",t).text(a).data("update_url",r)),e.selectpicker("render"),e.selectpicker("refresh"),e.selectpicker("val",t),e.change()}function refreshUpdateHref(e){targetObject=$("#"+e.attr("id")+"-update"),update_url=$("option:selected",e).data("update_url"),""==update_url?targetObject.attr("disabled",!0):(targetObject.attr("href",update_url),targetObject.attr("disabled",!1))}function initPicker(e){var t={ajax:{url:e.data("sourceurl"),type:"GET",dataType:"json",data:{term:"{{{q}}}"}},locale:{emptyTitle:""},clearOnEmpty:!1,preprocessData:function(e){var t,a=e.length,r=[];if(r.push({text:clearSelectionLabel,value:"",data:{update_url:"",subtext:""}}),a)for(t=0;t<a;t++)r.push($.extend(!0,e[t],{text:e[t].label,value:e[t].pk,data:{update_url:e[t].update,subtext:""}}));return r}};e.prepend($("<option></option>").attr("value","").text(clearSelectionLabel).data("update_url","")),e.selectpicker().ajaxSelectPicker(t),e.change((function(){refreshUpdateHref(e)})),refreshUpdateHref(e)}$(document).ready((function(){clearSelectionLabel="(no selection)",$(".selectpicker").each((function(){initPicker($(this))})),$("#modal").on("hide.bs.modal",(function(e){null!=modaltarget&&""!=modalobject&&changeSelectedValue($(modaltarget),modalobject[0].pk,modalobject[0].fields.name,modalobject[0].update_url)}))}));
\ No newline at end of file
+function changeSelectedValue(e,t,a,r){e.find("option").remove(),e.append($("<option></option>").attr("value",t).text(a).data("update_url",r)),e.selectpicker("render"),e.selectpicker("refresh"),e.selectpicker("val",t),e.change()}function refreshUpdateHref(e){targetObject=$("#"+e.attr("id")+"-update"),update_url=$("option:selected",e).data("update_url"),""==update_url?(targetObject.removeAttr("href"),targetObject.addClass("disabled")):(targetObject.prop("href",update_url),targetObject.removeClass("disabled"))}function initPicker(e){var t={ajax:{url:e.data("sourceurl"),type:"GET",dataType:"json",data:{term:"{{{q}}}"}},locale:{emptyTitle:""},clearOnEmpty:!1,preprocessData:function(e){var t,a=e.length,r=[];if(r.push({text:clearSelectionLabel,value:"",data:{update_url:"",subtext:""}}),a)for(t=0;t<a;t++)r.push($.extend(!0,e[t],{text:e[t].label,value:e[t].pk,data:{update_url:e[t].update,subtext:""}}));return r}};e.prepend($("<option></option>").attr("value","").text(clearSelectionLabel).data("update_url","")),e.selectpicker().ajaxSelectPicker(t),e.change((function(){refreshUpdateHref(e)})),refreshUpdateHref(e)}$(document).ready((function(){clearSelectionLabel="(no selection)",$(".selectpicker").each((function(){initPicker($(this))})),$("#modal").on("hide.bs.modal",(function(e){null!=modaltarget&&""!=modalobject&&changeSelectedValue($(modaltarget),modalobject[0].pk,modalobject[0].fields.name,modalobject[0].update_url)}))}));
\ No newline at end of file
diff --git a/RIGS/static/js/src/autocompleter.js b/RIGS/static/js/src/autocompleter.js
index d198f2e0..e917b7f0 100644
--- a/RIGS/static/js/src/autocompleter.js
+++ b/RIGS/static/js/src/autocompleter.js
@@ -19,11 +19,12 @@ function refreshUpdateHref(obj) {
     update_url = $('option:selected', obj).data('update_url');
 
     if (update_url=="") {  //Probably "clear selection" has been chosen
-    //	console.log('Trying to disable');
-	    targetObject.attr('disabled', true);
+        //console.log('Trying to disable');
+        targetObject.removeAttr('href');
+	    targetObject.addClass('disabled');
     } else {
-	    targetObject.attr('href', update_url);
-	    targetObject.attr('disabled', false);
+	    targetObject.prop('href', update_url);
+	    targetObject.removeClass('disabled');
     }
 }
 
@@ -78,9 +79,8 @@ function initPicker(obj) {
 
 
 	obj.selectpicker().ajaxSelectPicker(options); //Initiaise selectPicker
-
 	obj.change(function(){ //on change, update the edit button href
-	//	console.log('Selectbox Changed');
+		//console.log('Selectbox Changed');
 		refreshUpdateHref(obj);
 	});
 
diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index 22195510..26673ef0 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -121,10 +121,241 @@
         {% endif %}
 
         {# Contact details #}
-        {% include 'partials/contact_details_form.html' %}
+        <div class="col-md-6 mt-3">
+            <div class="card form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %} mb-3" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
+                <div class="card-header">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>
+                        <div class="col-sm-8">
+                            <div class="row">
+                                <div class="col-sm-9 col-md-7 col-lg-8">
+                                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
+                                        {% if person %}
+                                            <option value="{{form.person.value}}" selected="selected" data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
+                                        {% endif %}
+                                    </select>
+                                </div>
+                                <div class="col-sm-3 col-md-5 col-lg-4 align-right">
+                                    <div class="btn-group">
+                                        <a href="{% url 'person_create' %}" class="btn btn-success modal-href"
+                                           data-target="#{{ form.person.id_for_label }}">
+                                            <span class="fas fa-plus"></span>
+                                        </a>
+                                        <a {% if form.person.value %}href="{% url 'person_update' form.person.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.person.id_for_label }}-update" data-target="#{{ form.person.id_for_label }}">
+                                            <span class="fas fa-user-edit"></span>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group" data-toggle="tooltip" title="The client organisation, leave blank if client is an individual">
+                        <label for="{{ form.organisation.id_for_label }}"
+                               class="col-sm-4 control-label">{{ form.organisation.label }}</label>
+
+                        <div class="col-sm-8">
+                            <div class="row">
+                                <div class="col-sm-9 col-md-7 col-lg-8">
+                                    <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
+                                        {% if organisation %}
+                                            <option value="{{form.organisation.value}}" selected="selected" data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
+                                        {% endif %}
+                                    </select>
+                                </div>
+                                <div class="col-sm-3 col-md-5 col-lg-4 align-right">
+                                    <div class="btn-group">
+                                        <a href="{% url 'organisation_create' %}" class="btn btn-success modal-href"
+                                           data-target="#{{ form.organisation.id_for_label }}">
+                                            <span class="fas fa-plus"></span>
+                                        </a>
+                                        <a {% if form.organisation.value %}href="{% url 'organisation_update' form.organisation.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.organisation.id_for_label }}-update" data-target="#{{ form.organisation.id_for_label }}">
+                                            <span class="fas fa-edit"></span>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="card form-hws form-non_rig mb-3" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
+                <div class="card-header">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>
+
+                        <div class="col-sm-8">
+                            {% render_field form.description class+="form-control" %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
         {# Event details #}
-        {% include 'partials/event_details_form.html' %}
+        <div class="col-md-6 my-3">
+            <div class="card card-default form-hws form-non_rig" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
+                <div class="card-header">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 }}"
+                                   class="col-sm-4 control-label">{{ form.name.label }}</label>
+
+                            <div class="col-sm-8">
+                                {% render_field form.name class+="form-control" %}
+                            </div>
+                        </div>
+                        <div class="form-group" data-toggle="tooltip" title="The venue for the rig, leave blank if unknown (e.g. for a dry hire)">
+                            <label for="{{ form.venue.id_for_label }}"
+                                   class="col-sm-4 control-label">{{ form.venue.label }}</label>
+
+                            <div class="col-sm-8">
+                                <div class="row">
+                                    <div class="col-sm-9 col-md-7 col-lg-8">
+                                        <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
+                                        {% if venue %}
+                                            <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
+                                        {% endif %}
+                                        </select>
+                                    </div>
+                                    <div class="col-sm-3 col-md-5 col-lg-4 align-right">
+                                        <div class="btn-group">
+                                            <a href="{% url 'venue_create' %}" class="btn btn-success modal-href"
+                                               data-target="#{{ form.venue.id_for_label }}">
+                                                <span class="fas fa-plus"></span>
+                                            </a>
+                                            <a href="{% if object.venue %}{% url 'venue_update' object.venue.pk %}{% endif %}" class="btn btn-warning modal-href" id="{{ form.venue.id_for_label }}-update" data-target="#{{ form.venue.id_for_label }}">
+                                                <span class="fas fa-edit"></span>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="{{ form.start_date.id_for_label }}"
+                                   class="col-sm-4 control-label">{{ form.start_date.label }}</label>
+
+                            <div class="col-sm-8">
+                                <div class="row">
+                                    <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="Start date for event, required">
+                                        {% render_field form.start_date class+="form-control" %}
+                                    </div>
+                                    <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="Start time of event, can be left blank">
+                                        {% render_field form.start_time class+="form-control" step="60" %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="{{ form.end_date.id_for_label }}"
+                                   class="col-sm-4 control-label">{{ form.end_date.label }}</label>
+
+                            <div class="col-sm-8">
+                                <div class="row">
+                                    <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="End date of event, leave blank if unknown or same as start date">
+                                        {% render_field form.end_date class+="form-control" %}
+                                    </div>
+                                    <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="End time of event, leave blank if unknown">
+                                        {% render_field form.end_time class+="form-control" step="60" %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        {# Rig only information #}
+                        <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
+                            <div class="form-group" data-toggle="tooltip" title="The date/time at which TEC have access to the venue">
+                                <label for="{{ form.access_at.id_for_label }}"
+                                       class="col-sm-4 control-label">{{ form.access_at.label }}</label>
+                                <div class="col-sm-8">
+                                    {% render_field form.access_at class+="form-control" step="60" %}
+                                </div>
+                            </div>
+                            <div class="form-group" data-toggle="tooltip" title="The date/time at which crew should meet for this event">
+                                <label for="{{ form.meet_at.id_for_label }}"
+                                       class="col-sm-4 control-label">{{ form.meet_at.label }}</label>
+
+                                <div class="col-sm-8">
+                                    {% render_field form.meet_at class+="form-control" step="60" %}
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="col-sm-offset-4 col-sm-8">
+                                    <div class="checkbox">
+                                        <label data-toggle="tooltip" title="Mark this event as a dry-hire, so it needs to be checked in at the end">
+                                            {% render_field form.dry_hire %}{{ form.dry_hire.label }}
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        {# Status is needed on all events types and it looks good here in the form #}
+                        <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">
+                            <label for="{{ form.status.id_for_label }}"
+                                   class="col-sm-4 control-label">{{ form.status.label }}</label>
+
+                            <div class="col-sm-8">
+                                {% render_field form.status class+="form-control" %}
+                            </div>
+                        </div>
+
+                        <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
+                            <div class="form-group" data-toggle="tooltip" title="The Member in Charge of this event">
+                                <label for="{{ form.mic.id_for_label }}"
+                                       class="col-sm-4 control-label">{{ form.mic.label }}</label>
+
+                                <div class="col-sm-8">
+                                    <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                        {% if mic %}
+                                            <option value="{{form.mic.value}}" selected="selected" >{{ mic.name }}</option>
+                                        {% endif %}
+                                    </select>
+                                </div>
+                            </div>
+
+                            {% if object.dry_hire %}
+                                <div class="form-group" data-toggle="tooltip" title="The person who checked-in this dry hire">
+                                    <label for="{{ form.checked_in_by.id_for_label }}"
+                                           class="col-sm-4 control-label">{{ form.checked_in_by.label }}</label>
+
+                                    <div class="col-sm-8">
+                                         <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                            {% if checked_in_by %}
+                                                <option value="{{form.checked_in_by.value}}" selected="selected" >{{ checked_in_by.name }}</option>
+                                            {% endif %}
+                                        </select>
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            <div class="form-group" data-toggle="tooltip" title="The student ID of the client who collected the dry-hire">
+                                <label for="{{ form.collector.id_for_label }}"
+                                       class="col-sm-4 control-label">{{ form.collector.label }}</label>
+
+                                <div class="col-sm-8">
+                                    {% render_field form.collector class+="form-control" %}
+                                </div>
+                            </div>
+
+                            <div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
+                                <label for="{{ form.purchase_order.id_for_label }}"
+                                       class="col-sm-4 control-label">{{ form.purchase_order.label }}</label>
+
+                                <div class="col-sm-8">
+                                    {% render_field form.purchase_order class+="form-control" %}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
         {# Notes and item shit #}
         <div class="col-sm-12">
diff --git a/RIGS/templates/partials/contact_details_form.html b/RIGS/templates/partials/contact_details_form.html
deleted file mode 100644
index 55f4548c..00000000
--- a/RIGS/templates/partials/contact_details_form.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{% load widget_tweaks %}
-<div class="col-md-6 mt-3">
-    <div class="card form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %} mb-3" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
-        <div class="card-header">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>
-                <div class="col-sm-8">
-                    <div class="row">
-                        <div class="col-sm-9 col-md-7 col-lg-8">
-                            <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
-                                {% if person %}
-                                    <option value="{{form.person.value}}" selected="selected" data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
-                                {% endif %}
-                            </select>
-                        </div>
-                        <div class="col-sm-3 col-md-5 col-lg-4 align-right">
-                            <div class="btn-group">
-                                <a href="{% url 'person_create' %}" class="btn btn-success modal-href"
-                                   data-target="#{{ form.person.id_for_label }}">
-                                    <span class="fas fa-plus"></span>
-                                </a>
-                                <a href="{% if form.person.value %}{% url 'person_update' form.person.value %}{% endif %}" class="btn btn-warning modal-href" id="{{ form.person.id_for_label }}-update" data-target="#{{ form.person.id_for_label }}">
-                                    <span class="fas fa-user-edit"></span>
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group" data-toggle="tooltip" title="The client organisation, leave blank if client is an individual">
-                <label for="{{ form.organisation.id_for_label }}"
-                       class="col-sm-4 control-label">{{ form.organisation.label }}</label>
-
-                <div class="col-sm-8">
-                    <div class="row">
-                        <div class="col-sm-9 col-md-7 col-lg-8">
-                            <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
-                                {% if organisation %}
-                                    <option value="{{form.organisation.value}}" selected="selected" data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
-                                {% endif %}
-                            </select>
-                        </div>
-                        <div class="col-sm-3 col-md-5 col-lg-4 align-right">
-                            <div class="btn-group">
-                                <a href="{% url 'organisation_create' %}" class="btn btn-success modal-href"
-                                   data-target="#{{ form.organisation.id_for_label }}">
-                                    <span class="fas fa-plus"></span>
-                                </a>
-                                <a href="{% if form.organisation.value %}{% url 'organisation_update' form.organisation.value %}{% endif %}" class="btn btn-warning modal-href" id="{{ form.organisation.id_for_label }}-update" data-target="#{{ form.organisation.id_for_label }}">
-                                    <span class="fas fa-edit"></span>
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="card form-hws form-non_rig mb-3" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
-        <div class="card-header">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>
-
-                <div class="col-sm-8">
-                    {% render_field form.description class+="form-control" %}
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/RIGS/templates/partials/event_details_form.html b/RIGS/templates/partials/event_details_form.html
deleted file mode 100644
index 7da4fc0d..00000000
--- a/RIGS/templates/partials/event_details_form.html
+++ /dev/null
@@ -1,163 +0,0 @@
-{% load widget_tweaks %}
-{% load l10n %}
-
-<div class="col-md-6 my-3">
-    <div class="card card-default form-hws form-non_rig" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
-        <div class="card-header">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 }}"
-                           class="col-sm-4 control-label">{{ form.name.label }}</label>
-
-                    <div class="col-sm-8">
-                        {% render_field form.name class+="form-control" %}
-                    </div>
-                </div>
-                <div class="form-group" data-toggle="tooltip" title="The venue for the rig, leave blank if unknown (e.g. for a dry hire)">
-                    <label for="{{ form.venue.id_for_label }}"
-                           class="col-sm-4 control-label">{{ form.venue.label }}</label>
-
-                    <div class="col-sm-8">
-                        <div class="row">
-                            <div class="col-sm-9 col-md-7 col-lg-8">
-                                <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
-                                {% if venue %}
-                                    <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
-                                {% endif %}
-                                </select>
-                            </div>
-                            <div class="col-sm-3 col-md-5 col-lg-4 align-right">
-                                <div class="btn-group">
-                                    <a href="{% url 'venue_create' %}" class="btn btn-success modal-href"
-                                       data-target="#{{ form.venue.id_for_label }}">
-                                        <span class="fas fa-plus"></span>
-                                    </a>
-                                    <a href="{% if object.venue %}{% url 'venue_update' object.venue.pk %}{% endif %}" class="btn btn-warning modal-href" id="{{ form.venue.id_for_label }}-update" data-target="#{{ form.venue.id_for_label }}">
-                                        <span class="fas fa-edit"></span>
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="{{ form.start_date.id_for_label }}"
-                           class="col-sm-4 control-label">{{ form.start_date.label }}</label>
-
-                    <div class="col-sm-8">
-                        <div class="row">
-                            <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="Start date for event, required">
-                                {% render_field form.start_date class+="form-control" %}
-                            </div>
-                            <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="Start time of event, can be left blank">
-                                {% render_field form.start_time class+="form-control" step="60" %}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="{{ form.end_date.id_for_label }}"
-                           class="col-sm-4 control-label">{{ form.end_date.label }}</label>
-
-                    <div class="col-sm-8">
-                        <div class="row">
-                            <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="End date of event, leave blank if unknown or same as start date">
-                                {% render_field form.end_date class+="form-control" %}
-                            </div>
-                            <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="End time of event, leave blank if unknown">
-                                {% render_field form.end_time class+="form-control" step="60" %}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                {# Rig only information #}
-                <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
-                    <div class="form-group" data-toggle="tooltip" title="The date/time at which TEC have access to the venue">
-                        <label for="{{ form.access_at.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.access_at.label }}</label>
-                        <div class="col-sm-8">
-                            {% render_field form.access_at class+="form-control" step="60" %}
-                        </div>
-                    </div>
-                    <div class="form-group" data-toggle="tooltip" title="The date/time at which crew should meet for this event">
-                        <label for="{{ form.meet_at.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.meet_at.label }}</label>
-
-                        <div class="col-sm-8">
-                            {% render_field form.meet_at class+="form-control" step="60" %}
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-offset-4 col-sm-8">
-                            <div class="checkbox">
-                                <label data-toggle="tooltip" title="Mark this event as a dry-hire, so it needs to be checked in at the end">
-                                    {% render_field form.dry_hire %}{{ form.dry_hire.label }}
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                {# Status is needed on all events types and it looks good here in the form #}
-                <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">
-                    <label for="{{ form.status.id_for_label }}"
-                           class="col-sm-4 control-label">{{ form.status.label }}</label>
-
-                    <div class="col-sm-8">
-                        {% render_field form.status class+="form-control" %}
-                    </div>
-                </div>
-
-                <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
-                    <div class="form-group" data-toggle="tooltip" title="The Member in Charge of this event">
-                        <label for="{{ form.mic.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.mic.label }}</label>
-
-                        <div class="col-sm-8">
-                            <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                                {% if mic %}
-                                    <option value="{{form.mic.value}}" selected="selected" >{{ mic.name }}</option>
-                                {% endif %}
-                            </select>
-                        </div>
-                    </div>
-
-                    {% if object.dry_hire %}
-                        <div class="form-group" data-toggle="tooltip" title="The person who checked-in this dry hire">
-                            <label for="{{ form.checked_in_by.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.checked_in_by.label }}</label>
-
-                            <div class="col-sm-8">
-                                 <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                                    {% if checked_in_by %}
-                                        <option value="{{form.checked_in_by.value}}" selected="selected" >{{ checked_in_by.name }}</option>
-                                    {% endif %}
-                                </select>
-                            </div>
-                        </div>
-                    {% endif %}
-
-                    <div class="form-group" data-toggle="tooltip" title="The student ID of the client who collected the dry-hire">
-                        <label for="{{ form.collector.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.collector.label }}</label>
-
-                        <div class="col-sm-8">
-                            {% render_field form.collector class+="form-control" %}
-                        </div>
-                    </div>
-
-                    <div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
-                        <label for="{{ form.purchase_order.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.purchase_order.label }}</label>
-
-                        <div class="col-sm-8">
-                            {% render_field form.purchase_order class+="form-control" %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/gulpfile.js b/gulpfile.js
index 48d84ee3..28f43902 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -23,8 +23,7 @@ function styles(done) {
                     'node_modules/fullcalendar/dist/fullcalendar.print.css',
                     'node_modules/bootstrap-select/dist/css/bootstrap-select.css',
                     'node_modules/ajax-bootstrap-select/dist/css/ajax-bootstrap-select.css',
-                    'node_modules/flatpickr/dist/flatpickr.css',
-                    'node_modules/@activix/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'])
+                    'node_modules/flatpickr/dist/flatpickr.css'])
     .pipe(sourcemaps.init())
     .pipe(sass().on('error', sass.logError))
     .pipe(postcss([ autoprefixer() ]))
@@ -57,8 +56,7 @@ function scripts() {
                     'node_modules/bootstrap-select/dist/js/bootstrap-select.js',
                     'node_modules/ajax-bootstrap-select/dist/js/ajax-bootstrap-select.js',
                     'node_modules/konami/konami.js',
-                    'node_modules/dark-mode-switch/dark-mode-switch.min.js',
-                    'node_modules/@activix/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js'])
+                    'node_modules/dark-mode-switch/dark-mode-switch.min.js'])
     .pipe(flatten())
     .pipe(terser())
     .pipe(gulp.dest('RIGS/static/js'))