diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html
index 0b56690a..2ac3cc47 100644
--- a/RIGS/templates/event_detail.html
+++ b/RIGS/templates/event_detail.html
@@ -72,6 +72,11 @@
     <div class="col-sm">
         {% include 'partials/event_details.html' %}
     </div>
+    {% if event.is_rig and not event.dry_hire %}
+    <div class="col-sm-12 py-3">
+        {% include 'partials/hs_details.html' %}
+    <div>
+    {% endif %}
     {% if event.is_rig and event.internal and perms.RIGS.view_event %}
     <div class="col-sm-12 py-3">
         { include 'partials/auth_details.html' %}
diff --git a/RIGS/templates/event_detail_buttons.html b/RIGS/templates/event_detail_buttons.html
index a3cb1596..bca4fc50 100644
--- a/RIGS/templates/event_detail_buttons.html
+++ b/RIGS/templates/event_detail_buttons.html
@@ -3,16 +3,6 @@
             class="fas fa-edit"></span> <span
             class="hidden-xs">Edit</span></a>
     {% if event.is_rig %}
-        {% if not event.dry_hire %}
-            <a href="{% url 'event_ra' event.pk %}" class="btn
-                {% if event.risk_assessment_edit_url %}
-                    btn-success
-                {% else %}
-                    btn-warning
-                {% endif %}
-            "><i class="fas fa-paperclip"></i> <span
-                class="hidden-xs">RA</span></a>
-        {% endif %}
         <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-primary"><i
                 class="fas fa-print"></i> <span
                 class="hidden-xs">Print</span></a>
diff --git a/RIGS/templates/partials/hs_details.html b/RIGS/templates/partials/hs_details.html
new file mode 100644
index 00000000..332b2f63
--- /dev/null
+++ b/RIGS/templates/partials/hs_details.html
@@ -0,0 +1,21 @@
+<div class="card {% if event.riskassessment %}
+                    border-success
+                {% else %}
+                    border-warning
+                {% endif %}">
+    <div class="card-header">Health &amp; Safety Details</div>
+    <div class="card-body">
+        <h5>Risk Assessment:</h5>
+        {% if event.riskassessment %}
+            <span class="fas fa-check text-success"></span> Completed <div class="btn-group"><a href="{% url 'ra_detail' event.riskassessment.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> <span
+                class="hidden-xs">View</span><a href="{% url 'ra_edit' event.riskassessment.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span> <span
+                class="hidden-xs">Edit</span></a></div>
+        {% else %}
+            <a href="{% url 'event_ra' event.pk %}" class="btn btn-success"><span class="fas fa-paperclip"></span> <span
+                class="hidden-xs">Create Risk Assessment</span></a>
+        {% endif%}
+        <hr>
+        <h5>Event Checklist:</h5>
+        Coming Soon
+    </div>
+</div>