diff --git a/assets/templates/asset_detail.html b/assets/templates/asset_detail.html
index 798ab68e..0ab8a8fe 100644
--- a/assets/templates/asset_detail.html
+++ b/assets/templates/asset_detail.html
@@ -30,5 +30,5 @@
 <div class="col-md-12">
   {% include 'partials/asset_buttons.html' %}
 </div>
-{% include 'partials/last_edited_asset.html' with target="asset_history" %}
+{% include 'partials/last_edited.html' with target="asset_history" id=object.asset_id %}
 {% endblock %}
diff --git a/assets/views.py b/assets/views.py
index 9faeb468..c6ab541d 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -233,18 +233,33 @@ class SupplierVersionHistory(versioning.VersionHistory):
 
 
 class AssetVersionHistory(versioning.VersionHistory):
-    template_name = "asset_version_history.html"
+    template_name = "version_history.html"
 
     def get_object(self, **kwargs):
         return get_object_or_404(models.Asset, asset_id=self.kwargs['pk'])
 
+    def get_context_data(self, **kwargs):
+        context = super(AssetVersionHistory, self).get_context_data(**kwargs)
+        context['object'] = self.get_object()
+        context['id'] = self.get_object().asset_id
+        context['override'] = 'base_assets.html'
+
+        return context
+
 
 class ActivityTable(versioning.ActivityTable):
     model = versioning.RIGSVersion
-    template_name = "asset_activity_table.html"
+    template_name = "activity_table.html"
     paginate_by = 25
 
     def get_queryset(self):
         versions = versioning.RIGSVersion.objects.get_for_multiple_models(
             [models.Asset, models.Supplier])
         return versions
+
+    def get_context_data(self, **kwargs):
+        context = super(ActivityTable, self).get_context_data(**kwargs)
+        context['override'] = 'base_assets.html'
+        context['title'] = 'Asset Database'
+
+        return context
diff --git a/versioning/templates/activity_feed.html b/versioning/templates/activity_feed.html
index c61f9065..6e55acd4 100644
--- a/versioning/templates/activity_feed.html
+++ b/versioning/templates/activity_feed.html
@@ -1,5 +1,5 @@
 {% block js %}
-{% include 'version_scripts.html' %}
+{% include 'partials/version_scripts.html' %}
 <script>
   $(document).ready(function() {
     $(function () {
diff --git a/versioning/templates/activity_table.html b/versioning/templates/activity_table.html
index d63e5329..bf132ebf 100644
--- a/versioning/templates/activity_table.html
+++ b/versioning/templates/activity_table.html
@@ -1,16 +1,16 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends override|default:'base_rigs.html' %}
 {% load paginator from filters %}
 {% load to_class_name from filters %}
 
-{% block title %}Rigboard Activity Stream{% endblock %}
+{% block title %}{{ title }} Activity Stream{% endblock %}
 
 {% block js %}
-{% include 'version_scripts.html' %}
+{% include 'partials/version_scripts.html' %}
 {% endblock %}
 
 {% block content %}
 <div class="col-sm-12">
-    <h3>Rigboard Activity Stream</h3>
+    <h3>{{ title }} Activity Stream</h3>
     {% include 'partials/activity_table_body.html' %}
     {% paginator %}
 </div>
diff --git a/versioning/templates/asset_activity_table.html b/versioning/templates/asset_activity_table.html
deleted file mode 100644
index ed937234..00000000
--- a/versioning/templates/asset_activity_table.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
-{% load static %}
-{% load paginator from filters %}
-
-{% block title %}Asset Activity Stream{% endblock %}
-
-{% block js %}
-{% include 'version_scripts.html' %}
-{% endblock %}
-
-{% block content %}
-<div class="col-sm-12">
-    <h3>Asset Activity Stream</h3>
-    {% include 'partials/activity_table_body.html' %}
-    <div class="align-center">{% paginator %}</div>
-</div>
-{% endblock %}
diff --git a/versioning/templates/asset_version_history.html b/versioning/templates/asset_version_history.html
deleted file mode 100644
index 2ab68f78..00000000
--- a/versioning/templates/asset_version_history.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
-{% load to_class_name from filters %}
-{% load paginator from filters %}
-{% load static %}
-
-{% block title %}{{object|to_class_name}} {{ object.asset_id }} - Revision History{% endblock %}
-
-{% block js %}
-{% include 'version_scripts.html' %}
-{% endblock %}
-
-{% block content %}
-<div class="col-sm-12">
-    <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.asset_id|default:object.pk }}</a> - Revision History</h3>
-    {% include 'partials/version_history_table.html' %}
-    <div>{% paginator %}</div>
-</div>
-{% endblock %}
diff --git a/versioning/templates/partials/last_edited.html b/versioning/templates/partials/last_edited.html
index 91d6e0b3..274b226e 100644
--- a/versioning/templates/partials/last_edited.html
+++ b/versioning/templates/partials/last_edited.html
@@ -1,5 +1,5 @@
 <div class="pt-2">
-    <a href="{% url target object.pk %}" title="View Revision History">
+    <a href="{% url target id|default:object.pk %}" title="View Revision History">
     Last edited {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'System' }}
     </a>
 </div>
