diff --git a/RIGS/hs.py b/RIGS/hs.py
index ea69bde1..9074e50c 100644
--- a/RIGS/hs.py
+++ b/RIGS/hs.py
@@ -47,7 +47,10 @@ class EventRiskAssessmentEdit(generic.UpdateView):
     form_class = forms.EventRiskAssessmentForm
 
     def get_success_url(self):
-        # TODO Invalidate review here
+        ra = self.get_object()
+        ra.reviewed_by = None
+        ra.reviewed_at = None
+        ra.save()
         return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
 
     def get_context_data(self, **kwargs):
diff --git a/RIGS/templates/risk_assessment_detail.html b/RIGS/templates/risk_assessment_detail.html
index 13fb1456..1cfcd065 100644
--- a/RIGS/templates/risk_assessment_detail.html
+++ b/RIGS/templates/risk_assessment_detail.html
@@ -6,8 +6,12 @@
 <div class="row my-3 py-3">
     <div class="col-sm-12">
             <h3>Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</h3>
-            <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
-                class="hidden-xs">Edit</span></a>
+            <div class="row">
+                <div class="col-12 text-right">
+                    <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
+                        class="hidden-xs">Edit</span></a>
+                </div>
+            </div>
             <div class="card card-default mb-3">
                 <div class="card-header">General</div>
                 <div class="card-body">
@@ -141,7 +145,11 @@
             </div>
         </div>
     </div>
-    <div class="col-sm-12 text-right">
+    <div class="col-12 text-right">
+        <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
+            class="hidden-xs">Edit</span></a>
+    </div>
+    <div class="col-12 text-right">
         {% include 'partials/last_edited.html' with target="ra_history" %}
     </div>
 </div>
diff --git a/RIGS/templates/risk_assessment_list.html b/RIGS/templates/risk_assessment_list.html
index 7cb3f529..d3362a3e 100644
--- a/RIGS/templates/risk_assessment_list.html
+++ b/RIGS/templates/risk_assessment_list.html
@@ -52,7 +52,7 @@
                     {% for object in object_list %}
                     <tr>
                         {# General #}
-                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</a></th>
+                        <th scope="row" class="{% if object.reviewed_by %}bg-success{%endif%}"><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</a></th>
                         <td class="{% if object.nonstandard_equipment%}bg-danger text-white{%endif%}">{{object.nonstandard_equipment|yesno|title}}</td>
                         <td class="{% if object.nonstandard_use%}bg-danger text-white{%endif%}">{{object.nonstandard_use|yesno|title}}</td>
                         <td class="{% if object.contractors%}bg-danger text-white{%endif%}">{{object.contractors|yesno|title}}</td>