diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index 20424e3fd2..f2a16613b8 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -170,24 +170,29 @@
 
 <div class='panel panel-hidden' id='panel-allocate'>
     <div class='panel-heading'>
-        <h4>{% trans "Allocate Stock to Build" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Allocate Stock to Build" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if build.active and build.has_untracked_bom_items %}
+                <button class='btn btn-danger' type='button' id='btn-unallocate' title='{% trans "Unallocate stock" %}'>
+                    <span class='fas fa-minus-circle'></span> {% trans "Unallocate Stock" %}
+                </button>
+                <button class='btn btn-success' type='button' id='btn-auto-allocate' title='{% trans "Allocate stock to build" %}'>
+                    <span class='fas fa-sign-in-alt'></span> {% trans "Allocate Stock" %}
+                </button>
+                <!--
+                <button class='btn btn-primary' type='button' id='btn-order-parts' title='{% trans "Order required parts" %}'>
+                    <span class='fas fa-shopping-cart'></span> {% trans "Order Parts" %}
+                </button>
+                -->
+                {% endif %}
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
         {% if build.has_untracked_bom_items %}
         {% if build.active %}
-        <div class='btn-group' role='group'>
-            <button class='btn btn-success' type='button' id='btn-auto-allocate' title='{% trans "Allocate stock to build" %}'>
-                <span class='fas fa-sign-in-alt'></span> {% trans "Allocate Stock" %}
-            </button>
-            <button class='btn btn-danger' type='button' id='btn-unallocate' title='{% trans "Unallocate stock" %}'>
-                <span class='fas fa-minus-circle'></span> {% trans "Unallocate Stock" %}
-            </button>
-            <!--
-            <button class='btn btn-primary' type='button' id='btn-order-parts' title='{% trans "Order required parts" %}'>
-                <span class='fas fa-shopping-cart'></span> {% trans "Order Parts" %}
-            </button>
-            -->
-        </div>
         {% if build.areUntrackedPartsFullyAllocated %}
         <div class='alert alert-block alert-success'>
             {% trans "Untracked stock has been fully allocated for this Build Order" %}
@@ -221,23 +226,31 @@
 
 <div class='panel panel-hidden' id='panel-outputs'>
     <div class='panel-heading'>
-        <h4>{% trans "Incomplete Build Outputs" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Incomplete Build Outputs" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if build.active %}
+                <button class='btn btn-success' type='button' id='btn-create-output' title='{% trans "Create new build output" %}'>
+                    <span class='fas fa-plus-circle'></span> {% trans "New Build Output" %}
+                </button>
+                {% endif %}
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
         <div id='build-output-toolbar'>
             <div class='button-toolbar container-fluid'>
                 {% if build.active %}
                 <div class='btn-group'>
-                    <button class='btn btn-success' type='button' id='btn-create-output' title='{% trans "Create new build output" %}'>
-                        <span class='fas fa-plus-circle'></span>
-                    </button>
+
                     <!-- Build output actions -->
                     <div class='btn-group'>
                         <button id='output-options' class='btn btn-primary dropdown-toiggle' type='button' data-bs-toggle='dropdown' title='{% trans "Output Actions" %}'>
                             <span class='fas fa-tools'></span> <span class='caret'></span>
                         </button>
                         <ul class='dropdown-menu'>
-                            <li><a href='#' id='multi-output-complete' title='{% trans "Complete selected items" %}'><span class='fas fa-check-circle icon-green'></span> {% trans "Complete outputs" %}</a></li>
+                            <li><a class='dropdown-item' href='#' id='multi-output-complete' title='{% trans "Complete selected items" %}'><span class='fas fa-check-circle icon-green'></span> {% trans "Complete outputs" %}</a></li>
                         </ul>
                     </div>
                 </div>
diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html
index f0346b7984..01970c45aa 100644
--- a/InvenTree/build/templates/build/index.html
+++ b/InvenTree/build/templates/build/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "page_base.html" %}
 
 {% load inventree_extras %}
 {% load static %}
@@ -8,33 +8,32 @@
 {% inventree_title %} | {% trans "Build Orders" %} 
 {% endblock %}
 
-{% block content %}
+{% block heading %}
+{% trans "Build Orders" %}
+{% endblock %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h3>{% trans "Build Orders" %}</h3>
-    </div>
-    <div class='col-sm-6'>
+{% block actions %}
+{% if roles.build.add %}
+<button type='button' class="btn btn-success" id='new-build'>
+    <span class='fas fa-tools'></span> {% trans "New Build Order" %}
+</button>
+{% endif %}
+{% endblock %}
 
-    </div>
-
-    <hr>
+{% block page_info %}
 
+<div class='panel-content'>
     <div id='button-toolbar'>
         <div class='button-toolbar container-fluid' style='float: right;'>
-            <div class='btn-group'>
-                {% if roles.build.add %}
-                <button type='button' class="btn btn-success" id='new-build'>
-                    <span class='fas fa-tools'></span> {% trans "New Build Order" %}
-                </button>
-                {% endif %}
-                <div class='btn-group'>
+            <div class='btn-group' role='group'>
+                
+                <div class='btn-group' role='group'>
                     <!-- Print actions -->
                     <button id='build-print-options' class='btn btn-primary dropdown-toggle' data-bs-toggle='dropdown'>
                         <span class='fas fa-print'></span> <span class='caret'></span>
                     </button>
                     <ul class='dropdown-menu'>
-                        <li><a href='#' id='multi-build-print' title='{% trans "Print Build Orders" %}'>
+                        <li><a class='dropdown-item' href='#' id='multi-build-print' title='{% trans "Print Build Orders" %}'>
                             <span class='fas fa-file-pdf'></span> {% trans "Print Build Orders" %}
                         </a></li>
                     </ul>
@@ -52,13 +51,13 @@
             </div>
         </div>
     </div>
+    
+    <table class='table table-striped table-condensed' id='build-table' data-toolbar='#button-toolbar'>
+    </table>
+    
+    <div id='build-order-calendar'></div>
 </div>
-
-<table class='table table-striped table-condensed' id='build-table' data-toolbar='#button-toolbar'>
-</table>
-
-<div id='build-order-calendar'></div>
-
+    
 {% endblock %}
 
 {% block js_load %}
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 5f2c144c2a..6aec397e47 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -11,18 +11,23 @@
 
 <div class='panel panel-hidden' id='panel-supplier-parts'>
     <div class='panel-heading'>
-        <h4>{% trans "Supplier Parts" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Supplier Parts" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.purchase_order.add %}
+                    <button class="btn btn-success" id='supplier-part-create' title='{% trans "Create new supplier part" %}'>
+                        <span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
+                    </button>
+                {% endif %}
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
         {% if roles.purchase_order.change %}
         <div id='supplier-part-button-toolbar'>
             <div class='button-toolbar container-fluid'>
                 <div class='btn-group' role='group'>
-                    {% if roles.purchase_order.add %}
-                        <button class="btn btn-success" id='supplier-part-create' title='{% trans "Create new supplier part" %}'>
-                            <span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
-                        </button>
-                    {% endif %}
                     <div class='btn-group'>
                         <button class="btn btn-primary dropdown-toggle" id='supplier-table-options' type="button" data-bs-toggle="dropdown">{% trans "Options" %}
                             <span class="caret"></span>
@@ -107,20 +112,26 @@
 
 <div class='panel panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
-        <h4>{% trans "Purchase Orders" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Purchase Orders" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.purchase_order.add %}
+                <button class='btn btn-success' type='button' id='company-order2' title='{% trans "Create new purchase order" %}'>
+                    <span class='fas fa-plus-circle'></span> {% trans "New Purchase Order" %}
+                </button>
+                {% endif %}
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
-        {% if roles.purchase_order.add %}
         <div id='po-button-bar'>
             <div class='button-toolbar container-fluid' style='float: right;'>
-                <button class='btn btn-success' type='button' id='company-order2' title='{% trans "Create new purchase order" %}'>
-                    <span class='fas fa-plus-circle'></span> {% trans "New Purchase Order" %}</button>
                 <div class='filter-list' id='filter-list-purchaseorder'>
                     <!-- Empty div -->
                 </div>
             </div>
         </div>
-        {% endif %}
 
         <table class='table table-striped table-condensed po-table' id='purchase-order-table' data-toolbar='#po-button-bar'>
         </table>
@@ -129,21 +140,26 @@
 
 <div class='panel panel-hidden' id='panel-sales-orders'>
     <div class='panel-heading'>
-        <h4>{% trans "Sales Orders" %}</h4>
-    </div>
-    <div class='panel-content'>
-        {% if roles.sales_order.add %}
-        <div id='so-button-bar'>
-            <div class='button-toolbar container-fluid' style='float: right;'>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Sales Orders" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.sales_order.add %}
                 <button class='btn btn-success' type='button' id='new-sales-order' title='{% trans "Create new sales order" %}'>
                     <div class='fas fa-plus-circle'></div> {% trans "New Sales Order" %}
                 </button>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+    <div class='panel-content'>
+        <div id='so-button-bar'>
+            <div class='button-toolbar container-fluid' style='float: right;'>
                 <div class='filter-list' id='filter-list-salesorder'>
                     <!-- Empty div -->
                 </div>
             </div>
         </div>
-        {% endif %}
 
         <table class='table table-striped table-condensed po-table' id='sales-order-table' data-toolbar='#so-button-bar'>
         </table>
diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index 672d82fdb7..1654ab04b5 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "page_base.html" %}
 
 {% load static %}
 {% load i18n %}
@@ -8,23 +8,28 @@
 {% inventree_title %} | {% trans "Supplier List" %} 
 {% endblock %}
 
-{% block content %}
-
-<h3>{{ title }}</h3>
-<hr>
+{% block heading %}
+{{ title }}
+{% endblock %}
 
+{% block actions %}
 {% if pagetype == 'manufacturers' and roles.purchase_order.add or pagetype == 'suppliers' and roles.purchase_order.add or pagetype == 'customers' and roles.sales_order.add %}
-<div id='button-toolbar'>
-    <button type='button' class="btn btn-success" id='new-company'>
-        <span class='fas fa-plus-circle'></span> {{ button_text }}
-    </button>
-    <div class='btn-group'>
-    </div>
-</div>
+<button type='button' class="btn btn-success" id='new-company'>
+    <span class='fas fa-plus-circle'></span> {{ button_text }}
+</button>
 {% endif %}
+{% endblock %}
 
-<table class='table table-striped table-condensed' id='company-table' data-toolbar='#button-toolbar'>
-</table>
+{% block page_info %}
+
+<div class='panel-content'>
+    
+    <div id='button-toolbar'>
+    </div>
+    
+    <table class='table table-striped table-condensed' id='company-table' data-toolbar='#button-toolbar'>
+    </table>
+</div>
 
 {% endblock %}
 {% block js_ready %}
diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index 09affcfd11..dad72e5558 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -104,18 +104,23 @@ src="{% static 'img/blank_image.png' %}"
 
 <div class='panel panel-hidden' id='panel-supplier-parts'>
     <div class='panel-heading'>
-        <h4>{% trans "Suppliers" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Suppliers" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                <button class="btn btn-success" id='supplier-create'>
+                    <span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
+                </button>
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
         <div id='supplier-button-toolbar'>
             <div class='btn-group'>
-                <button class="btn btn-success" id='supplier-create'>
-                    <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-bs-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>
+                        <li><a class='dropdown-item' href='#' id='supplier-part-delete' title='{% trans "Delete supplier parts" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete" %}</a></li>
                     </ul>
                 </div>
             </div>
@@ -128,18 +133,23 @@ src="{% static 'img/blank_image.png' %}"
 
 <div class='panel panel-hidden' id='panel-parameters'>
     <div class='panel-heading'>
-        <h4>{% trans "Parameters" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Parameters" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                <button class='btn btn-success' id='parameter-create'>
+                    <span class='fas fa-plus-circle'></span> {% trans "New Parameter" %}
+                </button>
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
         <div id='parameter-toolbar'>
             <div class='btn-group'>
-                <button class='btn btn-success' id='parameter-create'>
-                    <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-bs-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>
+                        <li><a class='dropdown-item' href='#' id='multi-parameter-delete' title='{% trans "Delete parameters" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete" %}</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html
index 1450ac4c35..2f68f9b12b 100644
--- a/InvenTree/company/templates/company/supplier_part.html
+++ b/InvenTree/company/templates/company/supplier_part.html
@@ -143,17 +143,23 @@ src="{% static 'img/blank_image.png' %}"
 
 <div class='panel panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
-        <h4>{% trans "Supplier Part Orders" %}</h4>
-    </div>
-    <div class='panel-content'>
-        {% if roles.purchase_order.add %}
-        <div id='button-bar'>
-            <div class='btn-group'>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Supplier Part Orders" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.purchase_order.add %}
                 <button class='btn btn-primary' type='button' id='order-part2' title='{% trans "Order part" %}'>
-                    <span class='fas fa-shopping-cart'></span> {% trans "Order Part" %}</button>
+                    <span class='fas fa-shopping-cart'></span> {% trans "Order Part" %}
+                </button>
+                {% endif %}        
+            </div>
+        </div>
+    </div>
+    <div class='panel-content'>
+        <div id='button-bar'>
+            <div class='btn-group'>
             </div>
         </div>
-        {% endif %}        
         <table class='table table-striped table-condensed po-table' id='purchase-order-table' data-toolbar='#button-bar'>
         </table>
     </div>
@@ -161,16 +167,21 @@ src="{% static 'img/blank_image.png' %}"
 
 <div class='panel panel-hidden' id='panel-pricing'>
     <div class='panel-heading'>
-        <h4>{% trans "Pricing Information" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Pricing Information" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.purchase_order.add %}
+                <button class='btn btn-success' id='new-price-break' type='button'>
+                    <span class='fas fa-plus-circle'></span> {% trans "Add Price Break" %}
+                </button>
+                {% endif %}
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
-        {% if roles.purchase_order.add %}
         <div id='price-break-toolbar' class='btn-group'>
-            <button class='btn btn-success' id='new-price-break' type='button'>
-                <span class='fas fa-plus-circle'></span> {% trans "Add Price Break" %}
-            </button>
         </div>
-        {% endif %}
 
         <table class='table table-striped table-condensed' id='price-break-table' data-toolbar='#price-break-toolbar'>    
         </table>
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index 347d6b7389..c57d88fe57 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -14,24 +14,29 @@
 
 <div class='panel panel-hidden' id='panel-order-items'>
     <div class='panel-heading'>
-        <h4>{% trans "Purchase Order Items" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Purchase Order Items" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.purchase_order.change %}
+                {% if order.status == PurchaseOrderStatus.PENDING %}
+                <a class='btn btn-primary' href='{% url "po-upload" order.id %}' role='button'>
+                    <span class='fas fa-file-upload side-icon'></span> {% trans "Upload File" %}
+                </a>
+                <button type='button' class='btn btn-success' id='new-po-line'>
+                    <span class='fas fa-plus-circle'></span> {% trans "Add Line Item" %}
+                </button>
+                {% elif order.status == PurchaseOrderStatus.PLACED %}
+                <button type='button' class='btn btn-success' id='receive-selected-items' title='{% trans "Receive selected items" %}'>
+                    <span class='fas fa-sign-in-alt'></span> {% trans "Receive Items" %}
+                </button>
+                {% endif %}
+                {% endif %}  
+            </div>
+        </div>
     </div>
     <div class='panel-content'>
         <div id='order-toolbar-buttons' class='btn-group' style='float: right;'>
-            {% if roles.purchase_order.change %}
-            {% if order.status == PurchaseOrderStatus.PENDING %}
-            <button type='button' class='btn btn-success' id='new-po-line'>
-                <span class='fas fa-plus-circle'></span> {% trans "Add Line Item" %}
-            </button>
-            <a class='btn btn-primary' href='{% url "po-upload" order.id %}' role='button'>
-                <span class='fas fa-file-upload side-icon'></span> {% trans "Upload File" %}
-            </a>
-            {% elif order.status == PurchaseOrderStatus.PLACED %}
-            <button type='button' class='btn btn-success' id='receive-selected-items' title='{% trans "Receive selected items" %}'>
-                <span class='fas fa-sign-in-alt'></span> {% trans "Receive Items" %}
-            </button>
-            {% endif %}
-            {% endif %}
             <div class='filter-list' id='filter-list-purchase-order-lines'>
                 <!-- An empty div in which the filter list will be constructed-->
             </div>
diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html
index cf509a68d2..4be817f8d2 100644
--- a/InvenTree/order/templates/order/purchase_orders.html
+++ b/InvenTree/order/templates/order/purchase_orders.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "page_base.html" %}
 
 {% load inventree_extras %}
 {% load static %}
@@ -8,40 +8,48 @@
 {% inventree_title %} | {% trans "Purchase Orders" %}
 {% endblock %}
 
-{% block content %}
+{% block heading %}
+{% trans "Purchase Orders" %}
+{% endblock %}
 
-<h3>{% trans "Purchase Orders" %}</h3>
-<hr>
+{% block actions %}
+{% if roles.purchase_order.add %}
+<button class='btn btn-success' type='button' id='po-create' title='{% trans "Create new purchase order" %}'>
+    <span class='fas fa-plus-circle'></span> {% trans "New Purchase Order" %}
+</button>
+{% endif %}
+{% endblock %}
 
-<div id='table-buttons'>
-    <div class='button-toolbar container-fluid' style='float: right;'>
-        <div class='btn-group'>
-            {% if roles.purchase_order.add %}
-            <button class='btn btn-success' type='button' id='po-create' title='{% trans "Create new purchase order" %}'>
-                <span class='fas fa-plus-circle'></span> {% trans "New Purchase Order" %}
-            </button>
-            {% endif %}
-            <button id='order-print' class='btn btn-outline-secondary' title='{% trans "Print Order Reports" %}'>
-                <span class='fas fa-print'></span>
-            </button>
-            <button class='btn btn-outline-secondary' type='button' id='view-calendar' title='{% trans "Display calendar view" %}'>
-                <span class='fas fa-calendar-alt'></span>
-            </button>
-            <button class='btn btn-outline-secondary' type='button' id='view-list' title='{% trans "Display list view" %}'>
-                <span class='fas fa-th-list'></span>
-            </button>
-            <div class='filter-list' id='filter-list-purchaseorder'>
-                <!-- An empty div in which the filter list will be constructed -->
+{% block page_info %}
+
+<div class='panel-content'>
+    <div id='table-buttons'>
+        <div class='button-toolbar container-fluid' style='float: right;'>
+            <div class='btn-group' role='group'>
+                
+                <button id='order-print' class='btn btn-outline-secondary' title='{% trans "Print Order Reports" %}'>
+                    <span class='fas fa-print'></span>
+                </button>
+                <button class='btn btn-outline-secondary' type='button' id='view-calendar' title='{% trans "Display calendar view" %}'>
+                    <span class='fas fa-calendar-alt'></span>
+                </button>
+                <button class='btn btn-outline-secondary' type='button' id='view-list' title='{% trans "Display list view" %}'>
+                    <span class='fas fa-th-list'></span>
+                </button>
+                <div class='filter-list' id='filter-list-purchaseorder'>
+                    <!-- An empty div in which the filter list will be constructed -->
+                </div>
             </div>
         </div>
     </div>
+    
+    <table class='table table-striped table-condensed po-table' data-toolbar='#table-buttons' id='purchase-order-table'>
+    </table>
+    
+    <div id='purchase-order-calendar'></div>
+    
 </div>
 
-<table class='table table-striped table-condensed po-table' data-toolbar='#table-buttons' id='purchase-order-table'>
-</table>
-
-<div id='purchase-order-calendar'></div>
-
 {% endblock %}
 
 {% block js_load %}
diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html
index 6200df1183..42a09e8ede 100644
--- a/InvenTree/order/templates/order/sales_order_base.html
+++ b/InvenTree/order/templates/order/sales_order_base.html
@@ -42,7 +42,7 @@ src="{% static 'img/blank_image.png' %}"
         <li><a class='dropdown-item' href='#' id='print-order-report'><span class='fas fa-file-pdf'></span> {% trans "Print sales order report" %}</a></li>
         <li><a class='dropdown-item' href='#' id='export-order'><span class='fas fa-file-download'></span> {% trans "Export order to file" %}</a></li>
         <!--
-        <li><a href='#' id='print-packing-list'><span class='fas fa-clipboard-list'></span>{% trans "Print packing list" %}</a></li>
+        <li><a class='dropdown-item' href='#' id='print-packing-list'><span class='fas fa-clipboard-list'></span>{% trans "Print packing list" %}</a></li>
         -->
     </ul>
 </div>
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html
index e890c7caab..e5f047b520 100644
--- a/InvenTree/order/templates/order/sales_order_detail.html
+++ b/InvenTree/order/templates/order/sales_order_detail.html
@@ -14,20 +14,25 @@
 
 <div class='panel panel-hidden' id='panel-order-items'>
     <div class='panel-heading'>
-        <h4>{% trans "Sales Order Items" %}</h4>
-    </div>
-    <div class='panel-content'>
-        {% if roles.sales_order.change %}
-        <div id='order-toolbar-buttons' class='btn-group' style='float: right;'>
-            <div class='btn-group'>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Sales Order Items" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.sales_order.change %}
                 <button type='button' class='btn btn-success' id='new-so-line'>
                     <span class='fas fa-plus-circle'></span> {% trans "Add Line Item" %}
                 </button>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+    <div class='panel-content'>
+        <div id='order-toolbar-buttons' class='btn-group' style='float: right;'>
+            <div class='btn-group'>
                 <div class='filter-list' id='filter-list-sales-order-lines'>
                 </div>
             </div>
         </div>
-        {% endif %}
         <table class='table table-striped table-condensed' id='so-lines-table' data-toolbar='#order-toolbar-buttons'>
         </table>
     </div>
diff --git a/InvenTree/order/templates/order/sales_orders.html b/InvenTree/order/templates/order/sales_orders.html
index a4d4d27280..048296c16b 100644
--- a/InvenTree/order/templates/order/sales_orders.html
+++ b/InvenTree/order/templates/order/sales_orders.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "page_base.html" %}
 
 {% load inventree_extras %}
 {% load static %}
@@ -11,40 +11,47 @@
 {% block breadcrumb_list %}
 {% endblock %}
 
-{% block content %}
+{% block heading %}
+{% trans "Sales Orders" %}
+{% endblock %}
 
-<h3>{% trans "Sales Orders" %}</h3>
-<hr>
+{% block actions %}
+{% if roles.sales_order.add %}
+<button class='btn btn-success' type='button' id='so-create' title='{% trans "Create new sales order" %}'>
+    <span class='fas fa-plus-circle'></span> {% trans "New Sales Order" %}
+</button>
+{% endif %}
+{% endblock %}
 
-<div id='table-buttons'>
-    <div class='button-toolbar container-fluid' style='float: right;'>
-        <div class='btn-group'>
-            {% if roles.sales_order.add %}
-            <button class='btn btn-success' type='button' id='so-create' title='{% trans "Create new sales order" %}'>
-                <span class='fas fa-plus-circle'></span> {% trans "New Sales Order" %}
-            </button>
-            {% endif %}
-            <button id='order-print' class='btn btn-outline-secondary' title='{% trans "Print Order Reports" %}'>
-                <span class='fas fa-print'></span>
-            </button>
-            <button class='btn btn-outline-secondary' type='button' id='view-calendar' title='{% trans "Display calendar view" %}'>
-                <span class='fas fa-calendar-alt'></span>
-            </button>
-            <button class='btn btn-outline-secondary' type='button' id='view-list' title='{% trans "Display list view" %}'>
-                <span class='fas fa-th-list'></span>
-            </button>
-            <div class='filter-list' id='filter-list-salesorder'>
-                <!-- An empty div in which the filter list will be constructed -->
+{% block page_info %}
+
+<div class='panel-content'>
+    <div id='table-buttons'>
+        <div class='button-toolbar container-fluid' style='float: right;'>
+            <div class='btn-group'>
+                
+                <button id='order-print' class='btn btn-outline-secondary' title='{% trans "Print Order Reports" %}'>
+                    <span class='fas fa-print'></span>
+                </button>
+                <button class='btn btn-outline-secondary' type='button' id='view-calendar' title='{% trans "Display calendar view" %}'>
+                    <span class='fas fa-calendar-alt'></span>
+                </button>
+                <button class='btn btn-outline-secondary' type='button' id='view-list' title='{% trans "Display list view" %}'>
+                    <span class='fas fa-th-list'></span>
+                </button>
+                <div class='filter-list' id='filter-list-salesorder'>
+                    <!-- An empty div in which the filter list will be constructed -->
+                </div>
             </div>
         </div>
     </div>
+    
+    <table class='table table-striped table-condensed po-table' data-toolbar='#table-buttons' id='sales-order-table'>
+    </table>
+    
+    <div id='sales-order-calendar'></div>
 </div>
-
-<table class='table table-striped table-condensed po-table' data-toolbar='#table-buttons' id='sales-order-table'>
-</table>
-
-<div id='sales-order-calendar'></div>
-
+    
 {% endblock %}
 
 {% block js_load %}
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index 89cacd7c3c..f245ff0102 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -30,8 +30,8 @@
                 <span class='fas fa-download'></span> <span class='caret'></span>
             </button>
             <ul class='dropdown-menu' role='menu'>
-                <li><a href='#' id='download-bom'><span class='fas fa-file-download'></span> {% trans "Export BOM" %}</a></li>
-                <li><a href='#' id='print-bom-report'><span class='fas fa-file-pdf'></span> {% trans "Print BOM Report" %}</a></li>
+                <li><a class='dropdown-item' href='#' id='download-bom'><span class='fas fa-file-download'></span> {% trans "Export BOM" %}</a></li>
+                <li><a class='dropdown-item' href='#' id='print-bom-report'><span class='fas fa-file-pdf'></span> {% trans "Print BOM Report" %}</a></li>
             </ul>
         </div>
         {% if roles.part.change %}
@@ -41,14 +41,14 @@
                 <span class='fas fa-wrench'></span> <span class='caret'></span>
             </button>
             <ul class='dropdown-menu' role='menu'>
-                <li><a href='#' id='bom-upload'><span class='fas fa-file-upload'></span> {% trans "Upload BOM" %}</a></li>
+                <li><a class='dropdown-item' href='#' id='bom-upload'><span class='fas fa-file-upload'></span> {% trans "Upload BOM" %}</a></li>
                 {% if part.variant_of %}
-                <li><a href='#' id='bom-duplicate'><span class='fas fa-clone'></span> {% trans "Copy BOM" %}</a></li>
+                <li><a class='dropdown-item' href='#' id='bom-duplicate'><span class='fas fa-clone'></span> {% trans "Copy BOM" %}</a></li>
                 {% endif %}
                 {% if not part.is_bom_valid %}
-                <li><a href='#' id='validate-bom'><span class='fas fa-clipboard-check icon-green'></span> {% trans "Validate BOM" %}</a></li>
+                <li><a class='dropdown-item' href='#' id='validate-bom'><span class='fas fa-clipboard-check icon-green'></span> {% trans "Validate BOM" %}</a></li>
                 {% endif %}
-                <li><a href='#' id='bom-item-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete Items" %}</a></li>
+                <li><a class='dropdown-item' href='#' id='bom-item-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete Items" %}</a></li>
             </ul>
         </div>
         <button class='btn btn-success' type='button' title='{% trans "New BOM Item" %}' id='bom-item-new'>
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 4202577e0d..78d2b2961b 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -33,7 +33,7 @@
 {% endif %}
 {% if roles.part_category.add %}
 <button class='btn btn-success' id='cat-create' title='{% trans "Create new part category" %}'>
-    <span class='fas fa-plus-circle'></span> {% trans "Add Category" %}
+    <span class='fas fa-plus-circle'></span> {% trans "New Category" %}
 </button>
 {% endif %}
 {% endblock %}
@@ -116,19 +116,24 @@
 
 <div class='panel panel-hidden' id='panel-parts'>
     <div class='panel-heading'>
-        <h4>{% trans "Parts" %}</h4>
+        <div class='d-flex flex-row'>
+            <h4>{% trans "Parts" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% if roles.part.add %}
+                <button type='button' class='btn btn-success' id='part-create' title='{% trans "Create new part" %}'>
+                    <span class='fas fa-plus-circle'></span> {% trans "New Part" %}
+                </button>
+                {% endif %}
+            </div>
+        </div>
     </div>
     <div id='part-button-toolbar'>
         <div class='btn-group' role='group'>
-            <button type='button' class='btn btn-outline-secondary' id='part-export' title='{% trans "Export Part Data" %}'>
-                <span class='fas fa-file-download'></span> {% trans "Export" %}
-            </button>
-            {% if roles.part.add %}
-            <button type='button' class='btn btn-success' id='part-create' title='{% trans "Create new part" %}'>
-                <span class='fas fa-plus-circle'></span> {% trans "New Part" %}
-            </button>
-            {% endif %}
             <div class='btn-group' role='group'>
+                <button type='button' class='btn btn-outline-secondary' id='part-export' title='{% trans "Export Part Data" %}'>
+                    <span class='fas fa-file-download'></span> {% trans "Export" %}
+                </button>
                 <button id='part-options' class='btn btn-primary dropdown-toggle' type='button' data-bs-toggle="dropdown">
                     {% trans "Options" %}
                 </button>
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index b62058aa1f..638482f9e3 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -373,7 +373,7 @@
                 <div id='opt-dropdown' class="btn-group">
                     <button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-bs-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>
+                        <li><a class='dropdown-item' href='#' id='supplier-part-delete' title='{% trans "Delete supplier parts" %}'>{% trans "Delete" %}</a></li>
                     </ul>
                 </div>
             </div>
@@ -396,7 +396,7 @@
                     <div id='opt-dropdown' class="btn-group">
                         <button id='manufacturer-part-options' class="btn btn-primary dropdown-toggle" type="button" data-bs-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>
+                            <li><a class='dropdown-item' href='#' id='manufacturer-part-delete' title='{% trans "Delete manufacturer parts" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete" %}</a></li>
                         </ul>
                     </div>
                 </div>
diff --git a/InvenTree/templates/page_base.html b/InvenTree/templates/page_base.html
index 92130ea7a3..fc00fb1f7f 100644
--- a/InvenTree/templates/page_base.html
+++ b/InvenTree/templates/page_base.html
@@ -13,7 +13,7 @@
                 <i>-- page header goes here --</i>
                 {% endblock %}
             </h4>
-            <span class='flex' style='flex-grow: 1;'></span>
+            {% include "spacer.html" %}
             <div id='page-actions' class='btn-group' role='group'>
                 {% block actions %}
                 <i>-- actions go here --</i>
@@ -21,6 +21,8 @@
             </div>
         </div>
     </div>
+    
+    {% block page_info %}
     <div class='panel-content'>
         <div class='row'>
             <div class='col-sm-6' id='detail-panel-left'>
@@ -48,11 +50,11 @@
             </div>
         </div>
     </div>
+    {% endblock %}
+    
 </div>
 
-
 {% block page_content %}
-block page_content
 {% endblock %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/spacer.html b/InvenTree/templates/spacer.html
new file mode 100644
index 0000000000..ca2342cd28
--- /dev/null
+++ b/InvenTree/templates/spacer.html
@@ -0,0 +1 @@
+<span class='flex' style='flex-grow: 1;'></span>
\ No newline at end of file