diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index 54b43bef..6e8171d9 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -5,17 +5,14 @@
 {% load nice_errors from filters %}
 
 {% block css %}
-    {{ block.super }}
     <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
-    {{ block.super }}
     <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block js %}
-    {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 
diff --git a/training/templates/edit_training_record.html b/training/templates/edit_training_record.html
index e10132f5..60d74980 100644
--- a/training/templates/edit_training_record.html
+++ b/training/templates/edit_training_record.html
@@ -5,17 +5,14 @@
 {% load button from filters %}
 
 {% block css %}
-    {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
-    {{ block.super }}
     <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
-    {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 {% endblock %}
@@ -35,9 +32,15 @@
       {% render_field form.depth|add_class:'form-control custom-select col-sm-4' %}
     </div>
     <div class="form-group form-row">
+      {% if external %}
+      <label for="supervisor" class="col-sm-2 col-form-label">Supervising Organisation</label>
+      <select name="supervisor" id="supervising_organisation_id" class="form-control selectpicker custom-select col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" required>
+      </select>
+      {% else %}
       <label for="supervisor" class="col-sm-2 col-form-label">Supervisor</label>
       <select name="supervisor" id="supervisor_id" class="form-control selectpicker custom-select col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required>
       </select>
+      {% endif %}
     </div>
     <div class="form-group form-row">
         <label for="date" class="col-sm-2 col-form-label">Training Date</label>
diff --git a/training/templates/trainee_detail.html b/training/templates/trainee_detail.html
index 7c051928..9a3e2459 100644
--- a/training/templates/trainee_detail.html
+++ b/training/templates/trainee_detail.html
@@ -6,10 +6,20 @@
 {% load user_level_if_present from tags %}
 {% load colour_from_depth from tags %}
 
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static 'js/selects.js' %}"></script>
+{% endblock %}
+
 {% block js %}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
     <script>
     $('document').ready(function(){
-        $('#add_record').click(function (e) {
+        $('#add_record,#add_external').click(function (e) {
              e.preventDefault();
              var url = $(this).attr("href");
              $.ajax({
@@ -38,6 +48,10 @@
     <a type="button" class="btn btn-success" href="{% url 'edit_record' object.pk %}" id="add_record">
 	    <span class="fas fa-plus"></span> Add New Training Record
     </a>
+    <a type="button" class="btn btn-warning" href="#" id="add_external">
+	    <span class="fas fa-building"></span> Log External Training
+    </a>
+    <a href="{% url 'trainee_item_detail' object.pk %}" class="btn btn-info col-2"><span class="fas fa-info-circle"></span> View Detailed Record</a><br/>
     </div>
 </div>
 <div class="row mb-3">
@@ -76,7 +90,7 @@
     </div>
 </div>
 <div class="row">
-    <h2 class="col-10">Training Items</h2><a href="{% url 'trainee_item_detail' object.pk %}" class="btn btn-info col-2"><span class="fas fa-info-circle"></span> View Detailed Record</a><br/>
+    <h2 class="col-10">Training Items</h2>
     <div class="alert alert-info" role="alert"><h3 class="col-12">Key: <span class="badge badge-warning">Training Started</span> <span class="badge badge-success">Training Complete</span> <span class="badge badge-info">Passed Out</span></h3></div>
     <div class="card-deck">
         {% for category in categories %}
diff --git a/training/templates/trainee_list.html b/training/templates/trainee_list.html
index e2a30a4b..70afbf0a 100644
--- a/training/templates/trainee_list.html
+++ b/training/templates/trainee_list.html
@@ -13,8 +13,9 @@
             <table class="table table-striped">
                 <thead>
                     <tr>
-                        <th scope="col">Name<a href="?{% orderby request 'orderBy' 'name' %}"><span class="caret"></span></a></th>
+                        <th scope="col">Name</th>
                         <th>Supervisor?</th>
+                        <th>Qualification Count</th>
                         <th></th>
                     </tr>
                 </thead>
@@ -23,6 +24,7 @@
                     <tr id="row_item">
                         <th scope="row" class="align-middle" id="cell_name">{{ object.name }} {% if request.user.pk == object.pk %}<span class="fas fa-user text-success"></span>{%endif%}</th>
                         <td {% if object.is_supervisor %}class="table-success"{%endif%}>{{ object.is_supervisor|yesno|title }}</td>
+                        <td>{{ object.qualifications_obtained.all|length }}</td>
                         <td>
                             <a class="btn btn-info" href="{% url 'trainee_detail' pk=object.pk %}"><span class="fas fa-eye"></span> View Training Record</a>
                             <a href="{% url 'trainee_item_detail' pk=object.pk %}" class="btn btn-info"><span class="fas fa-info-circle"></span> View Detailed Record</a>