diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html
index 81d2d0dbd4..553353ed4d 100644
--- a/InvenTree/build/templates/build/index.html
+++ b/InvenTree/build/templates/build/index.html
@@ -4,7 +4,11 @@
 
 <h3>Part Builds</h3>
 
-<table class='table table-striped table-condensed' id='build-table'>
+<div id='button-toolbar'>
+    <button class="btn btn-success" id='new-build'>Start New Build</button>
+</div>
+
+<table class='table table-striped table-condensed' id='build-table' data-toolbar='#button-toolbar'>
 <thead>
 <tr>
     <th>Build</th>
@@ -20,9 +24,6 @@
 </tbody>
 </table>
 
-<div class='container-fluid'>
-<button class="btn btn-success" id='new-build'>Start New Build</button>
-</div>
 
 {% include 'modals.html' %}
 
diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html
index 901ba94293..c3d9f0a8b3 100644
--- a/InvenTree/company/templates/company/detail_part.html
+++ b/InvenTree/company/templates/company/detail_part.html
@@ -4,26 +4,21 @@
 
 {% include 'company/tabs.html' with tab='parts' %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h3>Supplier Parts</h3>
-    </div>
-    <div class='col-sm-6'>
-        <h3 class='float-right'>
-            <button class="btn btn-success" id='part-create'>New Supplier Part</button>
-            <div class="dropdown" style="float: right;">
-                <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
-                <span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                </ul>
-            </div>
-        </h3>
+<h3>Supplier Parts</h3>
+
+<div id='button-toolbar'>
+    <button class="btn btn-success" id='part-create'>New Supplier Part</button>
+    <div class="dropdown" style="float: right;">
+        <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
+        <span class="caret"></span></button>
+        <ul class="dropdown-menu">
+        </ul>
     </div>
 </div>
 
 <hr>
 
-<table clas='table table-striped table-condensed' id='part-table'>
+<table clas='table table-striped table-condensed' id='part-table' data-toolbar='#button-toolbar'>
 </table>
 
 {% endblock %}
diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index 90490bf7ad..bb2ee3413c 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -4,12 +4,12 @@
 
 {% block content %}
 
-<div class='container-fluid'>
-<h3><button style='float: right;' class="btn btn-success" id='new-company'>New Company</button></h3>
 <h3>Companies</h3>
+<div id='button-toolbar'>
+<h3><button style='float: right;' class="btn btn-success" id='new-company'>New Company</button></h3>
 </div>
 
-<table class='table table-striped' id='company-table'>
+<table class='table table-striped' id='company-table' data-toolbar='#button-toolbar'>
 </table>
 
 
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index cd569a9c3c..7ec298df76 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -15,7 +15,7 @@
     {% if editing_enabled %}
     <div class='btn-group' style='float: right;'>
         <button class='btn btn-info' type='button' id='bom-item-new'>New BOM Item</button>
-        <button class='btn btn-success' type='button' id='editing-finished'>Save Changes</button>
+        <button class='btn btn-success' type='button' id='editing-finished'>Finish Editing</button>
     </div>
     {% else %}
     <div class='dropdown' style="float: right;">
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 9c503ce339..cc10828f80 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -40,13 +40,13 @@
 {% endif %}
 <hr>
 
-<table class='table table-striped table-condensed' id='part-table'>
-</table>
-
-<div>
-<button style='float: right;' class='btn btn-success' id='part-create'>New Part</button>
+<div id='button-toolbar'>
+    <button style='float: right;' class='btn btn-success' id='part-create'>New Part</button>
 </div>
 
+<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='part-table'>
+</table>
+
 {% endblock %}
 {% block js_load %}
 {{ block.super }}
diff --git a/InvenTree/part/templates/part/supplier.html b/InvenTree/part/templates/part/supplier.html
index 13c745e33a..b5426971eb 100644
--- a/InvenTree/part/templates/part/supplier.html
+++ b/InvenTree/part/templates/part/supplier.html
@@ -4,20 +4,15 @@
 
 {% include 'part/tabs.html' with tab='suppliers' %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h3>Part Suppliers</h3>
-    </div>
-    <div class='col-sm-6'>
-        <h3>
-            <button class="btn btn-success float-right" id='supplier-create'>New Supplier Part</button>
-        </h3>
-    </div>
+<h3>Part Suppliers</h3>
+
+<div id='button-toolbar'>
+    <button class="btn btn-success float-right" id='supplier-create'>New Supplier Part</button>
 </div>
 
 <hr>
 
-<table class="table table-striped table-condensed" id='supplier-table'>
+<table class="table table-striped table-condensed" id='supplier-table' data-toolbar='#button-toolbar'>
 </table>
 
 {% endblock %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 15e84a88a1..5a232ec74f 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -38,23 +38,26 @@
 
 <hr>
 
-<table class='table table-striped table-condensed' id='stock-table'>
-</table>
-
-<div class='container-fluid' style='float: right;'>
-    <button class="btn btn-success" id='item-create'>New Stock Item</span></button>
-    <div class="dropdown" style='float: right;'>
-        <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
-        <span class="caret"></span></button>
-        <ul class="dropdown-menu">
-            <li><a href="#" id='multi-item-add' title='Add to selected stock items'>Add stock</a></li>
-            <li><a href="#" id='multi-item-remove' title='Remove from selected stock items'>Remove stock</a></li>
-            <li><a href="#" id='multi-item-stocktake' title='Stocktake selected stock items'>Stocktake</a></li>
-          <li><a href='#' id='multi-item-move' title='Move selected stock items'>Move</a></li>
-        </ul>
+<div id='button-toolbar'>
+    <div class='container-fluid' style='float: right;'>
+        <button class="btn btn-success" id='item-create'>New Stock Item</span></button>
+        <div class="dropdown" style='float: right;'>
+            <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
+            <span class="caret"></span></button>
+            <ul class="dropdown-menu">
+                <li><a href="#" id='multi-item-add' title='Add to selected stock items'>Add stock</a></li>
+                <li><a href="#" id='multi-item-remove' title='Remove from selected stock items'>Remove stock</a></li>
+                <li><a href="#" id='multi-item-stocktake' title='Stocktake selected stock items'>Stocktake</a></li>
+              <li><a href='#' id='multi-item-move' title='Move selected stock items'>Move</a></li>
+            </ul>
+        </div>
     </div>
 </div>
 
+<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='stock-table'>
+</table>
+
+
 {% include 'modals.html' %}
 
 {% endblock %}