diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index 84fd85732e..d4193960d3 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -8,20 +8,15 @@ InvenTree | Supplier List
 
 {% block content %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h3>Supplier List</h3>
-    </div>
-    <div class='col-sm-6'>
-        <div class='container' id='active-build-toolbar' style='float: right;'>
-            <div class='btn-group' style='float: right;'>
-                <button type='button' class="btn btn-success" id='new-company' title='Add new supplier'>New Supplier</button>
-            </div>
-        </div>
+<h3>Supplier List</h3>
+<hr>
+
+<div id='button-toolbar'>
+    <div class='btn-group'>
+        <button type='button' class="btn btn-success" id='new-company' title='Add new supplier'>New Supplier</button>
     </div>
 </div>
 
-<hr>
 
 <table class='table table-striped' id='company-table' data-toolbar='#button-toolbar'>
 </table>
diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html
index 0c7ac717cd..78649ca6de 100644
--- a/InvenTree/order/templates/order/purchase_orders.html
+++ b/InvenTree/order/templates/order/purchase_orders.html
@@ -8,18 +8,16 @@ InvenTree | Purchase Orders
 
 {% block content %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h3>Purchase Orders</h3>
-    </div>
-    <div class='col-sm-6'>
-        <div class='btn-group' style='float: right;'>
-            <button class='btn btn-primary' type='button' id='po-create' title='Create new purchase order'>New Purchase Order</button>
-        </div>
+<h3>Purchase Orders</h3>
+<hr>
+
+<div id='table-buttons'>
+    <div class='btn-group' style='float: right;'>
+        <button class='btn btn-primary' type='button' id='po-create' title='Create new purchase order'>New Purchase Order</button>
     </div>
 </div>
 
-{% include "order/po_table.html" %}
+{% include "order/po_table.html" with toolbar='#table-buttons' %}
 
 {% endblock %}
 
@@ -34,4 +32,8 @@ $("#po-create").click(function() {
     );
 });
 
+$("#po-table").bootstrapTable({
+    search: true,
+});
+
 {% endblock %}
\ No newline at end of file