diff --git a/RIGS/hs.py b/RIGS/hs.py
new file mode 100644
index 00000000..8fb10afb
--- /dev/null
+++ b/RIGS/hs.py
@@ -0,0 +1,81 @@
+from RIGS import models, forms
+from django.views import generic
+from django.utils import timezone
+from django.http import HttpResponseRedirect
+from django.urls import reverse_lazy
+from reversion import revisions as reversion
+
+
+class EventRiskAssessmentCreate(generic.CreateView):
+    model = models.RiskAssessment
+    template_name = 'risk_assessment_form.html'
+    form_class = forms.EventRiskAssessmentForm
+
+    def get(self, *args, **kwargs):
+        epk = kwargs.get('pk')
+        event = models.Event.objects.get(pk=epk)
+
+        # Check if RA exists
+        ra = models.RiskAssessment.objects.filter(event=event).first()
+
+        if ra is not None:
+            return HttpResponseRedirect(reverse_lazy('ra_edit', kwargs={'pk': ra.pk}))
+
+        return super(EventRiskAssessmentCreate, self).get(self)
+
+    def get_form(self, **kwargs):
+        form = super(EventRiskAssessmentCreate, self).get_form(**kwargs)
+        epk = self.kwargs.get('pk')
+        event = models.Event.objects.get(pk=epk)
+        form.instance.event = event
+        return form
+
+    def get_context_data(self, **kwargs):
+        context = super(EventRiskAssessmentCreate, self).get_context_data(**kwargs)
+        epk = self.kwargs.get('pk')
+        event = models.Event.objects.get(pk=epk)
+        context['event'] = event
+        return context
+
+    def get_success_url(self):
+        return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
+
+
+class EventRiskAssessmentEdit(generic.UpdateView):
+    model = models.RiskAssessment
+    template_name = 'risk_assessment_form.html'
+    form_class = forms.EventRiskAssessmentForm
+
+    def get_success_url(self):
+        # TODO Invalidate review here
+        return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
+
+    def get_context_data(self, **kwargs):
+        context = super(EventRiskAssessmentEdit, self).get_context_data(**kwargs)
+        rpk = self.kwargs.get('pk')
+        ra = models.RiskAssessment.objects.get(pk=rpk)
+        context['event'] = ra.event
+        context['edit'] = True
+        return context
+
+
+class EventRiskAssessmentDetail(generic.DetailView):
+    model = models.RiskAssessment
+    template_name = 'risk_assessment_detail.html'
+
+
+class EventRiskAssessmentList(generic.ListView):
+    paginate_by = 20
+    model = models.RiskAssessment
+    template_name = 'risk_assessment_table.html'
+
+
+class EventRiskAssessmentReview(generic.View):
+    def get(self, *args, **kwargs):
+        rpk = kwargs.get('pk')
+        ra = models.RiskAssessment.objects.get(pk=rpk)
+        with reversion.create_revision():
+            ra.reviewed_by = self.request.user
+            ra.reviewed_at = timezone.now()
+            ra.save()
+        return HttpResponseRedirect(reverse_lazy('ra_list'))
diff --git a/RIGS/migrations/0043_auto_20200805_1606.py b/RIGS/migrations/0043_auto_20200805_1606.py
new file mode 100644
index 00000000..95782b66
--- /dev/null
+++ b/RIGS/migrations/0043_auto_20200805_1606.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.0.7 on 2020-08-05 15:06
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0042_auto_20200703_1513'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='riskassessment',
+            name='reviewed_at',
+            field=models.DateTimeField(null=True),
+        ),
+        migrations.AddField(
+            model_name='riskassessment',
+            name='reviewed_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer'),
+        ),
+    ]
diff --git a/RIGS/templates/risk_assessment_table.html b/RIGS/templates/risk_assessment_table.html
index e8892984..4fe4ddf8 100644
--- a/RIGS/templates/risk_assessment_table.html
+++ b/RIGS/templates/risk_assessment_table.html
@@ -44,48 +44,51 @@
                                 <th scope="col">{{ object_list.0|verbose_name:'special_structures'|title }}</th>
                                 <th scope="col">{{ object_list.0|verbose_name:'persons_responsible_structures'|title }}</th>
                                 <th scope="col">{{ object_list.0|verbose_name:'suspended_structures'|title }}</th>
