diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html
index 5163905f83..af24a6ca53 100644
--- a/InvenTree/build/templates/build/index.html
+++ b/InvenTree/build/templates/build/index.html
@@ -5,12 +5,12 @@
 
 <div class='row'>
     <div class='col-sm-6'>
-        <h4>Part Builds</h4>
+        <h3>Part Builds</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 class="btn btn-success" id='new-build'>Start New Build</button>
+                <button type='button' class="btn btn-success" id='new-build'>Start New Build</button>
             </div>
         </div>
     </div>
diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index 7cfd7d18de..4fa19e9eb6 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -4,11 +4,21 @@
 
 {% block content %}
 
-<h3>Companies</h3>
-<div id='button-toolbar'>
-<button style='float: right;' class="btn btn-success" id='new-company'>New Company</button>
+<div class='row'>
+    <div class='col-sm-6'>
+        <h3>Company 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'>New Company</button>
+            </div>
+        </div>
+    </div>
 </div>
 
+<hr>
+
 <table class='table table-striped' id='company-table' data-toolbar='#button-toolbar'>
 </table>
 
diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html
index d1aa037870..77ffa8dbff 100644
--- a/InvenTree/part/templates/part/attachments.html
+++ b/InvenTree/part/templates/part/attachments.html
@@ -5,12 +5,19 @@
 
 {% include 'part/tabs.html' with tab='attachments' %}
 
-<h4>Attachments</h4>
-
-<div id='toolbar' class='btn-group'>
-    <button type='button' class='btn btn-success' id='new-attachment'>Add Attachment</button>
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>Part Attachments</h4>
+    </div>
+    <div class='col-sm-6'>
+        <div class="btn-group" style="float: right;">
+                <button type='button' class='btn btn-success' id='new-attachment'>Add Attachment</button>
+        </div>
+    </div>
 </div>
 
+<hr>
+
 <table class='table table-striped table-condensed' data-toolbar='#toolbar' id='attachment-table'>
 <tr>
     <th>File</th>
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index a59b97ce47..419409a95d 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -6,26 +6,24 @@
 
 <div class='row'>
     <div class='col-sm-6'>
-        <h3>Part Details</h3>
+        <h4>Part Details</h4>
     </div>
     <div class='col-sm-6'>
-        <h3>
-            <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">
-                  {% if part.active %}
-                  <li><a href='#' id='duplicate-part' title='Duplicate Part'>Duplicate</a></li>
-                  <li><a href="#" id='edit-part' title='Edit part'>Edit</a></li>
-                  <li><a href='#' id='stocktake-part' title='Stocktake'>Stocktake</a></li>
-                  <hr>
-                  <li><a href="#" id='deactivate-part' title='Deactivate part'>Deactivate</a></li>
-                  {% else %}
-                  <li><a href="#" id='activate-part' title='Activate part'>Activate</a></li>
-                  {% endif %}
-                </ul>
-            </div>
-        </h3>
+        <div class="btn-group" 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">
+                {% if part.active %}
+                <li><a href='#' id='duplicate-part' title='Duplicate Part'>Duplicate</a></li>
+                <li><a href="#" id='edit-part' title='Edit part'>Edit</a></li>
+                <li><a href='#' id='stocktake-part' title='Stocktake'>Stocktake</a></li>
+                <hr>
+                <li><a href="#" id='deactivate-part' title='Deactivate part'>Deactivate</a></li>
+                {% else %}
+                <li><a href="#" id='activate-part' title='Activate part'>Activate</a></li>
+                {% endif %}
+            </ul>
+        </div>
     </div>
 </div>
 
diff --git a/InvenTree/part/templates/part/stock.html b/InvenTree/part/templates/part/stock.html
index fb620c1b7b..a329a25249 100644
--- a/InvenTree/part/templates/part/stock.html
+++ b/InvenTree/part/templates/part/stock.html
@@ -4,7 +4,14 @@
 
 {% include 'part/tabs.html' with tab='stock' %}
 
-<h3>Part Stock</h3>
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>Part Stock</h4>
+    </div>
+    <div class='col-sm-6'>
+    </div>
+</div>
+<hr>
 
 <div id='button-toolbar'>
     {% if part.active %}
diff --git a/InvenTree/part/templates/part/supplier.html b/InvenTree/part/templates/part/supplier.html
index 0f417eb650..00f7fa41d0 100644
--- a/InvenTree/part/templates/part/supplier.html
+++ b/InvenTree/part/templates/part/supplier.html
@@ -4,7 +4,15 @@
 
 {% include 'part/tabs.html' with tab='suppliers' %}
 
-<h3>Part Suppliers</h3>
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>Part Suppliers</h4>
+    </div>
+    <div class='col-sm-6'>
+    </div>
+</div>
+
+<hr>
 
 <div id='button-toolbar'>
     <button class="btn btn-success" id='supplier-create'>New Supplier Part</button>
diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html
index 2bcf894b2a..d8e84a6f09 100644
--- a/InvenTree/part/templates/part/tabs.html
+++ b/InvenTree/part/templates/part/tabs.html
@@ -37,4 +37,6 @@
     <li{% ifequal tab 'attachments' %} class="active"{% endifequal %}>
         <a href="{% url 'part-attachments' part.id %}">Attachments {% if part.attachments.all|length > 0 %}<span class="badge">{{ part.attachments.all|length }}</span>{% endif %}</a>
     </li>
-</ul>
\ No newline at end of file
+</ul>
+
+<br>
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/used_in.html b/InvenTree/part/templates/part/used_in.html
index 118f335468..eca07a585d 100644
--- a/InvenTree/part/templates/part/used_in.html
+++ b/InvenTree/part/templates/part/used_in.html
@@ -4,7 +4,17 @@
 
 {% include 'part/tabs.html' with tab='used' %}
 
-<h3>Used In</h3>
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>Used to Build</h4>
+    </div>
+    <div class='col-sm-6'>
+        <div class="btn-group" style="float: right;">
+        </div>
+    </div>
+</div>
+
+<hr>
 
 <table class="table table-striped table-condensed" id='used-table'>
 </table>
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index 12019ca7b0..89b412bdcc 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <h3>InvenTree</h3>
-
+<hr>
 {% include "InvenTree/starred_parts.html" with collapse_id="starred" %}
 
 {% if to_order %}