diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 82d8625256..5a58e2e04f 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -22,106 +22,96 @@
 {% url 'admin:stock_stockitem_change' item.pk as url %}
 {% include "admin_button.html" with url=url %}
 {% endif %}
-
+{% if barcodes %}
+<!-- Barcode actions menu -->
 <div class='btn-group' role='group'>
-
+    <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
+        <span class='fas fa-qrcode'></span> <span class='caret'></span>
+    </button>
+    <ul class='dropdown-menu' role='menu'>
+        <li><a class='dropdown-item' href='#' id='show-qr-code'><span class='fas fa-qrcode'></span> {% trans "Show QR Code" %}</a></li>
+        {% if roles.stock.change %}
+        {% if item.uid %}
+        <li><a class='dropdown-item' href='#' id='barcode-unlink'><span class='fas fa-unlink'></span> {% trans "Unlink Barcode" %}</a></li>
+        {% else %}
+        <li><a class='dropdown-item' href='#' id='barcode-link'><span class='fas fa-link'></span> {% trans "Link Barcode" %}</a></li>
+        {% endif %}
+        <li><a class='dropdown-item' href='#' id='barcode-scan-into-location'><span class='fas fa-sitemap'></span> {% trans "Scan to Location" %}</a></li>
+        {% endif %}
+    </ul>
 </div>
-
+{% endif %}
+<!-- Document / label menu -->
 <div class='btn-group' role='group'>
