diff --git a/app/routes/clinics.js b/app/routes/clinics.js
index 552b232..e61ef55 100644
--- a/app/routes/clinics.js
+++ b/app/routes/clinics.js
@@ -141,8 +141,13 @@ module.exports = router => {
     // Save back to session
     req.session.data = data;
 
-    // Redirect back to the same filter view
-    res.redirect(`/clinics/${clinicId}/${currentFilter}`);
+    // If there's a returnTo path, use that, otherwise go back to the filter view
+    const returnTo = req.query.returnTo;
+    if (returnTo) {
+      res.redirect(returnTo);
+    } else {
+      res.redirect(`/clinics/${clinicId}/${currentFilter}`);
+    }
   });
 
   function filterEvents(events, filter) {
diff --git a/app/views/participants/show.html b/app/views/participants/show.html
index c11b823..fa9c93a 100644
--- a/app/views/participants/show.html
+++ b/app/views/participants/show.html
@@ -7,8 +7,8 @@
 
 
 {% set back = {
-  href: "/clinics",
-  text: "Clinics"
+  href: "/clinics/" + clinicId,
+  text: "Back to clinic"
 } %}
 
 {% block pageContent %}
@@ -39,7 +39,10 @@ <h2 class="nhsuk-heading-m">Current appointment</h2>
         <div class="nhsuk-summary-list__row">
           <dt class="nhsuk-summary-list__key">Status</dt>
           <dd class="nhsuk-summary-list__value">
-            {{ event.status | replace("_", " ") | capitalize }}
+            {{ tag({
+              text: event.status | formatWords | sentenceCase,
+              classes: "nhsuk-tag--" + event.status | getStatusTagColour
+            })}}
           </dd>
         </div>
       </dl>
@@ -136,13 +139,16 @@ <h2 class="nhsuk-heading-m">Medical information</h2>
       </dl>
 
       {% if event.status === 'scheduled' %}
-        <a href="/clinics/{{ clinicId }}/check-in/{{ event.id }}" class="nhsuk-button">
+      {% set href %}
+        /clinics/{{ clinicId }}/check-in/{{ event.id }}?returnTo=/clinics/{{ clinicId }}/participants/{{ participantId }}
+      {% endset %}
+        {{ button({
+          text: "Check in participant",
+          href: href | trim
+        }) }}
+        {# <a href="/clinics/{{ clinicId }}/check-in/{{ event.id }}" class="nhsuk-button">
           Check in participant
-        </a>
+        </a> #}
       {% endif %}
 
-      <p class="nhsuk-body">
-        <a href="/clinics/{{ clinicId }}" class="nhsuk-back-link">Back to clinic list</a>
-      </p>
-
 {% endblock %}