diff --git a/response/templates/response/base.html b/response/templates/response/base.html
index 9c8206f9..faf7de52 100644
--- a/response/templates/response/base.html
+++ b/response/templates/response/base.html
@@ -5,33 +5,34 @@
 <html lang="en">
 
 <head>
-  <title>
-    {% block title %}
-      Response
+  {% block head %}
+    <title>
+      {% block title %}
+        Response
+      {% endblock %}
+    </title>
+
+    {% block favicon %}
+      <link rel="shortcut icon" href="{% static 'images/favicon.png' %}">
     {% endblock %}
-  </title>
 
-  {% block favicon %}
-    <link rel="shortcut icon" href="{% static 'images/favicon.png' %}">
-  {% endblock %}
+    {% block meta %}
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+      <meta name="description" content="Response">
+      <meta name="author" content="Monzo">
+      <meta name="mobile-web-app-capable" content="yes">
+      <meta name="apple-mobile-web-app-capable" content="yes">
+    {% endblock %}
 
-  {% block meta %}
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="Response">
-    <meta name="author" content="Monzo">
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-  {% endblock %}
+    {% block static %}
+      <link rel="manifest" href="{% static 'manifest.json' %}">
+      <link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
+      <link href="{% static 'common.css' %}" rel="stylesheet">
+    {% endblock %}
 
-  {% block static %}
-    <link rel="manifest" href="{% static 'manifest.json' %}">
-    <link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
-    <link href="{% static 'common.css' %}" rel="stylesheet">
+    {% block head_extra %}{% endblock %}
   {% endblock %}
-
-  {% block head %}{% endblock %}
-
 </head>
 
 <body>
@@ -87,8 +88,10 @@
   </div>
 
   <!-- Bootstrap core JavaScript -->
-  <script src="{% static 'bootstrap/js/bootstrap.bundle.min.js' %}"></script>
-  {% block javascript %}{% endblock %}
+  {% block javascript %}
+    <script src="{% static 'bootstrap/js/bootstrap.bundle.min.js' %}"></script>
+    {% block javascript_extra %}{% endblock %}
+  {% endblock %}
 
 </body>
 
diff --git a/response/templates/response/incident_doc.html b/response/templates/response/incident_doc.html
index 7bd358bf..7d2c344d 100644
--- a/response/templates/response/incident_doc.html
+++ b/response/templates/response/incident_doc.html
@@ -8,7 +8,7 @@
   Inc #{{ incident.pk }} – {{ block.super }}
 {% endblock %}
 
-{% block head %}
+{% block head_extra %}
   <link rel="stylesheet" href="{% static 'incident_doc.css' %}">
 {% endblock %}
 
@@ -39,70 +39,79 @@ <h1 id="title">
       <div class="bg-white p-4">
 
         {% comment %} ----- Summary ----- {% endcomment %}
-        <h2>Summary</h2>
-        <p>
-          {% if incident.summary %}
-            {{ incident.summary|unslackify|markdown_filter|safe  }}
-          {% endif %}
-        </p>
+        {% block incident_summary %}
+          <h2>Summary</h2>
+          <p>
+            {% if incident.summary %}
+              {{ incident.summary|unslackify|markdown_filter|safe  }}
+            {% endif %}
+          </p>
+        {% endblock %}
+        
+        {% block incident_data %}
+          <ul class="summary-data">
+            {% if incident.impact %}
+              <li>
+                <span>Impact:</span>{{ incident.impact|unslackify|markdown_filter|safe }}
+              </li>
+            {% endif %}
+
+            <li><span>Reporter:</span>{{ incident.reporter.display_name }}</li>
+
+            {% if incident.lead %}
+              <li><span>Lead:</span>{{ incident.lead.display_name }}</li>
+            {% endif %}
 
-        <ul class="summary-data">
-          {% if incident.impact %}
             <li>
-              <span>Impact:</span>{{ incident.impact|unslackify|markdown_filter|safe }}
+              <span>Start Time:</span>
+              {% if incident.start_time %}{{ incident.start_time }}{% endif %}
             </li>
-          {% endif %}
-
-          <li><span>Reporter:</span>{{ incident.reporter.display_name }}</li>
-
-          {% if incident.lead %}
-            <li><span>Lead:</span>{{ incident.lead.display_name }}</li>
-          {% endif %}
-
-          <li>
-            <span>Start Time:</span>
-            {% if incident.start_time %}{{ incident.start_time }}{% endif %}
-          </li>
-          <li>
-            <span>Report Time:</span>
-            {% if incident.report_time %}{{ incident.report_time }}{% endif %}
-          </li>
-
-          {% if incident.is_closed %}
-            <li><span>End Time:</span>{{ incident.end_time }}</li>
-            <li><span>Duration:</span>{{ incident.duration}}</li>
-          {% endif %}
-
-          {% if user_stats %}
             <li>
-              <span>Participants:</span>
-              <ul id="participant">
-                {% for stats in user_stats %}
-                  <li>
-                    {{ stats.user.display_name }} ({{stats.message_count}} messages)
-                  </li>
-                {% endfor %}
-              </ul>
+              <span>Report Time:</span>
+              {% if incident.report_time %}{{ incident.report_time }}{% endif %}
             </li>
-          {% endif %}
-        </ul>
+
+            {% if incident.is_closed %}
+              <li><span>End Time:</span>{{ incident.end_time }}</li>
+              <li><span>Duration:</span>{{ incident.duration}}</li>
+            {% endif %}
+
+            {% if user_stats %}
+              <li>
+                <span>Participants:</span>
+                <ul id="participant">
+                  {% for stats in user_stats %}
+                    <li>
+                      {{ stats.user.display_name }} ({{stats.message_count}} messages)
+                    </li>
+                  {% endfor %}
+                </ul>
+              </li>
+            {% endif %}
+
+            {% block incident_data_extra %}
+            {% endblock %}
+          </ul>
+        {% endblock %}
 
         {% comment %} ----- Timeline ----- {% endcomment %}
-        <h2>Timeline</h2>
-        {% if events %}
-          <div class="timeline">
-            {% for event in events.all %}
-              <div class="container">
-                <div class="content">
-                  <strong>
-                    {{ event.icon|safe }}{{ event.timestamp|date:"H:i:s" }}
-                  </strong>
-                  {{ event|stringformat:'s'|unslackify|markdown_filter|safe  }}
+        {% block incident_timeline %}
+          <h2>Timeline</h2>
+          {% if events %}
+            <div class="timeline">
+              {% for event in events.all %}
+                <div class="container">
+                  <div class="content">
+                    <strong>
+                      {{ event.icon|safe }}{{ event.timestamp|date:"H:i:s" }}
+                    </strong>
+                    {{ event|stringformat:'s'|unslackify|markdown_filter|safe  }}
+                  </div>
                 </div>
-              </div>
-            {% endfor %}
-          </div>
-        {% endif %}
+              {% endfor %}
+            </div>
+          {% endif %}
+        {% endblock %}
 
       </div>
     </div>