-
-    {% if barcodes %}
-    <!-- Barcode actions menu -->
-    <div class='btn-group' role='group'>
-        <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
-            <span class='fas fa-qrcode'></span> <span class='caret'></span>
-        </button>
+    <button id='document-options' title='{% trans "Printing actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-print'></span> <span class='caret'></span></button>
+    <ul class='dropdown-menu' role='menu'>
+        <li><a class='dropdown-item' href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
+        {% if test_report_enabled %}
+        <li><a class='dropdown-item' href='#' id='stock-test-report'><span class='fas fa-file-pdf'></span> {% trans "Test Report" %}</a></li>
+        {% endif %}
+    </ul>
+</div>
+<!-- Stock adjustment menu -->
+<!-- Check permissions and owner -->
+{% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
+    {% if roles.stock.change and not item.is_building %}
+    <div class='btn-group'>
+        <button id='stock-actions' title='{% trans "Stock adjustment actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
-            <li><a class='dropdown-item' href='#' id='show-qr-code'><span class='fas fa-qrcode'></span> {% trans "Show QR Code" %}</a></li>
-            {% if roles.stock.change %}
-            {% if item.uid %}
-            <li><a class='dropdown-item' href='#' id='barcode-unlink'><span class='fas fa-unlink'></span> {% trans "Unlink Barcode" %}</a></li>
+            {% if not item.serialized %}
+            {% if item.in_stock %}
+            <li><a class='dropdown-item' href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-clipboard-list'></span> {% trans "Count stock" %}</a></li>
+            {% endif %}
+            {% if not item.customer %}
+            <li><a class='dropdown-item' href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
+            {% endif %}
+            {% if item.in_stock %}
+            <li><a class='dropdown-item' href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
+            {% endif %}
+            {% if item.in_stock and item.part.trackable %}
+            <li><a class='dropdown-item' href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
+            {% endif %}
+            {% endif %}
+            {% if item.in_stock and item.can_adjust_location %}
+            <li><a class='dropdown-item' href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
+            {% endif %}
+            {% if item.in_stock and item.can_adjust_location and item.part.salable and not item.customer %}
+            <li><a class='dropdown-item' href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
+            {% endif %}
+            {% if item.customer %}
+            <li><a class='dropdown-item' 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 class='dropdown-item' href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a></li>
             {% else %}
-            <li><a class='dropdown-item' href='#' id='barcode-link'><span class='fas fa-link'></span> {% trans "Link Barcode" %}</a></li>
+            {% if item.part.get_used_in %}
+            <li><a class='dropdown-item' href='#' id='stock-install-in' title='{% trans "Install stock item" %}'><span class='fas fa-link'></span> {% trans "Install" %}</a></li>
             {% endif %}
-            <li><a class='dropdown-item' href='#' id='barcode-scan-into-location'><span class='fas fa-sitemap'></span> {% trans "Scan to Location" %}</a></li>
             {% endif %}
         </ul>
     </div>
     {% endif %}
-    <!-- Document / label menu -->
-    <div class='btn-group' role='group'>
-        <button id='document-options' title='{% trans "Printing actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-print'></span> <span class='caret'></span></button>
+    <!-- Edit stock item -->
+    {% if roles.stock.change and not item.is_building %}
+    <div class='btn-group'>
+        <button id='stock-edit-actions' title='{% trans "Stock actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-tools'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
-            <li><a class='dropdown-item' href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
-            {% if test_report_enabled %}
-            <li><a class='dropdown-item' href='#' id='stock-test-report'><span class='fas fa-file-pdf'></span> {% trans "Test Report" %}</a></li>
+            {% if item.part.can_convert %}
+            <li><a class='dropdown-item' href='#' id='stock-convert' title='{% trans "Convert to variant" %}'><span class='fas fa-screwdriver'></span> {% trans "Convert to variant" %}</a></li>
+            {% endif %}
+            {% if roles.stock.add %}
+            <li><a class='dropdown-item' href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li>
+            {% endif %}
+            <li><a class='dropdown-item' href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
+            {% if user.is_staff or roles.stock.delete %}
+            {% if item.can_delete %}
+            <li><a class='dropdown-item' href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li>
+            {% endif %}
             {% endif %}
         </ul>
     </div>
-    <!-- Stock adjustment menu -->
-    <!-- Check permissions and owner -->
-    {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
-        {% if roles.stock.change and not item.is_building %}
-        <div class='btn-group' role='group'>
-            <button id='stock-actions' title='{% trans "Stock adjustment actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
-            <ul class='dropdown-menu' role='menu'>
-                {% if not item.serialized %}
-                {% if item.in_stock %}
-                <li><a class='dropdown-item' href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-clipboard-list'></span> {% trans "Count stock" %}</a></li>
-                {% endif %}
-                {% if not item.customer %}
-                <li><a class='dropdown-item' href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
-                {% endif %}
-                {% if item.in_stock %}
-                <li><a class='dropdown-item' href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
-                {% endif %}
-                {% if item.in_stock and item.part.trackable %}
-                <li><a class='dropdown-item' href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
-                {% endif %}
-                {% endif %}
-                {% if item.in_stock and item.can_adjust_location %}
-                <li><a class='dropdown-item' href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
-                {% endif %}
-                {% if item.in_stock and item.can_adjust_location and item.part.salable and not item.customer %}
-                <li><a class='dropdown-item' href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
-                {% endif %}
-                {% if item.customer %}
-                <li><a class='dropdown-item' 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 class='dropdown-item' href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a></li>
-                {% else %}
-                {% if item.part.get_used_in %}
-                <li><a class='dropdown-item' href='#' id='stock-install-in' title='{% trans "Install stock item" %}'><span class='fas fa-link'></span> {% trans "Install" %}</a></li>
-                {% endif %}
-                {% endif %}
-            </ul>
-        </div>
-        {% endif %}
-        <!-- Edit stock item -->
-        {% if roles.stock.change and not item.is_building %}
-        <div class='btn-group'>
-            <button id='stock-edit-actions' title='{% trans "Stock actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-tools'></span> <span class='caret'></span></button>
-            <ul class='dropdown-menu' role='menu'>
-                {% if item.part.can_convert %}
-                <li><a class='dropdown-item' href='#' id='stock-convert' title='{% trans "Convert to variant" %}'><span class='fas fa-screwdriver'></span> {% trans "Convert to variant" %}</a></li>
-                {% endif %}
-                {% if roles.stock.add %}
-                <li><a class='dropdown-item' href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li>
-                {% endif %}
-                <li><a class='dropdown-item' href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
-                <li><a class='dropdown-item' href='#' id='stock-edit-2' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
-                {% if user.is_staff or roles.stock.delete %}
-                    {% if item.can_delete %}
-                    <li><a class='dropdown-item' href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li>
-                    {% endif %}
-                {% endif %}
-            </ul>
-        </div>
-        {% endif %}
     {% endif %}
-</div>
-
+{% endif %}
 {% endblock %}
 
 {% block thumbnail %}
@@ -491,10 +481,6 @@ $("#stock-edit").click(function () {
     );
 });
 
-$('#stock-edit-2').click(function() {
-    editStockItem({{ item.pk }});
-});
-
 $('#stock-edit-status').click(function () {
 
     constructForm('{% url "api-stock-detail" item.pk %}', {