diff --git a/RIGS/models.py b/RIGS/models.py
index 09c68890..c628e1d8 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -378,7 +378,10 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def authorised(self):
-        return not self.internal and self.purchase_order or self.authorisation.amount == self.total
+        if self.internal:
+            return self.authorisation.amount == self.total
+        else:
+            return bool(self.purchase_order)
 
     @property
     def has_start_time(self):
@@ -444,6 +447,17 @@ class Event(models.Model, RevisionMixin):
     def internal(self):
         return self.organisation and self.organisation.union_account
 
+    @property
+    def status_color(self):
+        if self.cancelled:
+            return "text-muted table-secondary"
+        elif not self.is_rig:
+            return "table-info"
+        elif self.authorised and self.mic and (self.dry_hire or self.riskassessment):
+            return "table-success"
+        else:
+            return "table-warning"
+
     objects = EventManager()
 
     def get_absolute_url(self):
diff --git a/RIGS/templates/event_table.html b/RIGS/templates/event_table.html
index d00207b2..29ed0e54 100644
--- a/RIGS/templates/event_table.html
+++ b/RIGS/templates/event_table.html
@@ -12,7 +12,7 @@
         </thead>
         <tbody>
         {% for event in events %}
-        <tr {% include 'partials/event_table_colour.html' %} id="event_row">
+        <tr class="{{event.status_color}}" id="event_row">
             <!---Number-->
             <th scope="row" id="event_number">{{ event.display_id }}</th>
             <!--Dates-->
diff --git a/RIGS/templates/partials/event_table_colour.html b/RIGS/templates/partials/event_table_colour.html
deleted file mode 100644
index be9faae7..00000000
--- a/RIGS/templates/partials/event_table_colour.html
+++ /dev/null
@@ -1,11 +0,0 @@
-class="{% if event.cancelled %}
-            text-muted table-secondary
-       {% elif event.dry_hire and event.authorised and event.mic %}
-            table-success
-       {% elif event.authorised and event.risk_assessment_edit_url and event.mic %}
-           table-success
-       {% elif not event.is_rig %}
-           table-info
-       {% else %}
-           table-warning
-       {% endif %}"
diff --git a/RIGS/templates/partials/hs_status.html b/RIGS/templates/partials/hs_status.html
index ae6e2068..2d88a1b4 100644
--- a/RIGS/templates/partials/hs_status.html
+++ b/RIGS/templates/partials/hs_status.html
@@ -2,8 +2,8 @@
 {% if object.pk != None %}
 {#<span class="badge badge-success my-3"><span class="fas fa-check"></span> Completed</span><br/>#}
 <div class="btn-group">
-    <a href="{% url view object.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> <span class="hidden-xs">View</span>
-    <a href="{% url edit object.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span><span class="hidden-xs">Edit</span></a>
+    <a href="{% url view object.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> <span class="hidden-xs"> View</span>
+    <a href="{% url edit object.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span><span class="hidden-xs"> Edit</span></a>
 </div>
 {{ object.review_string|safe }}
 {% else %}