diff --git a/versioning/templates/partials/last_edited_asset.html b/versioning/templates/partials/last_edited_asset.html
deleted file mode 100644
index c1489e65..00000000
--- a/versioning/templates/partials/last_edited_asset.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="pt-2">
-    <a href="{% url target object.asset_id %}" title="View Revision History">
-    Last edited {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'System' }}
-    </a>
-</div>
diff --git a/versioning/templates/version_scripts.html b/versioning/templates/partials/version_scripts.html
similarity index 100%
rename from versioning/templates/version_scripts.html
rename to versioning/templates/partials/version_scripts.html
diff --git a/versioning/templates/version_history.html b/versioning/templates/version_history.html
index 98a40fc4..f36d422b 100644
--- a/versioning/templates/version_history.html
+++ b/versioning/templates/version_history.html
@@ -1,16 +1,16 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends override|default:'base_rigs.html' %}
 {% load to_class_name from filters %}
 {% load paginator from filters %}
 
-{% block title %}{{object|to_class_name}} {{ object.pk|stringformat:"05d" }} - Revision History{% endblock %}
+{% block title %}{{object|to_class_name}} {{ id }} - Revision History{% endblock %}
 
 {% block js %}
-{% include 'version_scripts.html' %}
+{% include 'partials/version_scripts.html' %}
 {% endblock %}
 
 {% block content %}
 <div class="col-sm-12">
-    <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.pk|stringformat:"05d" }}</a> - Revision History</h3>
+    <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ id }}</a> - Revision History</h3>
     {% include 'partials/version_history_table.html' %}
     <div>{% paginator %}</div>
 </div>
diff --git a/versioning/versioning.py b/versioning/versioning.py
index 0c861b10..41c5bc5d 100644
--- a/versioning/versioning.py
+++ b/versioning/versioning.py
@@ -209,6 +209,7 @@ class VersionHistory(generic.ListView):
     def get_context_data(self, **kwargs):
         context = super(VersionHistory, self).get_context_data(**kwargs)
         context['object'] = self.get_object()
+        context['id'] = self.get_object().pk
 
         return context
 
@@ -222,6 +223,12 @@ class ActivityTable(generic.ListView):
         versions = RIGSVersion.objects.get_for_multiple_models([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation])
         return versions.order_by("-revision__date_created")
 
+    def get_context_data(self, **kwargs):
+        context = super(ActivityTable, self).get_context_data(**kwargs)
+        context['title'] = 'Rigboard'
+
+        return context
+
 
 class ActivityFeed(generic.ListView):
     model = RIGSVersion