diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 884ec6e8de..806d7f6441 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -24,19 +24,17 @@
                         </button>
                     {% endif %}
                     <div class='btn-group'>
-                        <div class="dropdown" style="float: right;">
-                            <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}
-                                <span class="caret"></span>
-                            </button>
-                            <ul class="dropdown-menu">
-                                {% if roles.purchase_order.add %}
-                                <li><a href='#' id='multi-part-order' title='{% trans "Order parts" %}'>{% trans "Order Parts" %}</a></li>
-                                {% endif %}
-                                {% if roles.purchase_order.delete %}
-                                <li><a href='#' id='multi-part-delete' title='{% trans "Delete parts" %}'>{% trans "Delete Parts" %}</a></li>
-                                {% endif %}
-                            </ul>
-                        </div>  
+                        <button class="btn btn-primary dropdown-toggle" id='supplier-table-options' type="button" data-toggle="dropdown">{% trans "Options" %}
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            {% if roles.purchase_order.add %}
+                            <li><a href='#' id='multi-supplier-part-order' title='{% trans "Order parts" %}'>{% trans "Order Parts" %}</a></li>
+                            {% endif %}
+                            {% if roles.purchase_order.delete %}
+                            <li><a href='#' id='multi-supplier-part-delete' title='{% trans "Delete parts" %}'>{% trans "Delete Parts" %}</a></li>
+                            {% endif %}
+                        </ul>
                     </div>
                 </div>
                 <div class='filter-list' id='filter-list-supplier-part'>
@@ -59,27 +57,25 @@
         {% if roles.purchase_order.change %}
         <div id='manufacturer-part-button-toolbar'>
             <div class='button-toolbar container-fluid'>
-                <div class='btn-group role='group'>
+                <div class='btn-group' role='group'>
                     {% if roles.purchase_order.add %}
-                        <button class="btn btn-success" id='manufacturer-part-create' title='{% trans "Create new manufacturer part" %}'>
+                        <button type="button" class="btn btn-success" id='manufacturer-part-create' title='{% trans "Create new manufacturer part" %}'>
                             <span class='fas fa-plus-circle'></span> {% trans "New Manufacturer Part" %}
                         </button>
                     {% endif %}
-                    <div class='btn-group'>
-                        <div class="dropdown" style="float: right;">
-                            <button class="btn btn-primary dropdown-toggle" id='table-options', type="button" data-toggle="dropdown">{% trans "Options" %}
-                                <span class="caret"></span>
-                            </button>
-                            <ul class="dropdown-menu">
-                                {% if roles.purchase_order.add %}
-                                <li><a href='#' id='multi-part-order' title='{% trans "Order parts" %}'>{% trans "Order Parts" %}</a></li>
-                                {% endif %}
-                                {% if roles.purchase_order.delete %}
-                                <li><a href='#' id='multi-part-delete' title='{% trans "Delete parts" %}'>{% trans "Delete Parts" %}</a></li>
-                                {% endif %}
-                            </ul>
-                        </div>  
-                    </div>
+                    <div class='btn-group' role='group'>
+                        <button class="btn btn-primary dropdown-toggle" id='manufacturer-table-options' type="button" data-toggle="dropdown">{% trans "Options" %}
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            {% if roles.purchase_order.add %}
+                            <li><a href='#' id='multi-manufacturer-part-order' title='{% trans "Order parts" %}'>{% trans "Order Parts" %}</a></li>
+                            {% endif %}
+                            {% if roles.purchase_order.delete %}
+                            <li><a href='#' id='multi-manufacturer-part-delete' title='{% trans "Delete parts" %}'>{% trans "Delete Parts" %}</a></li>
+                            {% endif %}
+                        </ul>
+                    </div> 
                 </div>
                 <div class='filter-list' id='filter-list-supplier-part'>
                     <!-- Empty div (will be filled out with available BOM filters) -->
@@ -87,7 +83,7 @@
             </div>
         </div>
         {% endif %}
-        <table class='table table-striped table-condensed' id='part-table' data-toolbar='#manufacturer-part-button-toolbar'>
+        <table class='table table-striped table-condensed' id='manufacturer-part-table' data-toolbar='#manufacturer-part-button-toolbar'>
         </table>
     </div>
 </div>
@@ -274,6 +270,10 @@
 
     {% if company.is_manufacturer %}
 
