diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index fc633ab9..58283f89 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -179,8 +179,8 @@
                 </div>
             </div>
         </div>
-        <div class="col-sm-12 text-right form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %} my-3">
-            <div class="btn-group btn-page">
+        <div class="col-sm-12 text-right form-hws form-non_rig my-3">
+            <div class="btn-group">
                 <button type="submit" class="btn btn-primary" title="Save"><i
                         class="fas fa-save"></i> Save
                 </button>
diff --git a/RIGS/templates/event_table.html b/RIGS/templates/event_table.html
index dac0c2af..87122808 100644
--- a/RIGS/templates/event_table.html
+++ b/RIGS/templates/event_table.html
@@ -1,15 +1,16 @@
-<div class="table-responsive">
-    <table class="table mb-0">
-        <thead class="thead-dark">
-            <tr>
-                <th scope="col">#</th>
-                <th scope="col">Event Date</th>
-                <th scope="col">Event Details</th>
-                <th scope="col">MIC</th>
-            </tr>
-        </thead>
-        <tbody>
-        {% for event in events %}
+<div class="d-none d-md-block">
+    <div class="table-responsive">
+        <table class="table mb-0">
+            <thead class="thead-dark">
+                <tr>
+                    <th scope="col">#</th>
+                    <th scope="col">Event Date</th>
+                    <th scope="col">Event Details</th>
+                    <th scope="col">MIC</th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for event in events %}
             <tr {% include 'partials/event_table_colour.html' %}>
                 <!---Number-->
                 <th scope="row">{{ event.pk }}</th>
@@ -89,7 +90,15 @@
                     {% endif %}
                 </td>
             </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+            {% empty %}
+            <tr class="bg-warning">
+                <td colspan="6">No events found</td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+<div class="d-xs-block d-sm-block d-md-none">
+    {% include 'event_table_mobile.html' %}
 </div>
diff --git a/RIGS/templates/event_table_mobile.html b/RIGS/templates/event_table_mobile.html
index affc12ee..e36d99a2 100644
--- a/RIGS/templates/event_table_mobile.html
+++ b/RIGS/templates/event_table_mobile.html
@@ -1,16 +1,15 @@
+<div class="card">
 {% for event in events %}
-<div class="card my-1
-{% if event.cancelled %}
-    text-muted border-secondary
+  <div class="card-header {% if event.cancelled %}
+    text-muted bg-secondary
 {% elif event.authorised and event.risk_assessment_edit_url and event.mic %}
-    border-success
+    bg-success
 {% elif not event.is_rig %}
-    border-info
+    bg-info
 {% else %}
-    border-warning
+    bg-warning
 {% endif %}
 ">
-  <div class="card-header">
     <a href="{% url 'event_detail' event.pk %}">{{ event.pk }} | {{ event.name }}</a>
     {% if event.dry_hire %}
         <span class="badge badge-pill badge-secondary">Dry Hire</span>
@@ -34,5 +33,9 @@
     {% endif %}
   </div>
   <div class="card-footer">MIC: {% if event.mic %}<p>{{ event.mic.initials }}</p>{% elif event.is_rig %}<i class="fas fa-exclamation"></i>{% endif %}</div>
+{% empty %}
+<div class="card-body bg-warning">
+    <p>No events found</p>
 </div>
 {% endfor %}
+</div>
diff --git a/RIGS/templates/organisation_detail.html b/RIGS/templates/organisation_detail.html
index b31bf32f..dd61004f 100644
--- a/RIGS/templates/organisation_detail.html
+++ b/RIGS/templates/organisation_detail.html
@@ -6,19 +6,12 @@
 {% block content %}
     <div class="row">
         {% if not request.is_ajax %}
-            <div class="col-sm-12">
-                <h1>Organisation | {{ object.name }}</h1>
-            </div>
-
-            <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
-                    <a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
-                        class="fas fa-pencil"></span> Edit</a>
-                </div>
-            </div>
+        <div class="col-sm-12">
+            <h1>Organisation | {{ object.name }}</h1>
+        </div>
         {% endif %}
