diff --git a/RIGS/admin.py b/RIGS/admin.py
index df7fb0e8..12102da8 100644
--- a/RIGS/admin.py
+++ b/RIGS/admin.py
@@ -106,7 +106,7 @@ class AssociateAdmin(VersionAdmin):
                 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
                 'forms': forms
             }
-            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context)
+            return TemplateResponse(request, 'admin_associate_merge.html', context)
 
 
 @admin.register(models.Person)
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index 0ca82b97..f74ac118 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -56,10 +56,12 @@
 
 <h3>Audit Asset:</h3>
 <form id="asset-search-form" class="form-horizontal" method="POST">
-  <div class="input-group input-group-lg" style="width: auto;">
+  <div class="input-group input-group-lg" style="width=auto;">
     {% render_field form.query|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
-    <label for="query" class="sr-only">Asset ID:</label>
-    <span class="input-group-btn"><a id="searchButton" class="btn btn-default" class="submit" type="submit">Search</a></span>
+    <div class="input-group-append">
+        <label for="query" class="sr-only">Asset ID:</label>
+        <a id="searchButton" class="btn btn-primary" class="submit" type="submit">Search</a>
+    </div>
   </div>
 </form>
 
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
index 47ab19e6..d0ee9803 100644
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -5,8 +5,8 @@
 {% block title %}Asset {{ object.asset_id }}{% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static "css/bootstrap-select.css" %}"/>
-    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
 {% endblock %}
 
 {% block js %}
@@ -23,6 +23,51 @@
         }
         checkIfCableHidden();
     </script>
+    <script>
+    $('#parent_id')
+        .selectpicker({
+            liveSearch: true
+        })
+        .ajaxSelectPicker({
+            ajax: {
+                url: '{% url 'asset_search_json' %}',
+                type: "GET",
+                data: function () {
+                    var params = {
+                        {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
+                    };
+                    return params;
+                }
+            },
+            locale: {
+                emptyTitle: 'Search for item...'
+            },
+            preprocessData: function(data){
+                var assets = [];
+                if(data.length){
+                    var len = data.length;
+                    for(var i = 0; i < len; i++){
+                        var curr = data[i];
+                        assets.push(
+                            {
+                                'value': curr.id,
+                                'text': curr.label,
+                                'disabled': false
+                            }
+                        );
+                    }
+                    assets.push(
+                    {
+                        'value': null,
+                        'text': "No parent"
+                    });
+                }
+
+                return assets;
+            },
+            preserveSelected: false
+        });
+    </script>
 {% endblock %}
 
 {% block content %}
diff --git a/assets/templates/partials/asset_picker.html b/assets/templates/partials/asset_picker.html
deleted file mode 100644
index 5e9e076f..00000000
--- a/assets/templates/partials/asset_picker.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<select name="parent" id="parent_id" class="selectpicker">
-    {% if object.parent%}
-    <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
-    {% endif %}
-</select>
-{% block js %}
-<script>
-$('#parent_id')
-    .selectpicker({
-        liveSearch: true
-    })
-    .ajaxSelectPicker({
-        ajax: {
-            url: '{% url 'asset_search_json'%}',
-            type: "get",
-            data: function () {
-                var params = {
-                    {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
-                };
-                return params;
-            }
-        },
-        locale: {
-            emptyTitle: 'Search for item...'
-        },
-        preprocessData: function(data){
-            var assets = [];
-            if(data.length){
-                var len = data.length;
-                for(var i = 0; i < len; i++){
-                    var curr = data[i];
-                    assets.push(
-                        {
-                            'value': curr.id,
-                            'text': curr.label,
-                            'disabled': false
-                        }
-                    );
-                }
-                assets.push(
-                {
-                    'value': null,
-                    'text': "No parent"
-                });
-            }
-
-            return assets;
-        },
-        preserveSelected: false
-    });
-</script>
-{% endblock js %}
diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html
index f2c54def..ea931f8c 100644
--- a/assets/templates/partials/parent_form.html
+++ b/assets/templates/partials/parent_form.html
@@ -7,7 +7,11 @@
     {% if create or edit or duplicate %}
     <div class="form-group" id="parent-group">
       <label for="selectpicker">Set Parent</label>
-      {% include 'partials/asset_picker.html' %}
+      <select name="parent" id="parent_id" class="form-control selectpicker" data-live-search="true">
+        {% if object.parent %}
+        <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
+        {% endif %}
+      </select>
     </div>
     {% else %}
     <dl>
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
index b2cca199..89e45fd2 100644
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -9,7 +9,7 @@
       <label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
       <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
         {% if object.purchased_from %}
-            <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
+        <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
         {% endif %}
       </select>
     </div>
@@ -37,7 +37,7 @@
       {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %}
       {% endwith %}
       {% else %}
-      <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
+      <input type="date" name="date_acquired" value="{% now 'Y-m-d' %}"
                     class="form-control" id="id_date_acquired">
                 {% endif %}
               </div>
diff --git a/assets/tests/test_assets.py b/assets/tests/test_assets.py
index d845a74a..a36ac2e7 100644
--- a/assets/tests/test_assets.py
+++ b/assets/tests/test_assets.py
@@ -308,17 +308,17 @@ class TestAssetAudit(AutoLoginTest):
     def test_audit_list(self):
         self.assertEqual(len(models.Asset.objects.filter(last_audited_at=None)), len(self.page.assets))
 
-        assetRow = self.page.assets[0]
-        assetRow.find_element(By.CSS_SELECTOR, "td:nth-child(5) > div:nth-child(1) > a:nth-child(1)").click()
+        asset_row = self.page.assets[0]
+        asset_row.find_element(By.XPATH, "//button[contains(., 'Audit')]").click()
         self.wait.until(EC.visibility_of_element_located((By.ID, 'modal')))
-        self.assertEqual(self.page.modal.asset_id, assetRow.id)
+        self.assertEqual(self.page.modal.asset_id, asset_row.id)
 
         # First close button is for the not found error
         self.page.find_element(By.XPATH, '(//button[@class="close"])[2]').click()
         self.wait.until(animation_is_finished())
         self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
         # Make sure audit log was NOT filled out
-        audited = models.Asset.objects.get(asset_id=assetRow.id)
+        audited = models.Asset.objects.get(asset_id=asset_row.id)
         self.assertEqual(None, audited.last_audited_by)
 
         # Check that a failed search works
diff --git a/versioning/tests/test_versioning.py b/versioning/tests/test_versioning.py
index 3d3de74f..9f724b8e 100644
--- a/versioning/tests/test_versioning.py
+++ b/versioning/tests/test_versioning.py
@@ -3,7 +3,9 @@ from reversion import revisions as reversion
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.test import TestCase
-from RIGS import models, versioning
+from django.urls import reverse
+from RIGS import models
+from versioning import versioning
 from datetime import date, timedelta, datetime, time
 from decimal import *
 from PyRIGS.tests.base import create_browser