diff --git a/assets/templates/asset_detail.html b/assets/templates/asset_detail.html
index 34d47af9..798ab68e 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.html' with target="asset_history" %}
+{% include 'partials/last_edited_asset.html' with target="asset_history" %}
 {% endblock %}
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 480421cd..687e6339 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -15,11 +15,8 @@
 {% endblock %}
 
 {% block content %}
-<div class="page-header">
-  <h1 class="text-center">Asset List</h1>
-</div>
-
-<form id="asset-search-form" method="GET" class="form my-2">
+<h1>Asset List</h1>
+<form id="asset-search-form" method="GET" class="form py-2">
   <div class="row my-2">
       <div class="input-group">
         {% render_field form.query|add_class:'form-control' placeholder='Search by Asset ID/Desc/Serial' style="width: 250px"%}
@@ -27,14 +24,14 @@
         <span class="input-group-append"><button type="submit" class="btn btn-primary">Search</button></span>
       </div>
   </div>
-  <div class="row my-2 justify-content-end">
+  <div class="row justify-content-end">
       <div id="category-group" class="form-group px-2">
         <label for="category" class="sr-only">Category</label>
-        {% render_field form.category|attr:'multiple'|add_class:'form-control custom-select selectpicker col-xs' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
+        {% render_field form.category|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
       </div>
       <div id="status-group" class="form-group px-2">
         <label for="status" class="sr-only">Status</label>
-        {% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-xs' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
+        {% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
       </div>
       <button id="filter-submit" type="submit" class="btn btn-secondary">Filter</button>
   </div>
diff --git a/versioning/templates/activity_table.html b/versioning/templates/activity_table.html
index ab0262bc..d63e5329 100644
--- a/versioning/templates/activity_table.html
+++ b/versioning/templates/activity_table.html
@@ -10,45 +10,8 @@
 
 {% block content %}
 <div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-12">
-                <h3>Rigboard Activity Stream</h3>
-            </div>
-        </div>
-        {% paginator %}
-        <div class="table-responsive">
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Object</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-
-                            <tr>
-                                <td>{{ version.revision.date_created }}</td>
-                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.pk|stringformat:"05d" }}</a></td>
-                           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                                <td>{{ version.revision.user.name }}</td>
-                                <td>
-                                  {% if version.changes.old == None %}
-                                    {{version.changes.new|to_class_name}} Created
-                                  {% else %}
-                                    {% include 'version_changes.html' %}
-                                  {% endif %}
-                                </td>
-                            </tr>
-
-        			{% endfor %}
-                </tbody>
-            </table>
-
-        </div>
-        {% paginator %}
-    </div>
+    <h3>Rigboard Activity Stream</h3>
+    {% include 'partials/activity_table_body.html' %}
+    {% paginator %}
+</div>
 {% endblock %}
diff --git a/versioning/templates/asset_activity_table.html b/versioning/templates/asset_activity_table.html
index d9c43541..ed937234 100644
--- a/versioning/templates/asset_activity_table.html
+++ b/versioning/templates/asset_activity_table.html
@@ -1,76 +1,17 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
 {% load static %}
 {% load paginator from filters %}
-{% load to_class_name from filters %}
 
 {% block title %}Asset Activity Stream{% endblock %}
 
-{# TODO: Find a way to reduce code duplication...can't just include the content because of the IDs... #}
-
 {% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
-    <script src="{% static "js/popover.js" %}"></script>
-    <script src="{% static "js/moment.js" %}"></script>
-    <script>
-    	$(function () {
-		  $('[data-toggle="popover"]').popover().click(function(){
-        if($(this).attr('href')){
-          window.location.href = $(this).attr('href');
-        }
-      });
-    $('.date').each(function (index, dateElem) {
-        var $dateElem = $(dateElem);
-        var formatted = moment($dateElem.attr('data-date')).fromNow();
-        $dateElem.text(formatted);
-       });
-		})
-    </script>
+{% include 'version_scripts.html' %}
 {% endblock %}
 
 {% block content %}
 <div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-12">
-                <h3>Asset Activity Stream</h3>
-            </div>
-            <div class="text-right col-sm-12">{% paginator %}</div>
-        </div>
-        <div class="table-responsive">
-
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Object</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                    <td>Comment</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-
-                            <tr>
-                                <td>{{ version.revision.date_created }}</td>
-                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.asset_id|default:version.changes.new.pk }}</a></td>
-                           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                                <td>{{ version.revision.user.name }}</td>
-                                <td>
-                                  {% if version.changes.old == None %}
-                                    {{version.changes.new|to_class_name}} Created
-                                  {% else %}
-                                    {% include 'RIGS/version_changes.html' %}
-                                  {% endif %}                        </td>
-                                  <td>{{ version.changes.revision.comment }}</td>
-                            </tr>
-
-        			{% endfor %}
-
-                </tbody>
-            </table>
-
-        </div>
-        <div class="align-right">{% paginator %}</div>
-    </div>
+    <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
index 89223294..2ab68f78 100644
--- a/versioning/templates/asset_version_history.html
+++ b/versioning/templates/asset_version_history.html
@@ -6,63 +6,13 @@
 {% block title %}{{object|to_class_name}} {{ object.asset_id }} - Revision History{% endblock %}
 
 {% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
-    <script src="{% static "js/popover.js" %}"></script>
-    <script>
-    	$(function () {
-            $('[data-toggle="popover"]').popover().click(function(){
-                    if($(this).attr('href')){
-                      window.location.href = $(this).attr('href');
-                    }
-                  });
-        })
-    </script>
+{% include 'version_scripts.html' %}
 {% endblock %}
 
 {% block content %}
 <div class="col-sm-12">
-        <div class="row">
-            <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>
-            </div>
-            <div class="text-right col-sm-12">{% paginator %}</div>
-        </div>
-        <div class="table-responsive">
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                    <td>Comment</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-
-                            <tr>
-                           		<td>{{ version.revision.date_created }}</td>
-                                <td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                                <td>{{ version.revision.user.name }}</td>
-                                <td>
-                                    {% if version.changes.old is None %}
-                                        {{object|to_class_name}} Created
-                                    {% else %}
-                                        {% include 'RIGS/version_changes.html' %}
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {{ version.revision.comment }}
-                                </td>
-                            </tr>
-
-
-        			{% endfor %}
-
-                </tbody>
-            </table>
-         </div>
-    <div class="align-right">{% paginator %}</div>
+    <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/activity_table_body.html b/versioning/templates/partials/activity_table_body.html
new file mode 100644
index 00000000..751c7b69
--- /dev/null
+++ b/versioning/templates/partials/activity_table_body.html
@@ -0,0 +1,37 @@
+{% load to_class_name from filters %}
+<div class="table-responsive">
+	<table class="table table-striped">
+        <thead class="thead-dark">
+            <tr>
+                <th scope="col">Date</th>
+                <th scope="col">Object</th>
+                <th scope="col">Version ID</th>
+                <th scope="col">User</th>
+                <th scope="col">Changes</th>
+            </tr>
+        </thead>
+        <tbody>
+    	{% for version in object_list %}
+        <tr>
+            <th scope="row">{{ version.revision.date_created }}</th>
+            <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}}
+            {% if version.changes.new.asset_id %}
+                {{ version.changes.new.asset_id }}
+            {% else %}
+                {{ version.changes.new.pk|stringformat:"05d" }}
+            {% endif %}
+            </a></td>
+       		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
+            <td>{{ version.revision.user.name|default:"System" }}</td>
+            <td>
+              {% if version.changes.old == None %}
+                {{version.changes.new|to_class_name}} Created
+              {% else %}
+                {% include 'version_changes.html' %}
+              {% endif %}
+            </td>
+        </tr>
+		{% endfor %}
+        </tbody>
+    </table>
+</div>
diff --git a/versioning/templates/partials/last_edited_asset.html b/versioning/templates/partials/last_edited_asset.html
new file mode 100644
index 00000000..c1489e65
--- /dev/null
+++ b/versioning/templates/partials/last_edited_asset.html
@@ -0,0 +1,5 @@
+<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/partials/version_history_table.html b/versioning/templates/partials/version_history_table.html
new file mode 100644
index 00000000..96fe6780
--- /dev/null
+++ b/versioning/templates/partials/version_history_table.html
@@ -0,0 +1,29 @@
+{% load to_class_name from filters %}
+<div class="table-responsive">
+	<table class="table table-striped">
+        <thead class="thead-dark">
+        <tr>
+            <th scope="col">Date</td>
+            <th scope="col">Version ID</td>
+            <th scope="col">User</td>
+            <th scope="col">Changes</td>
+        </tr>
+        </thead>
+        <tbody>
+        	{% for version in object_list %}
+            <tr>
+                <th scope="row">{{ version.revision.date_created }}</th>
+                <td>{{ version.pk }}|{{ version.revision.pk }}</td>
+                <td>{{ version.revision.user.name }}</td>
+                <td>
+                    {% if version.changes.old is None %}
+                        {{object|to_class_name}} Created
+                    {% else %}
+                        {% include 'version_changes.html' %}
+                    {% endif %}
+                </td>
+            </tr>
+			{% endfor %}
+        </tbody>
+    </table>
+ </div>
diff --git a/versioning/templates/version_history.html b/versioning/templates/version_history.html
index 0625e309..98a40fc4 100644
--- a/versioning/templates/version_history.html
+++ b/versioning/templates/version_history.html
@@ -10,40 +10,8 @@
 
 {% block content %}
 <div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-12">
-                <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.pk|stringformat:"05d" }}</a> - Revision History</h3>
-            </div>
-        </div>
-        <div>{% paginator %}</div>
-        <div class="table-responsive">
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-                    <tr>
-                        <td>{{ version.revision.date_created }}</td>
-                        <td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                        <td>{{ version.revision.user.name }}</td>
-                        <td>
-                            {% if version.changes.old is None %}
-                                {{object|to_class_name}} Created
-                            {% else %}
-                                {% include 'version_changes.html' %}
-                            {% endif %}
-                        </td>
-                    </tr>
-        			{% endfor %}
-                </tbody>
-            </table>
-         </div>
+    <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.pk|stringformat:"05d" }}</a> - Revision History</h3>
+    {% include 'partials/version_history_table.html' %}
     <div>{% paginator %}</div>
 </div>
 {% endblock %}
diff --git a/versioning/templates/version_scripts.html b/versioning/templates/version_scripts.html
index c5602e20..f3524d71 100644
--- a/versioning/templates/version_scripts.html
+++ b/versioning/templates/version_scripts.html
@@ -1,4 +1,4 @@
-{% load static %} 
+{% load static %}
 <script src="{% static "js/tooltip.js" %}"></script>
 <script src="{% static "js/popover.js" %}"></script>
 <script src="{% static "js/moment.js" %}"></script>
@@ -6,15 +6,10 @@
     $(function () {
             $('[data-toggle="tooltip"]').tooltip();
     });
+    var whiteList = $.fn.tooltip.Constructor.Default.whiteList
+    whiteList.ins = []
+    whiteList.del = []
     $(function() {
         $('[data-toggle="popover"]').popover({whiteList: whiteList});
     });
 </script>
-<script>
-    var whiteList = $.fn.tooltip.Constructor.Default.whiteList
-    whiteList.ins = []
-    whiteList.del = []
-    $(document).ready(function() {
-        
-    });
-</script>
\ No newline at end of file