+    function reloadManufacturerPartTable() {
+        $('#manufacturer-part-table').bootstrapTable('refresh');
+    }
+
     $("#manufacturer-part-create").click(function () {
 
         createManufacturerPart({
@@ -285,7 +285,7 @@
     });
 
     loadManufacturerPartTable(
-        "#part-table",
+        "#manufacturer-part-table",
         "{% url 'api-manufacturer-part-list' %}",
         {
             params: {
@@ -296,20 +296,20 @@
         }
     );
 
-    linkButtonsToSelection($("#manufacturer-table"), ['#table-options']);
+    linkButtonsToSelection($("#manufacturer-part-table"), ['#manufacturer-table-options']);
 
-    $("#multi-part-delete").click(function() {
-        var selections = $("#part-table").bootstrapTable("getSelections");
+    $("#multi-manufacturer-part-delete").click(function() {
+        var selections = $("#manufacturer-part-table").bootstrapTable("getSelections");
 
         deleteManufacturerParts(selections, {
             onSuccess: function() { 
-                $("#part-table").bootstrapTable("refresh");
+                $("#manufacturer-part-table").bootstrapTable("refresh");
             }
         });
     });
 
-    $("#multi-part-order").click(function() {
-        var selections = $("#part-table").bootstrapTable("getSelections");
+    $("#multi-manufacturer-part-order").click(function() {
+        var selections = $("#manufacturer-part-table").bootstrapTable("getSelections");
 
         var parts = [];
 
@@ -353,9 +353,9 @@
         }
     );
 
-    {% endif %}
+    linkButtonsToSelection($("#supplier-part-table"), ['#supplier-table-options']);
 
-    $("#multi-part-delete").click(function() {
+    $("#multi-supplier-part-delete").click(function() {
         var selections = $("#supplier-part-table").bootstrapTable("getSelections");
 
         var requests = [];
@@ -379,8 +379,8 @@
         );
     });
 
-    $("#multi-part-order").click(function() {
-        var selections = $("#part-table").bootstrapTable("getSelections");
+    $("#multi-supplier-part-order").click(function() {
+        var selections = $("#supplier-part-table").bootstrapTable("getSelections");
 
         var parts = [];
 
@@ -395,6 +395,8 @@
         });
     });
 
+    {% endif %}
+
     attachNavCallbacks({
         name: 'company',
         default: 'company-stock'
diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index 4623eb3a07..cc2dd68840 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -109,7 +109,7 @@ src="{% static 'img/blank_image.png' %}"
                     <span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
                 </button>
                 <div id='opt-dropdown' class="btn-group">
-                    <button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}<span class="caret"></span></button>
+                    <button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %} <span class="caret"></span></button>
                     <ul class="dropdown-menu">
                         <li><a href='#' id='supplier-part-delete' title='{% trans "Delete supplier parts" %}'>{% trans "Delete" %}</a></li>
                     </ul>
@@ -133,7 +133,7 @@ src="{% static 'img/blank_image.png' %}"
                     <span class='fas fa-plus-circle'></span> {% trans "New Parameter" %}
                 </button>
                 <div id='opt-dropdown' class="btn-group">
-                    <button id='parameter-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}<span class="caret"></span></button>
+                    <button id='parameter-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %} <span class="caret"></span></button>
                     <ul class="dropdown-menu">
                         <li><a href='#' id='multi-parameter-delete' title='{% trans "Delete parameters" %}'>{% trans "Delete" %}</a></li>
                     </ul>
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 44e3ee0daa..21c5d0061e 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -132,7 +132,7 @@
             </button>
             {% endif %}
             <div class='btn-group'>
-                <button id='part-options' class='btn btn-primary dropdown-toggle' type='button' data-toggle="dropdown">{% trans "Options" %}<span class='caret'></span></button>
+                <button id='part-options' class='btn btn-primary dropdown-toggle' type='button' data-toggle="dropdown">{% trans "Options" %} <span class='caret'></span></button>
                 <ul class='dropdown-menu'>
                     {% if roles.part.change %}
                     <li><a href='#' id='multi-part-category' title='{% trans "Set category" %}'>{% trans "Set Category" %}</a></li>
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 80e4a77d1b..5e398718f5 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -289,7 +289,7 @@
                     <span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
                 </button>
                 <div id='opt-dropdown' class="btn-group">
-                    <button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}<span class="caret"></span></button>
+                    <button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %} <span class="caret"></span></button>
                     <ul class="dropdown-menu">
                         <li><a href='#' id='supplier-part-delete' title='{% trans "Delete supplier parts" %}'>{% trans "Delete" %}</a></li>
                     </ul>
@@ -312,7 +312,7 @@
                         <span class='fas fa-plus-circle'></span> {% trans "New Manufacturer Part" %}
                     </button>
                     <div id='opt-dropdown' class="btn-group">
-                        <button id='manufacturer-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}<span class="caret"></span></button>
+                        <button id='manufacturer-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %} <span class="caret"></span></button>
                         <ul class="dropdown-menu">
                             <li><a href='#' id='manufacturer-part-delete' title='{% trans "Delete manufacturer parts" %}'>{% trans "Delete" %}</a></li>
                         </ul>