diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index cec745cd20..55ce09c72d 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -4,14 +4,15 @@
 
 {% 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>
 
 <table class='table table-striped' id='company-table'>
 </table>
 
-<div class='container-fluid'>
-<button class="btn btn-success" id='new-company'>New Company</button>
-</div>
+
 
 {% include 'modals.html' %}
 
diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css
index 637ef520f3..e4f01e97bf 100644
--- a/InvenTree/static/css/inventree.css
+++ b/InvenTree/static/css/inventree.css
@@ -115,4 +115,9 @@
     border-radius: 5px;
     opacity: 0.9;
     pointer-events: all;
+}
+
+.btn {
+    margin-left: 2px;
+    margin-right: 2px;
 }
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/index.html b/InvenTree/stock/templates/stock/index.html
index 9665f8c571..2409af6c71 100644
--- a/InvenTree/stock/templates/stock/index.html
+++ b/InvenTree/stock/templates/stock/index.html
@@ -4,18 +4,27 @@
 
 {% include "stock/loc_link.html" with location=None %}
 
-{% if locations.all|length > 0 %}
-<h4>Storage Locations</h4>
-{% include "stock/location_list.html" with locations=locations %}
-{% endif %}
+<div class='row'>
+    <div class='col-sm-6'>
+        <h3>Storage Locations</h3>
+    </div>
+    <div class='col-sm-6'>
+        <h3>
+            <button style='float: right;' class='btn btn-success' id='location-create'>New Stock Location</button>
+        </h3>
+    </div>
+</div>
 
+<hr>
+
+{% if locations|length > 0 %}
+{% include "stock/location_list.html" with locations=locations %}
+<hr>
+{% endif %}
+<h3>Stock Items</h3>
 <table class="table table-striped" id='stock-table'>
 </table>
 
-<div class='container-fluid'>
-<button class="btn btn-success" id='location-create'>New Stock Location</button>
-</div>
-
 {% include 'modals.html' %}
 
 {% endblock %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index e327a5067d..2fc6cbd523 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -10,20 +10,24 @@
     <p>{{ location.description }}</p>
 </div>
 <div class='col-sm-6'>
+    <h3>
+    <div style='float: right;'>
+    <button class='btn btn-success' id='location-create'>New Stock Location</button>
     <div class="dropdown" style="float: right;">
         <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Stock Location
         <span class="caret"></span></button>
         <ul class="dropdown-menu">
-          <li><a href='#' id='location-create' title='Create new stock location'>New</a></li>
           <li><a href="#" id='location-edit' title='Edit stock location'>Edit</a></li>
           <li><a href="#" id='location-delete' title='Delete stock location'>Delete</a></li>
         </ul>
     </div>
+    </div>
+    </h3>
 </div>
 </div>
 
 {% if location.has_children %}
-<h4>Sub Locations</h4>
+<h3>Sub Locations</h3>
 {% include "stock/location_list.html" with locations=location.children %}
 {% endif %}
 
@@ -32,7 +36,8 @@
 </table>
 {% endif %}
 
-<div class='container-fluid'>
+<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">Selected
         <span class="caret"></span></button>
@@ -42,7 +47,6 @@
           <li><a href="#" id='multi-item-delete' title='Delete selected stock items'>Delete</a></li>
         </ul>
     </div>
-    <button class="btn btn-success" id='item-create'>New Stock Item</span></button>
 </div>
 
 {% include 'modals.html' %}