diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py
index afbac923..c6aa9233 100644
--- a/RIGS/rigboard.py
+++ b/RIGS/rigboard.py
@@ -1,7 +1,9 @@
 from django.views import generic
 from django.core.urlresolvers import reverse_lazy
+
 from RIGS import models
 
+
 __author__ = 'ghost'
 
 
@@ -30,7 +32,7 @@ class EventCreate(generic.CreateView):
         return context
 
     def get_success_url(self):
-        return reverse_laze('event_detail', kwargs={'pk': self.object.pk})
+        return reverse_lazy('event_detail', kwargs={'pk': self.object.pk})
 
 
 class EventUpdate(generic.UpdateView):
@@ -42,4 +44,4 @@ class EventUpdate(generic.UpdateView):
         return context
 
     def get_success_url(self):
-        return reverse_laze('event_detail', kwargs={'pk': self.object.pk})
+        return reverse_lazy('event_detail', kwargs={'pk': self.object.pk})
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index 8e96c0b2..a52b92b0 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -17,47 +17,47 @@
 
     <script>
         function setTime23Hours() {
-            $('.endTime').val('23:00');
+            $('.end_time').val('23:00');
         }
 
         function setTime02Hours() {
 
 
-            if ($('.startDate').val() == $('.endDate').val()) {
-                var endDate = new Date($('.endDate').val());
-                endDate.setDate(endDate.getDate() + 1);
-                $('.endDate').val(endDate.getISOString());
+            if ($('.start_date').val() == $('.end_date').val()) {
+                var end_date = new Date($('.end_date').val());
+                end_date.setDate(end_date.getDate() + 1);
+                $('.end_date').val(end_date.getISOString());
             }
-            $('.endTime').val('02:00');
+            $('.end_time').val('02:00');
         }
 
         $(document).ready(function () {
-            {% if not object.pk and not form.errors%}
+            {% if not object.pk and not form.errors %}
 
 
                 $('.form-hws').slideUp(function () {
-                    $('.form-isRig').slideUp();
+                    $('.form-is_rig').slideUp();
                 });
 
             {% elif not object.pk and form.errors %}
-                if ($('#{{form.isRig.auto_id}}').attr('checked') != 'checked') {
-                    $('.form-isRig').hide();
+                if ($('#{{form.is_rig.auto_id}}').attr('checked') != 'checked') {
+                    $('.form-is_rig').hide();
                 }
             {% endif %}
 
             {% if not object.pk %}
-                $('#isRig-selector button').on('click', function () {
-                    $('.form-nonRig').slideDown();
-                    if ($(this).data('isrig') == 1) {
-                        $('#{{form.isRig.auto_id}}').attr('checked', true);
-                        if ($('.form-nonRig').is(':hidden')) {
-                            $('.form-isRig').show();
+                $('#is_rig-selector button').on('click', function () {
+                    $('.form-non_rig').slideDown();
+                    if ($(this).data('is_rig') == 1) {
+                        $('#{{form.is_rig.auto_id}}').attr('checked', true);
+                        if ($('.form-non_rig').is(':hidden')) {
+                            $('.form-is_rig').show();
                         } else {
-                            $('.form-isRig').slideDown();
+                            $('.form-is_rig').slideDown();
                         }
                     } else {
-                        $('#{{form.isRig.auto_id}}').attr('checked', false);
-                        $('.form-isRig').slideUp();
+                        $('#{{form.is_rig.auto_id}}').attr('checked', false);
+                        $('.form-is_rig').slideUp();
                     }
                 })
             {% endif %}
@@ -75,23 +75,23 @@
     </h2>
     {% include 'form_errors.html' %}
     <form class="form-horizontal" role="form" method="POST">{% csrf_token %}
-        {% render_field form.isRig style="display: none" %}
+    {% render_field form.is_rig style="display: none" %}
         {% if not object.pk %}
             <div class="col-md-12 well">
-                <div class="form-group" id="isRig-selector">
+                <div class="form-group" id="is_rig-selector">
                     <div class="col-sm-12">
 					<span class="col-sm-6">
-						<button type="button" class="btn btn-primary col-xs-12" data-isrig="1">Rig</button>
+						<button type="button" class="btn btn-primary col-xs-12" data-is_rig="1">Rig</button>
 					</span>
 					<span class="col-sm-6">
-						<button type="button" class="btn btn-info col-xs-12" data-isrig="0">Non-Rig</button>
+						<button type="button" class="btn btn-info col-xs-12" data-is_rig="0">Non-Rig</button>
 					</span>
                     </div>
                 </div>
             </div>
         {% endif %}
         <div class="col-md-6">
-            <div class="panel panel-default form-hws form-isRig">
+            <div class="panel panel-default form-hws form-is_rig">
                 <div class="panel-heading">Contact Details</div>
                 <div class="panel-body">
                     <div class="form-group">
@@ -101,7 +101,7 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <input type="hidden" id="{{ form.person.id_for_label }}" name="{{ form.person.name }}"
-                                       value="{{ form.person.value }}"/>
+                                       value="{{ form.person.value|default_if_none:"" }}"/>
 
                                 <div class="col-xs-9">
                                     <input type="text" id="{{ form.person.id_for_label }}-input"
@@ -131,7 +131,8 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <input type="hidden" id="{{ form.organisation.id_for_label }}"
-                                       name="{{ form.organisation.name }}" value="{{ form.organisation.value }}"/>
+                                       name="{{ form.organisation.name }}"
+                                       value="{{ form.organisation.value|default_if_none:"" }}"/>
 
                                 <div class="col-xs-9">
                                     <input type="text" id="{{ form.organisation.id_for_label }}-input"
@@ -156,8 +157,8 @@
                     </div>
                 </div>
             </div>
-            <div class="panel panel-default form-hws form-nonRig">
-                <div class="panel-heading">Event Description</div>
+            <div class="panel panel-default form-hws form-non_rig">
+            <div class="panel-heading">Event Description</div>
                 <div class="panel-body">
                     <div class="form-group">
                         <label for="{{ form.description.id_for_label }}"
@@ -173,7 +174,7 @@
         <!-- /.col-md-6 -->
 
         <div class="col-md-6">
-            <div class="panel panel-default form-hws form-nonRig">
+            <div class="panel panel-default form-hws form-non_rig">
                 <div class="panel-heading">Event Details</div>
                 <div class="panel-body">
                     <div id="form-hws">
@@ -192,7 +193,7 @@
                             <div class="col-sm-8">
                                 <div class="row">
                                     <input type="hidden" id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}"
-                                           value="{{ form.venue.value }}"/>
+                                           value="{{ form.venue.value|default_if_none:"" }}"/>
 
                                     <div class="col-xs-9">
                                         <input type="text" id="{{ form.venue.id_for_label }}-input"
@@ -216,25 +217,30 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="{{ form.invoiceDate.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.startDate.label }}</label>
+                            <label for="{{ form.start_date.id_for_label }}"
+                                   class="col-sm-4 control-label">{{ form.start_date.label }}</label>
 
                             <div class="col-sm-4">
-                                {% render_field form.startDate type="date" class+="form-control startDate" required="" %}
+                                <input type="date" name="{{ form.start_date.name }}"
+                                       id="{{ form.start_date.id_for_label }}"
+                                       class="form-control start_date" required
+                                       value="{{ form.start_date.value|date:"Y-m-d" }}"/>
                             </div>
                             <div class="col-sm-4">
-                                {% render_field form.startTime type="time" class+="form-control" %}
+                                {% render_field form.start_time type="time" class+="form-control" %}
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="{{ form.invoiceDate.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.endDate.label }}</label>
+                            <label for="{{ form.end_date.id_for_label }}"
+                                   class="col-sm-4 control-label">{{ form.end_date.label }}</label>
 
                             <div class="col-sm-4">
-                                {% render_field form.endDate type="date" class+="form-control endDate" required="" %}
+                                <input type="date" name="{{ form.end_date.name }}" id="{{ form.end_date.id_for_label }}"
+                                       class="form-control end_date" required
+                                       value="{{ form.end_date.value|date:"Y-m-d" }}"/>
                             </div>
                             <div class="col-sm-4">
-                                {% render_field form.endTime type="time" class+="form-control endTime" %}
+                                {% render_field form.end_time type="time" class+="form-control end_time" %}
                             </div>
                             <div class="col-sm-offset-8 col-sm-4">
                                 <div class="btn-group btn-group-justified">
@@ -245,32 +251,40 @@
                         </div>
 
                         {# Rig only information #}
-                        <div class="form-isRig {% if object.pk and not object.isRig %}hidden{% endif %}">
+                        <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
                             <div class="form-group">
-                                <label for="{{ form.accessAt.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.accessAt.label }}</label>
+                                <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.accessAt type="datetime-local" class+="form-control" %}
+                                    {% render_field form.access_at type="datetime-local" class+="form-control" %}
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="{{ form.meetAt.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.meetAt.label }}</label>
+                                <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.meetAt type="datetime-local" class+="form-control" %}
+                                    {% render_field form.meet_at type="datetime-local" class+="form-control" %}
                                 </div>
                             </div>
                             <div class="form-group">
                                 <div class="col-sm-offset-4 col-sm-8">
                                     <div class="checkbox">
                                         <label>
-                                            {% render_field form.dryHire %}{{ form.dryHire.label }}
+                                            {% render_field form.dry_hire %}{{ form.dry_hire.label }}
                                         </label>
                                     </div>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <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>
                             {#% include 'RIGS/eventitem_table.html' %#}
                         </div>
                         <div class="col-sm-12">