diff --git a/RIGS/hs.py b/RIGS/hs.py
index 72719ec7..33fa5d80 100644
--- a/RIGS/hs.py
+++ b/RIGS/hs.py
@@ -82,7 +82,7 @@ class EventRiskAssessmentList(generic.ListView):
     template_name = 'hs_object_list.html'
 
     def get_queryset(self):
-        return self.model.objects.order_by('reviewed_at').select_related('event')
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
 
     def get_context_data(self, **kwargs):
         context = super(EventRiskAssessmentList, self).get_context_data(**kwargs)
@@ -187,6 +187,9 @@ class EventChecklistList(generic.ListView):
     model = models.EventChecklist
     template_name = 'hs_object_list.html'
 
+    def get_queryset(self):
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+
     def get_context_data(self, **kwargs):
         context = super(EventChecklistList, self).get_context_data(**kwargs)
         context['title'] = 'Event Checklist'
@@ -215,7 +218,7 @@ class HSList(generic.ListView):
     template_name = 'hs_list.html'
 
     def get_queryset(self):
-        return models.Event.objects.all().order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
+        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
 
     def get_context_data(self, **kwargs):
         context = super(HSList, self).get_context_data(**kwargs)
diff --git a/RIGS/models.py b/RIGS/models.py
index 76e43c66..5d2b821b 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -370,6 +370,9 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def vat(self):
+        # No VAT is owed on internal transfers
+        if self.internal:
+            return 0
         return Decimal(self.sum_total * self.vat_rate.rate).quantize(Decimal('.01'))
 
     """
diff --git a/RIGS/templates/event_checklist_detail.html b/RIGS/templates/event_checklist_detail.html
index 8c5a34d0..f868e4f5 100644
--- a/RIGS/templates/event_checklist_detail.html
+++ b/RIGS/templates/event_checklist_detail.html
@@ -8,7 +8,7 @@
 <div class="row">
     <div class="col-12 text-right my-3">
         {% button 'edit' url='ec_edit' pk=object.pk %}
-        {% button 'view' url='event_detail' pk=object.pk text="Event" %}
+        {% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
         {% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
     </div>
 </div>
diff --git a/RIGS/templates/event_print_page.xml b/RIGS/templates/event_print_page.xml
index e8495af2..b3d7ecfa 100644
--- a/RIGS/templates/event_print_page.xml
+++ b/RIGS/templates/event_print_page.xml
@@ -190,19 +190,21 @@
                 {% endif %}
             </para>
         </td>
-        <td>£ {{ item.cost|floatformat:2 }}</td>
+        <td>£{{ item.cost|floatformat:2 }}</td>
         <td>{{ item.quantity }}</td>
-        <td>£ {{ item.total_cost|floatformat:2 }}</td>
+        <td>£{{ item.total_cost|floatformat:2 }}</td>
     </tr>
 {% endfor %}
 </blockTable>
 <keepTogether>
     <blockTable style="totalTable" colWidths="300,115,80">
+    {% if object.vat > 0 %}
     <tr>
-        <td>{% if quote %}VAT Registration Number: 170734807{% endif %}</td>
-        <td>Total (ex. VAT)</td>
+        <td>{% if quote %}VAT Registration Number: 170734807</td>
+        <td>Total (ex. VAT){% endif %}</td>
         <td>£ {{ object.sum_total|floatformat:2 }}</td>
     </tr>
+    {% endif %}
     <tr>
         <td>
             {% if quote %}
@@ -211,8 +213,10 @@
                 </para>
             {% endif %}
         </td>
+        {% if object.vat > 0 %}
         <td>VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}%</td>
-        <td>£ {{ object.vat|floatformat:2 }}</td>
+        <td>£{{ object.vat|floatformat:2 }}</td>
+        {% endif %}
     </tr>
     <tr>
         <td>
@@ -224,7 +228,7 @@
         </td>
         {% if invoice %}
             <td>Total</td>
-            <td>£ {{ object.total|floatformat:2 }}</td>
+            <td>£{{ object.total|floatformat:2 }}</td>
         {% else %}
             <td>
                 <para>
@@ -233,7 +237,7 @@
             </td>
             <td>
                 <para>
-                    <b>£ {{ object.total|floatformat:2 }}</b>
+                    <b>£{{ object.total|floatformat:2 }}</b>
                 </para>
             </td>
         {% endif %}
@@ -267,7 +271,7 @@
             <tr>
                 <td>{{ payment.get_method_display }}</td>
                 <td>{{ payment.date }}</td>
-                <td>£ {{ payment.amount|floatformat:2 }}</td>
+                <td>£{{ payment.amount|floatformat:2 }}</td>
             </tr>
         {% endfor %}
     </blockTable>
@@ -275,18 +279,18 @@
         <tr>
             <td></td>
             <td>Payment Total</td>
-            <td>£ {{ object.invoice.payment_total|floatformat:2 }}</td>
+            <td>£{{ object.invoice.payment_total|floatformat:2 }}</td>
         </tr>
         <tr>
             <td></td>
             <td>
                 <para>
-                    <b>Balance</b> (ex. VAT)
+                    <b>Balance</b> {% if object.vat > 0 %}(ex. VAT){% endif %}
                 </para>
             </td>
             <td>
                 <para>
-                    <b>£ {{ object.invoice.balance|floatformat:2 }}</b>
+                    <b>£{{ object.invoice.balance|floatformat:2 }}</b>
                 </para>
             </td>
         </tr>
@@ -316,7 +320,7 @@
         <tr>
             <td>General Enquires and 24 Hour Emergency Contact: 0115 84 68720</td>
         </tr>
-    {% else %}
+    {% elif object.vat > 0 %}
         <tr>
         <td>
             <para>VAT Registration Number: 170734807</para>
diff --git a/RIGS/templates/hs_list.html b/RIGS/templates/hs_list.html
index 0a11b99b..221eecd2 100644
--- a/RIGS/templates/hs_list.html
+++ b/RIGS/templates/hs_list.html
@@ -4,10 +4,11 @@
 
 {% block content %}
 <div class="table-responsive">
-    <table class="table mb-0">
+    <table class="table mb-0 table-sm">
         <thead>
             <tr>
                 <th scope="col">Event</th>
+                <th scope="col">MIC</th>
                 <th scope="col">Dates</th>
                 <th scope="col">RA</th>
                 <th scope="col">Checklists</th>
@@ -16,7 +17,8 @@
         <tbody>
         {% for event in object_list %}
         <tr id="event_row">
-            <th scope="row" id="event_number"><a href="{% url 'event_detail' event.pk %}">{{ event }}</a></th>
+            <th scope="row" id="event_number"><a href="{% url 'event_detail' event.pk %}">{{ event }}</a><br><small>{{ event.get_status_display }}</small></th>
+            <td>{% if event.mic is not None %}<a href="{% url 'profile_detail' event.mic.pk %}">{% else %}<span class="text-danger">{% endif %}{{ event.mic }}{% if event.mic is not None %}</a>{% else %}</span>{%endif%}</td>
             <!--Dates-->
             <td id="event_dates">
                 <span><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></span>
diff --git a/RIGS/templates/hs_object_list.html b/RIGS/templates/hs_object_list.html
index c9029a02..c3ebaf4d 100644
--- a/RIGS/templates/hs_object_list.html
+++ b/RIGS/templates/hs_object_list.html
@@ -15,7 +15,7 @@
     <div class="row">
         <div class="col-12">
             <div class="table-responsive">
-                <table class="table mb-0">
+                <table class="table mb-0 table-sm">
                     <thead>
                         <tr>
                             <th scope="col">Event</th>
@@ -32,7 +32,7 @@
                     {% for object in object_list %}
                     <tr class="{% if object.reviewed_by %}table-success{%endif%}">
                         {# General #}
-                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a></th>
+                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a><br><small>{{ object.event.get_status_display }}</small></th>
                         {% for field in object_list.0.fieldz %}
                             <td>{{ object|get_field:field }}</td>
                         {% endfor %}
diff --git a/RIGS/templates/item_row.html b/RIGS/templates/item_row.html
index fa4cf7ca..b71facd8 100644
--- a/RIGS/templates/item_row.html
+++ b/RIGS/templates/item_row.html
@@ -6,11 +6,11 @@
         </div>
 	</th>
     {% if perms.RIGS.view_event %}
-	<td>£&nbsp;<span class="cost">{{item.cost|floatformat:2}}</span></td>
+	<td>£<span class="cost">{{item.cost|floatformat:2}}</span></td>
     {% endif %}
 	<td class="quantity">{{item.quantity}}</td>
     {% if perms.RIGS.view_event %}
-	<td>£&nbsp;<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
+	<td>£<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
     {% endif %}
 	{% if edit %}
     <td class="vert-align text-right">
diff --git a/RIGS/templates/partials/item_table.html b/RIGS/templates/partials/item_table.html
index 305ca335..50be6b84 100644
--- a/RIGS/templates/partials/item_table.html
+++ b/RIGS/templates/partials/item_table.html
@@ -27,12 +27,13 @@
 			{% endfor %}
 		</tbody>
         {% if auth or perms.RIGS.view_event %}
-		<tfoot>
+		<tfoot style="font-weight: bold">
 			<tr>
 				<td rowspan="3" colspan="2"></td>
-				<td>Total (ex. VAT)</td>
-				<td colspan="2">£ <span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td>
+				<td>Total {% if object.vat > 0 or not object.pk %}(ex. VAT){% endif %}</td>
+				<td colspan="2">£<span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td>
 			</tr>
+            {% if object.vat > 0 or not object.pk %}
 			<tr>
 				{% if not object.pk %}
 					<td id="vat-rate" data-rate="{{currentVAT.rate}}">VAT @
@@ -41,12 +42,13 @@
 					<td id="vat-rate" data-rate="{{object.vat_rate.rate}}">VAT @
 						{{object.vat_rate.as_percent|floatformat|default:"TBD"}}%</td>
 				{% endif %}
-				<td colspan="2">£ <span id="vat">{{object.vat|default:0|floatformat:2}}</span></td>
+				<td colspan="2">£<span id="vat">{{object.vat|default:0|floatformat:2}}</span></td>
 			</tr>
 			<tr>
 				<td>Total</td>
-				<td colspan="2">£ <span id="total">{{object.total|default:0|floatformat:2}}</span></td>
+				<td colspan="2">£<span id="total">{{object.total|default:0|floatformat:2}}</span></td>
 			</tr>
+            {% endif %}
 		</tfoot>
         {% endif %}
 	</table>
@@ -59,9 +61,9 @@
                     <em class="description"></em>
                 </div>
         </td>
-        <td>£&nbsp;<span class="cost"></span></td>
+        <td>£<span class="cost"></span></td>
         <td class="quantity"></td>
-        <td>£&nbsp;<span class="sub-total"></span></td>
+        <td>£<span class="sub-total"></span></td>
         {% if edit %}
         <td class="vert-align text-right">
             <div class="btn-group" role="group" aria-label="Action buttons">
diff --git a/assets/converters.py b/assets/converters.py
new file mode 100644
index 00000000..da55d2e6
--- /dev/null
+++ b/assets/converters.py
@@ -0,0 +1,8 @@
+class AssetIDConverter:  # Forces lowercase to uppercase
+    regex = '[^/]+'
+
+    def to_python(self, value):
+        return str(value).upper()
+
+    def to_url(self, value):
+        return str(value).upper()
diff --git a/assets/urls.py b/assets/urls.py
index 468a2421..4ec111c1 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -1,22 +1,24 @@
 from django.contrib.auth.decorators import login_required
-from django.urls import path
+from django.urls import path, register_converter
 from django.views.decorators.clickjacking import xframe_options_exempt
 
 from PyRIGS.decorators import has_oembed, permission_required_with_403
 from PyRIGS.views import OEmbedView
-from assets import views
+from . import views, converters
+
+register_converter(converters.AssetIDConverter, 'asset')
 
 urlpatterns = [
     path('', login_required(views.AssetList.as_view()), name='asset_index'),
     path('asset/list/', login_required(views.AssetList.as_view()), name='asset_list'),
-    path('asset/id/<str:pk>/', has_oembed(oembed_view="asset_oembed")(views.AssetDetail.as_view()), name='asset_detail'),
+    path('asset/id/<asset:pk>/', has_oembed(oembed_view="asset_oembed")(views.AssetDetail.as_view()), name='asset_detail'),
     path('asset/create/', permission_required_with_403('assets.add_asset')
          (views.AssetCreate.as_view()), name='asset_create'),
-    path('asset/id/<str:pk>/edit/', permission_required_with_403('assets.change_asset')
+    path('asset/id/<asset:pk>/edit/', permission_required_with_403('assets.change_asset')
          (views.AssetEdit.as_view()), name='asset_update'),
-    path('asset/id/<str:pk>/duplicate/', permission_required_with_403('assets.add_asset')
+    path('asset/id/<asset:pk>/duplicate/', permission_required_with_403('assets.add_asset')
          (views.AssetDuplicate.as_view()), name='asset_duplicate'),
-    path('asset/id/<str:pk>/label', login_required(views.GenerateLabel.as_view()), name='generate_label'),
+    path('asset/id/<asset:pk>/label', login_required(views.GenerateLabel.as_view()), name='generate_label'),
 
     path('cabletype/list/', login_required(views.CableTypeList.as_view()), name='cable_type_list'),
     path('cabletype/create/', permission_required_with_403('assets.add_cable_type')(views.CableTypeCreate.as_view()), name='cable_type_create'),
diff --git a/assets/views.py b/assets/views.py
index 6acee29d..261d9753 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -48,9 +48,9 @@ class AssetList(LoginRequiredMixin, generic.ListView):
             queryset = self.model.objects.all()
         elif len(query_string) >= 3:
             queryset = self.model.objects.filter(
-                Q(asset_id__exact=query_string) | Q(description__icontains=query_string) | Q(serial_number__exact=query_string))
+                Q(asset_id__exact=query_string.upper()) | Q(description__icontains=query_string) | Q(serial_number__exact=query_string))
         else:
-            queryset = self.model.objects.filter(Q(asset_id__exact=query_string))
+            queryset = self.model.objects.filter(Q(asset_id__exact=query_string.upper()))
 
         if form.cleaned_data['category']:
             queryset = queryset.filter(category__in=form.cleaned_data['category'])
diff --git a/templates/base_ajax.html b/templates/base_ajax.html
index 49e9ddd6..435b7607 100644
--- a/templates/base_ajax.html
+++ b/templates/base_ajax.html
@@ -1,7 +1,7 @@
 <div class="modal-dialog modal-lg">
     <div class="modal-content">
         <div class="modal-header">
-            <h4 class="modal-title">{{page_title}}{% block title %}{% endblock %}</h4>
+            <h4 class="modal-title">{{page_title|safe}}{% block title %}{% endblock %}</h4>
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
             </button>