diff --git a/InvenTree/build/admin.py b/InvenTree/build/admin.py
index 0ef5ccb75b..b47d38e36d 100644
--- a/InvenTree/build/admin.py
+++ b/InvenTree/build/admin.py
@@ -20,6 +20,12 @@ class BuildAdmin(ImportExportModelAdmin):
         'notes',
     )
 
+    search_fields = [
+        'title',
+        'part__name',
+        'part__description',
+    ]
+
 
 class BuildItemAdmin(admin.ModelAdmin):
 
diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html
index fb84b467cf..d9764d6e25 100644
--- a/InvenTree/build/templates/build/build_base.html
+++ b/InvenTree/build/templates/build/build_base.html
@@ -33,7 +33,12 @@ src="{% static 'img/blank_image.png' %}"
 {% block page_data %}
 <h3>{% trans "Build" %} {% build_status_label build.status large=True %}</h3>
 <hr>
-<h4>{{ build.quantity }} x {{ build.part.full_name }}</h4>
+<h4>
+    {{ build.quantity }} x {{ build.part.full_name }}
+    {% if user.is_staff %}
+    <a  href="{% url 'admin:build_build_change' build.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
+{% endif %}
+</h4>
 <div class='btn-row'>
     <div class='btn-group action-buttons'>
         <button type='button' class='btn btn-default' id='build-edit' title='Edit Build'>
diff --git a/InvenTree/company/admin.py b/InvenTree/company/admin.py
index f69bfec54f..4a802c6a41 100644
--- a/InvenTree/company/admin.py
+++ b/InvenTree/company/admin.py
@@ -32,6 +32,11 @@ class CompanyAdmin(ImportExportModelAdmin):
 
     list_display = ('name', 'website', 'contact')
 
+    search_fields = [
+        'name',
+        'description',
+    ]
+
 
 class SupplierPartResource(ModelResource):
     """ Class for managing SupplierPart data import/export """
@@ -57,6 +62,13 @@ class SupplierPartAdmin(ImportExportModelAdmin):
 
     list_display = ('part', 'supplier', 'SKU')
 
+    search_fields = [
+        'company__name',
+        'part__name',
+        'MPN',
+        'SKU',
+    ]
+
 
 class SupplierPriceBreakResource(ModelResource):
     """ Class for managing SupplierPriceBreak data import/export """
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index 9de0e9e764..edcc817ab3 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -21,7 +21,12 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
 {% block page_data %}
 <h3>{% trans "Company" %}</h3>
 <hr>
-<h4>{{ company.name }}</h4>
+<h4>
+    {{ company.name }}
+    {% if user.is_staff %}
+    <a  href="{% url 'admin:company_company_change' company.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
+    {% endif %}
+</h4>
 <p>{{ company.description }}</p>
 <div class='btn-group action-buttons'>
     {% if company.is_supplier %}
diff --git a/InvenTree/order/admin.py b/InvenTree/order/admin.py
index b7ac71976c..4519f8a2a9 100644
--- a/InvenTree/order/admin.py
+++ b/InvenTree/order/admin.py
@@ -23,6 +23,12 @@ class PurchaseOrderAdmin(ImportExportModelAdmin):
         'creation_date'
     )
 
+    search_fields = [
+        'reference',
+        'supplier__name',
+        'description',
+    ]
+
 
 class SalesOrderAdmin(ImportExportModelAdmin):
 
@@ -34,6 +40,12 @@ class SalesOrderAdmin(ImportExportModelAdmin):
         'creation_date',
     )
 
+    search_fields = [
+        'reference',
+        'customer__name',
+        'description',
+    ]
+
 
 class POLineItemResource(ModelResource):
     """ Class for managing import / export of POLineItem data """
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 1c7980ba9b..58332b1a0c 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -7,7 +7,12 @@
 <div class='row'>
     <div class='col-sm-6'>
         {% if category %}
-        <h3>{{ category.name }}</h3>
+        <h3>
+            {{ category.name }}
+            {% if user.is_staff %}
+            <a href="{% url 'admin:part_partcategory_change' category.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
+            {% endif %}
+        </h3>
         <p>{{ category.description }}</p>
         {% else %}
         <h3>{% trans "Part Categories" %}</h3>
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 74f9e1383f..e5dcd9e24e 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -28,6 +28,9 @@
     <div class="media-body">
         <h3>
             {{ part.full_name }}
