diff --git a/assets/templates/asset_audit.html b/assets/templates/asset_audit.html
index e2f2d001..3d0190ba 100644
--- a/assets/templates/asset_audit.html
+++ b/assets/templates/asset_audit.html
@@ -64,16 +64,16 @@
     <div class="form-group form-row">
       {% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
       <div class="col-4">
-        <button class="btn btn-danger" onclick="setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1">5{{ form.length.help_text }}</button>
-        <button class="btn btn-success" onclick="setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1">10{{ form.length.help_text }}</button>
-        <button class="btn btn-info" onclick="setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1">20{{ form.length.help_text }}</button>
+        <button class="btn btn-danger" onclick="setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1" type="button">5{{ form.length.help_text }}</button>
+        <button class="btn btn-success" onclick="setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1" type="button">10{{ form.length.help_text }}</button>
+        <button class="btn btn-info" onclick="setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1" type="button">20{{ form.length.help_text }}</button>
       </div>
     </div>
     <div class="form-group form-row">
       {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
       <div class="col-4">
-        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1">1.5{{ form.csa.help_text }}</button>
-        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1">2.5{{ form.csa.help_text }}</button>
+        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1" type="button">1.5{{ form.csa.help_text }}</button>
+        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1" type="button">2.5{{ form.csa.help_text }}</button>
       </div>
     </div>
   </div>
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index e90eb337..ae669c4a 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -12,9 +12,7 @@
         });
         $('#searchButton').click(function (e) {
              e.preventDefault();
-             var url = "{% url 'asset_audit' None %}";
-             var id = $("#{{form.q.id_for_label}}").val();
-             url = url.replace('None', id);
+             var url = "{% url 'asset_audit' None %}".replace('None', $("#{{form.q.id_for_label}}").val();
              $.ajax({
                 url: url,
                 success: function(){
diff --git a/training/templates/edit_training_record.html b/training/templates/edit_training_record.html
index 77cc4987..e10132f5 100644
--- a/training/templates/edit_training_record.html
+++ b/training/templates/edit_training_record.html
@@ -21,9 +21,6 @@
 {% endblock %}
 
 {% block content %}
-{% if form.errors %}
-	{% include 'form_errors.html' %}
-{% endif %}
 <form role="form" action="{{ form.action|default:request.path }}" method="POST" id="add_record_form">
     {% include 'form_errors.html' %}
     {% csrf_token %}
@@ -44,9 +41,10 @@
     </div>
     <div class="form-group form-row">
         <label for="date" class="col-sm-2 col-form-label">Training Date</label>
-        <div class="col-sm-10">
+        <div class="col-sm-8">
             {% render_field form.date|add_class:'form-control'|attr:'type="date"' value=form.date.initial %}
         </div>
+        <button class="btn btn-info col-sm-2" onclick="var date = new Date(); $('#id_date').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'))" tabindex="-1" type="button">Today</button>
     </div>
     <div class="form-group form-row">
         <label for="item_description" class="col-sm-2 col-form-label">Notes</label>
diff --git a/training/templates/level_detail.html b/training/templates/level_detail.html
index 171007ba..2a1b711a 100644
--- a/training/templates/level_detail.html
+++ b/training/templates/level_detail.html
@@ -1,5 +1,8 @@
 {% extends 'base_training.html' %}
 
+{% load user_has_qualification from tags %}
+{% load user_level_if_present from tags %}
+
 {% block content %}
 {% if edit or True %}
 <div class="col-sm-12 text-right pr-0">
@@ -27,6 +30,8 @@
             </div>
             <div class="card-footer text-right pr-1"><a href="{% url 'profile_detail' user.pk %}" class="btn btn-primary btn-sm"><span class="fas fa-user"></span> View Profile</a></div>
         </div>
+        {% empty %}
+        Nobody here but us chickens...
         {% endfor %}
         </div>
     </div>
@@ -43,12 +48,23 @@
       </thead>
       <tbody>
         <tr>
-          <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-danger btn-sm" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-times-circle"></span></a>{% endif %}</li>{% endfor %}</ul></td>
-          <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-danger btn-sm" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-times-circle"></span></a>{% endif %}</li>{% endfor %}</ul></td>
-          <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-danger btn-sm" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-times-circle"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 0 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-danger btn-sm" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-times-circle"></span></a>{% endif %}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 1 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-danger btn-sm" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-times-circle"></span></a>{% endif %}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 2 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-danger btn-sm" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-times-circle"></span></a>{%endif%}</li>{% endfor %}</ul></td>
         </tr>
       </tbody>
     </table>
+    <h4 class="card-header">Prerequisite Levels:</h4>
+    <div class="card-body">
+       <ul>
+       {% for level in object.prerequisite_levels.all %}
+       {% user_level_if_present request.user level as level_qualification %}
+       <li><a href="{{level.get_absolute_url}}">{{ level }}</a> <span class="fas {% if level_qualification %}text-success fa-check{% if level_qualification.confirmed_by is not None %}-double{% endif %}{% else %}fa-hourglass-start text-warning{%endif%}"></span></li>
+       {% empty %}
+       None
+       {% endfor %}
+       </ul>
+    </div>
 </div>
 {% include 'partials/last_edited.html' with target="traininglevel_history" %}
 {% endblock %}
diff --git a/training/templates/trainee_detail.html b/training/templates/trainee_detail.html
index 8534e343..ed4f9b6a 100644
--- a/training/templates/trainee_detail.html
+++ b/training/templates/trainee_detail.html
@@ -47,7 +47,7 @@
 {% block content %}
 <div class="row">
     <div class="col-sm-12 text-right">
-    <a type="button" class="btn btn-success modal-href" href="{% url 'edit_record' pk=request.user.pk %}" id="add_record">
+    <a type="button" class="btn btn-success" href="{% url 'edit_record' pk=request.user.pk %}" id="add_record">
 	    <span class="fas fa-plus"></span> Add New Training Record
     </a>
     </div>
@@ -70,31 +70,8 @@
                 <p>{{ level.description|truncatewords:30 }}</p>
                 <div class="progress mb-2">
                   {% percentage_complete level object as completion %}
-
                   <div class="progress-bar progress-bar-striped" role="progressbar" style="width: {{completion}}%" aria-valuenow="{{completion}}" aria-valuemin="0" aria-valuemax="100">{{completion}}% complete</div>
                 </div>
-
-                <button class="btn btn-link p-0" type="button" data-toggle="collapse" data-target=".reqs_{{level.pk}}" aria-expanded="false" aria-controls="reqs_{{level.pk}}">
-                   Requirements <span class="fas fa-caret-right reqs_{{level.pk}} collapse show"></span><span class="fas fa-caret-down collapse reqs_{{level.pk}}"></span>
-                </button>
-                <div class="collapse reqs_{{level.pk}}">
-                  <table class="table table-sm">
-                      <thead>
-                        <tr>
-                          <th scope="col" class="table-warning">Training Started</th>
-                          <th scope="col" class="table-success">Training Complete</th>
-                          <th scope="col" class="table-info">Passed Out</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr>
-                          <td><ul class="list-unstyled">{% for req in level.started_requirements %}<li>{{ req.item }} {% user_has_qualification object req.item 0 %}</li>{% endfor %}</ul></td>
-                          <td><ul class="list-unstyled">{% for req in level.complete_requirements %}<li>{{ req.item }} {% user_has_qualification object req.item 1 %}</li>{% endfor %}</ul></td>
-                          <td><ul class="list-unstyled">{% for req in level.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification object req.item 2 %}</li>{% endfor %}</ul></td>
-                        </tr>
-                      </tbody>
-                   </table>
-                </div>
             </div>
             <div class="card-footer text-right">
                 {% user_level_if_present object level as level_qualification %}
diff --git a/training/views.py b/training/views.py
index e2e48d8f..6b64767e 100644
--- a/training/views.py
+++ b/training/views.py
@@ -3,7 +3,7 @@ import reversion
 from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.views import generic
-from PyRIGS.views import OEmbedView, is_ajax
+from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin
 from training import models, forms
 from django.utils import timezone
 from django.db import transaction
@@ -21,7 +21,7 @@ class ItemList(generic.ListView):
         return context
 
 
-class TraineeDetail(views.ProfileDetail):
+class TraineeDetail(views.ProfileDetail, ModalURLMixin):
     template_name = "trainee_detail.html"
     model = models.Trainee
 
@@ -36,6 +36,9 @@ class TraineeDetail(views.ProfileDetail):
             context[str(i)] = self.object.get_records_of_depth(i)
         return context
 
+    def get_success_url(self):
+        return self.get_close_url('trainee_detail', 'trainee_detail')
+
 
 class TraineeItemDetail(generic.ListView):
     model = models.TrainingItemQualification