-        <div class="col-sm-6">
-            <div class="card card-info">
+        <div class="col-sm">
+            <div class="card bg-info">
                 <div class="card-header">Organisation Details</div>
                 <div class="card-body">
                     <dl class="dl-horizontal">
@@ -43,9 +36,8 @@
                 </div>
             </div>
         </div>
-
-        <div class="col-sm-6">
-            <div class="card card-default">
+        <div class="col-sm">
+            <div class="card">
                 <div class="card-header">Associated People</div>
                 <div class="card-body">
                     <div class="list-group">
@@ -57,16 +49,13 @@
             </div>
         </div>
     </div>
-
-    <div class="row">
+    <div class="row my-2">
         <div class="col-sm-12">
-            <div class="card card-default">
+            <div class="card">
                 <div class="card-header">Associated Events</div>
-                <div class="card-body">
-                    {% with object.latest_events as events %}
-                        {% include 'event_table.html' %}
-                    {% endwith %}
-                </div>
+                {% with object.latest_events as events %}
+                    {% include 'event_table.html' %}
+                {% endwith %}
             </div>
         </div>
     </div>
@@ -75,9 +64,9 @@
     {% if not request.is_ajax %}
         <div class="row">
             <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
+                <div class="btn-group">
                     <a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
-                        class="fas fa-pencil"></span> Edit</a>
+                        class="fas fa-edit"></span> Edit</a>
                 </div>
                 {% include 'partials/last_edited.html' with target="organisation_history" %}
             </div>
@@ -90,11 +79,11 @@
     {% block footer %}
         <div class="row">
             <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
-                    <a href="{% url 'organisation_detail' object.pk %}" class="btn btn-default"><span
-                        class="fas fa-eye-open"></span> Open Page</a>
-                    <a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
-                        class="fas fa-pencil"></span> Edit</a>
+                <div class="btn-group">
+                    <a href="{% url 'organisation_detail' object.pk %}" class="btn btn-primary"><span
+                        class="fas fa-eye"></span> Open Page</a>
+                    <a href="{% url 'organisation_update' object.pk %}" class="btn btn-warning"><span
+                        class="fas fa-edit"></span> Edit</a>
                 </div>
                 {% include 'partials/last_edited.html' with target="organisation_history" %}
             </div>
diff --git a/RIGS/templates/partials/contact_details_form.html b/RIGS/templates/partials/contact_details_form.html
index bbc1e11c..0d25862e 100644
--- a/RIGS/templates/partials/contact_details_form.html
+++ b/RIGS/templates/partials/contact_details_form.html
@@ -1,5 +1,5 @@
 {% load widget_tweaks %}
-<div class="col-md-6 my-3">
+<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 %}">
         <div class="card-header">Contact Details</div>
         <div class="card-body">
@@ -58,7 +58,7 @@
             </div>
         </div>
     </div>
-    <div class="card form-hws form-non_rig my-3">
+    <div class="card form-hws form-non_rig mb-3">
         <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">
diff --git a/RIGS/templates/rigboard.html b/RIGS/templates/rigboard.html
index 0515f866..824d9864 100644
--- a/RIGS/templates/rigboard.html
+++ b/RIGS/templates/rigboard.html
@@ -7,10 +7,7 @@
 {% if perms.RIGS.add_event %}
 <a href="{% url 'event_create' %}" class="btn btn-success my-3 float-right">New <i class="fas fa-plus"></i></a>
 {% endif %}
-<div class="d-none d-md-block">
-    {% include 'event_table.html' %}
-</div>
-<div class="d-xs-block d-sm-block d-md-none">
-    {% include 'event_table_mobile.html' %}
-</div>
+
+{% include 'event_table.html' %}
+
 {% endblock %}