+            {% if user.is_staff %}
+            <a  href="{% url 'admin:part_part_change' part.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
+            {% endif %}
             {% if not part.active %}
             <div class='label label-large label-large-red'>
                 {% trans 'Inactive' %}
diff --git a/InvenTree/stock/admin.py b/InvenTree/stock/admin.py
index d3f0c31f8b..5917ed8e22 100644
--- a/InvenTree/stock/admin.py
+++ b/InvenTree/stock/admin.py
@@ -117,6 +117,14 @@ class StockItemAdmin(ImportExportModelAdmin):
 
     list_display = ('part', 'quantity', 'location', 'status', 'updated')
 
+    # A list of search fields which can be used for lookup on matching 'autocomplete' fields
+    search_fields = [
+        'part__name',
+        'part__description',
+        'serial',
+        'batch',
+    ]
+
 
 class StockAttachmentAdmin(admin.ModelAdmin):
 
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 18888e00c8..c6de4c058f 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -61,9 +61,12 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 <hr>
 <h4>
 {% if item.serialized %}
-<a href='{% url "part-detail" item.part.pk %}'>{{ item.part.full_name}}</a> # {{ item.serial }}
+    <a href='{% url "part-detail" item.part.pk %}'>{{ item.part.full_name}}</a> # {{ item.serial }}
 {% else %}
-<a href='{% url "part-detail" item.part.pk %}'>{{ item.part.full_name }}</a> &times {% decimal item.quantity %}
+    <a href='{% url "part-detail" item.part.pk %}'>{{ item.part.full_name }}</a> &times {% decimal item.quantity %}
+{% endif %}
+{% if user.is_staff %}
+    <a  href="{% url 'admin:stock_stockitem_change' item.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
 {% endif %}
 </h4>
 
@@ -107,6 +110,11 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
             {% if item.customer %}
             <li><a href='#' id='stock-return-from-customer' title='{% trans "Return to stock" %}'><span class='fas fa-undo'></span> {% trans "Return to stock" %}</a></li>
             {% endif %}
+            {% if item.belongs_to %}
+            <li>
+                <a href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a>
+            </li>
+            {% endif %}
         </ul>
     </div>
     <!-- Edit stock item -->
@@ -165,8 +173,12 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
     {% if item.belongs_to %}
     <tr>
         <td><span class='fas fa-box'></span></td>
-        <td>{% trans "Belongs To" %}</td>
-        <td><a href="{% url 'stock-item-detail' item.belongs_to.id %}">{{ item.belongs_to }}</a></td>
+        <td>
+            {% trans "Installed In" %}
+        </td>
+        <td>
+            <a href="{% url 'stock-item-detail' item.belongs_to.id %}">{{ item.belongs_to }}</a>
+        </td>
     </tr>
     {% elif item.sales_order %}
     <tr>
@@ -301,6 +313,19 @@ $("#stock-serialize").click(function() {
     );
 });
 
+$('#stock-uninstall').click(function() {
+
+    launchModalForm(
+        "{% url 'stock-item-uninstall' %}",
+        {
+            data: {
+                'items[]': [{{ item.pk}}],
+            },
+            reload: true,
+        }
+    );
+});
+
 $("#stock-test-report").click(function() {
     launchModalForm(
         "{% url 'stock-item-test-report-select' item.id %}",
diff --git a/InvenTree/stock/templates/stock/item_installed.html b/InvenTree/stock/templates/stock/item_installed.html
index 2d8a8142cf..cac55c9dce 100644
--- a/InvenTree/stock/templates/stock/item_installed.html
+++ b/InvenTree/stock/templates/stock/item_installed.html
@@ -128,7 +128,7 @@ $('#installed-table').inventreeTable({
 
                 var html = `<div class='btn-group float-right' role='group'>`;
 
-                html += makeIconButton('fa-trash-alt icon-red', 'button-uninstall', pk, '{% trans "Uninstall item" %}');
+                html += makeIconButton('fa-unlink', 'button-uninstall', pk, '{% trans "Uninstall item" %}');
 
                 html += `</div>`;
 
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 0766c37c8d..802175ff53 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -6,7 +6,12 @@
 <div class='row'>
 <div class='col-sm-6'>
     {% if location %}
-    <h3>{{ location.name }}</h3>
+    <h3>
+        {{ location.name }}
+        {% if user.is_staff %}
+        <a  href="{% url 'admin:stock_stocklocation_change' location.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
+        {% endif %}
+    </h3>
     <p>{{ location.description }}</p>
     {% else %}
     <h3>{% trans "Stock" %}</h3>