diff --git a/training/templates/training/profile_detail.html b/training/templates/training/profile_detail.html
index be120a88..39b28631 100644
--- a/training/templates/training/profile_detail.html
+++ b/training/templates/training/profile_detail.html
@@ -1,63 +1,9 @@
 {% extends 'base.html' %}
-{% load training_extras %}
 
 {% block title %}{{ profile }} Training{% endblock %}
 
 {% block content %}
     <h2>Training Profile for {{ profile }}</h2>
 
-    {% for category in categories %}
-        <div class="row">
-            <div class="col-xs-12">
-                <h3>{{ category }}</h3>
-                <table class="table">
-                    <thead>
-                        <tr>
-                        <td>Item</td>
-                        <td>Started</td>
-                        <td>Complete</td>
-                        <td>Assessed</td>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for item in category.trainingitem_set.all %}
-                            {% with record=item|item_record:request.user %}
-                                <tr class="
-                                    {% if record.assessed %}
-                                    success
-                                    {% elif record.complete %}
-                                    info
-                                    {% elif record.started %}
-                                    warning
-                                    {% else %}
-                                    danger
-                                    {% endif %}
-                                ">
-                                <td>{{ record.training_item }}</td>
-                                <td>
-                                    {{ record.started_date|default_if_none:"No" }} <em>{{ record.started_trainer|default_if_none:"" }}</em>
-                                    {% if record.started_notes %}
-                                        <pre>{{ record.started_notes }}</pre>
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {{ record.completed_date|default_if_none:"No" }} <em>{{ record.completed_trainer|default_if_none:"" }}</em>
-                                    {% if record.completed_notes %}
-                                        <pre>{{ record.completed_notes }}</pre>
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {{ record.assessed_date|default_if_none:"No" }} <em>{{ record.assessed_trainer|default_if_none:"" }}</em>
-                                    {% if record.assessed_notes %}
-                                        <pre>{{ record.assessed_notes }}</pre>
-                                    {% endif %}
-                                </td>
-                                </tr>
-                            {% endwith %}
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    {% endfor %}
+    {% include "training/profile_detail_table.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/training/templates/training/profile_detail_table.html b/training/templates/training/profile_detail_table.html
new file mode 100644
index 00000000..8854791e
--- /dev/null
+++ b/training/templates/training/profile_detail_table.html
@@ -0,0 +1,7 @@
+{% for category in categories %}
+    <div class="row">
+        <div class="col-xs-12">
+            {% include "training/trainingcategory_item_table.html" %}
+        </div>
+    </div>
+{% endfor %}
\ No newline at end of file
diff --git a/training/templates/training/trainingcategory_item_table.html b/training/templates/training/trainingcategory_item_table.html
new file mode 100644
index 00000000..b14f501b
--- /dev/null
+++ b/training/templates/training/trainingcategory_item_table.html
@@ -0,0 +1,20 @@
+{% load training_extras %}
+
+<h3>{{ category }}</h3>
+<table class="table">
+    <thead>
+    <tr>
+        <td>Item</td>
+        <td>Started</td>
+        <td>Complete</td>
+        <td>Assessed</td>
+    </tr>
+    </thead>
+    <tbody>
+    {% for item in category.trainingitem_set.all %}
+        {% with record=item|item_record:request.user %}
+            {% include "training/trainingitem_detail_row.html" %}
+        {% endwith %}
+    {% endfor %}
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/training/templates/training/trainingitem_detail_row.html b/training/templates/training/trainingitem_detail_row.html
new file mode 100644
index 00000000..41c1af71
--- /dev/null
+++ b/training/templates/training/trainingitem_detail_row.html
@@ -0,0 +1,31 @@
+<tr class="
+        {% if record.assessed %}
+        success
+        {% elif record.complete %}
+        info
+        {% elif record.started %}
+        warning
+        {% else %}
+        danger
+        {% endif %}
+    ">
+    <td>{{ record.training_item }}</td>
+    <td>
+        {{ record.started_date|default_if_none:"No" }} <em>{{ record.started_trainer|default_if_none:"" }}</em>
+        {% if record.started_notes %}
+            <pre>{{ record.started_notes }}</pre>
+        {% endif %}
+    </td>
+    <td>
+        {{ record.completed_date|default_if_none:"No" }} <em>{{ record.completed_trainer|default_if_none:"" }}</em>
+        {% if record.completed_notes %}
+            <pre>{{ record.completed_notes }}</pre>
+        {% endif %}
+    </td>
+    <td>
+        {{ record.assessed_date|default_if_none:"No" }} <em>{{ record.assessed_trainer|default_if_none:"" }}</em>
+        {% if record.assessed_notes %}
+            <pre>{{ record.assessed_notes }}</pre>
+        {% endif %}
+    </td>
+</tr>
\ No newline at end of file