-                                <th scope="col">Review</th>
+                                <th scope="col"></th>
                             {% endif %}
                         </tr>
                     </thead>
                     <tbody>
                     {% for object in object_list %}
                     <tr>
+                        {# General #}
                         <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</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>
                         <td class="{% if object.other_companies%}bg-danger text-white{%endif%}">{{object.other_companies|yesno|title}}</td>
                         <td class="{% if object.crew_fatigue%}bg-danger text-white{%endif%}">{{object.crew_fatigue|yesno|title}}</td>
-                        <td>{{ object.general_notes|default:'N/A'|linebreaks }}</td>
-
+                        <td><span class="text-truncate d-inline-block">{{ object.general_notes|default:'N/A'|linebreaks }}</span></td>
+                        {# Power #}
                         <td class="{% if object.big_power%}bg-danger text-white{%endif%}">{{object.big_power|yesno|title}}</td>
                         <td>{{ object.power_mic.name|default:'N/A' }}</td>
                         <td class="{% if object.generators%}bg-danger text-white{%endif%}">{{object.generators|yesno|title}}</td>
                         <td class="{% if object.other_companies_power%}bg-danger text-white{%endif%}">{{object.other_companies_power|yesno|title}}</td>
                         <td class="{% if object.nonstandard_equipment_power%}bg-danger text-white{%endif%}">{{object.nonstandard_equipment_power|yesno|title}}</td>
                         <td class="{% if object.multiple_electrical_environments%}bg-danger text-white{%endif%}">{{object.multiple_electrical_environments|yesno|title}}</td>
-                        <td>{{ object.power_notes|default:'N/A'|linebreaks }}</td>
-
+                        <td><span class="text-truncate d-inline-block">{{ object.power_notes|default:'N/A'|linebreaks }}</span></td>
+                        {# Sound #}
                         <td class="{% if object.noise_monitoring%}bg-danger text-white{%endif%}">{{object.noise_monitoring|yesno|title}}</td>
-                        <td>{{ object.sound_notes|default:'N/A'|linebreaks }}</td>
-
+                        <td><span class="text-truncate d-inline-block">{{ object.sound_notes|default:'N/A'|linebreaks }}</span></td>
+                        {# Venue #}
                         <td class="{% if not object.known_venue%}bg-danger text-white{%endif%}">{{object.known_venue|yesno|title}}</td>
                         <td class="{% if not object.safe_loading%}bg-danger text-white{%endif%}">{{object.safe_loading|yesno|title}}</td>
                         <td class="{% if object.safe_storage%}bg-danger text-white{%endif%}">{{object.safe_storage|yesno|title}}</td>
                         <td class="{% if object.area_outside_of_control%}bg-danger text-white{%endif%}">{{object.area_outside_of_control|yesno|title}}</td>
                         <td class="{% if object.nonstandard_emergency_procedure%}bg-danger text-white{%endif%}">{{object.nonstandard_emergency_procedure|yesno|title}}</td>
                         <td class="{% if object.barrier_required%}bg-danger text-white{%endif%}">{{object.barrier_required|yesno|title}}</td>
-
+                        {# Rigging #}
                         <td class="{% if object.special_structures%}bg-danger text-white{%endif%}">{{object.special_structures|yesno|title}}</td>
                         <td>{{ object.persons_responsible_structures|default:'N/A'|linebreaks }}</td>
                         <td class="{% if object.suspended_structures%}bg-danger text-white{%endif%}">{{object.suspended_structures|yesno|title}}</td>
+                        {# Buttons #}
                         <td>
-                        {% if object.reviewed_by %}
-                        Reviewed by <a href="{% url 'profile_detail' object.reviewed_by.pk %}">{{ object.reviewed_by }}</a> at {{ object.reviewed_at }}
-                        {% else %}
-                        <a class="btn btn-success" href="{% url 'ra_review' object.pk %}">Mark Reviewed</a>
-                        {% endif %}
+                            <a class="btn btn-primary" href="{% url 'ra_detail' object.pk %}">View</a>
+                            {% if object.reviewed_by %}
+                            Reviewed by <a href="{% url 'profile_detail' object.reviewed_by.pk %}">{{ object.reviewed_by }}</a> at {{ object.reviewed_at }}
+                            {% else %}
+                            <a class="btn btn-success my-3" href="{% url 'ra_review' object.pk %}">Mark Reviewed</a>
+                            {% endif %}
                         </td>
                     </tr>
                     {% empty %}