diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index f8ed6e2a93..b872e5aa71 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -3,7 +3,7 @@
 {% block form %}
 
 <h4>
-    Step 1 of 2 - Select Parts
+    Step 1 of 2 - Select Part Suppliers
 </h4>
 
 {% if parts|length > 0 %}
diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html
index 493002d2f0..882d9aee8d 100644
--- a/InvenTree/part/templates/part/attachments.html
+++ b/InvenTree/part/templates/part/attachments.html
@@ -5,37 +5,39 @@
 
 {% include 'part/tabs.html' with tab='attachments' %}
 
-<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>
+<h4>Part Attachments</h4>
 
 <hr>
 
-<table class='table table-striped table-condensed' data-toolbar='#toolbar' id='attachment-table'>
-<tr>
-    <th>File</th>
-    <th>Comment</th>
-    <th></th>
-</tr>
-{% for attachment in part.attachments.all %}
-<tr>
-    <td><a href='/media/{{ attachment.attachment }}'>{{ attachment.basename }}</a></td>
-    <td>{{ attachment.comment }}</td>
-    <td>
-        <div class='btn-group' style='float: right;'>    
-            <button type='button' class='btn btn-primary attachment-edit-button' url="{% url 'part-attachment-edit' attachment.id %}" data-toggle='tooltip' title='Edit attachment ({{ attachment.basename }})'><span class='glyphicon glyphicon-small glyphicon-edit'></span></button>
-            <button type='button' class='btn btn-danger attachment-delete-button' url="{% url 'part-attachment-delete' attachment.id %}" data-toggle='tooltip' title='Delete attachment ({{ attachment.basename }})'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>
-        </div>
-    </td>
-</tr>
-{% endfor %}
+<div id='attachment-buttons'>
+    <div class="btn-group">
+        <button type='button' class='btn btn-success' id='new-attachment'>Add Attachment</button>
+    </div>
+</div>
+
+
+<table class='table table-striped table-condensed' data-toolbar='#attachment-buttons' id='attachment-table'>
+    <thead>
+        <tr>
+            <th data-field='file' data-searchable='true'>File</th>
+            <th data-field='comment' data-searchable='true'>Comment</th>
+            <th></th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for attachment in part.attachments.all %}
+        <tr>
+            <td><a href='/media/{{ attachment.attachment }}'>{{ attachment.basename }}</a></td>
+            <td>{{ attachment.comment }}</td>
+            <td>
+                <div class='btn-group' style='float: right;'>    
+                    <button type='button' class='btn btn-primary attachment-edit-button' url="{% url 'part-attachment-edit' attachment.id %}" data-toggle='tooltip' title='Edit attachment ({{ attachment.basename }})'><span class='glyphicon glyphicon-small glyphicon-edit'></span></button>
+                    <button type='button' class='btn btn-danger attachment-delete-button' url="{% url 'part-attachment-delete' attachment.id %}" data-toggle='tooltip' title='Delete attachment ({{ attachment.basename }})'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>
+                </div>
+            </td>
+        </tr>
+        {% endfor %}
+    </tbody>
 {% if part.variant_of and part.variant_of.attachments.count > 0 %}
 <tr>
     <td colspan='3'>
@@ -83,4 +85,9 @@
         });
     });
 
+    $("#attachment-table").bootstrapTable({
+        search: true,
+        sortable: true,
+    });
+
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index ef47e70515..68ae0ed3bd 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -4,9 +4,12 @@
 
 {% include 'part/tabs.html' with tab='detail' %}
 
+<h4>Part Details</h4>
+
+<hr>
+
 <div class='row'>
     <div class='col-sm-6'>
-        <h4>Part Details</h4>
     <table class='table table-striped'>
         <tr>
             <td><b>Part name</b></td>
@@ -75,7 +78,6 @@
     </table>
     </div>
     <div class='col-sm-6'>
-        <h4>Part Type</h4>
     <table class='table table-striped'>
         <tr>
             <td><b>Virtual</b></td>
diff --git a/InvenTree/part/templates/part/orders.html b/InvenTree/part/templates/part/orders.html
index 8c9f0c3cee..975a41049a 100644
--- a/InvenTree/part/templates/part/orders.html
+++ b/InvenTree/part/templates/part/orders.html
@@ -5,19 +5,38 @@
 
 {% include 'part/tabs.html' with tab='orders' %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h4>Open Part Orders</h4>
-    </div>
-    <div class='col-sm-6'>
+<h4>Part Orders</h4>
+<hr>
+
+<div id='button-bar'>
+    <div class='btn-group'>
+        <button class='btn btn-primary' type='button' id='part-order-2' title='Order part'>Order Part</button>
     </div>
 </div>
 
-{% include "order/po_table.html" with orders=part.open_purchase_orders %}
+{% include "order/po_table.html" with orders=part.open_purchase_orders toolbar='#button-bar' %}
 
 {% if part.closed_purchase_orders|length > 0 %}
 <h4>Closed Orders</h4>
 {% include "order/po_table.html" with orders=part.closed_purchase_orders %}
 {% endif %}
 
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+
+$("#po-table").bootstrapTable({
+    search: true,
+    sortable: true,
+});
+
+$("#part-order-2").click(function() {
+    launchModalForm("/order/purchase-order/order-parts/", {
+        data: {
+            part: {{ part.id }},
+        },
+    });
+});
+
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/stock.html b/InvenTree/part/templates/part/stock.html
index 04d1b0278a..a41d5fd32a 100644
--- a/InvenTree/part/templates/part/stock.html
+++ b/InvenTree/part/templates/part/stock.html
@@ -4,13 +4,7 @@
 
 {% include 'part/tabs.html' with tab='stock' %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h4>Part Stock</h4>
-    </div>
-    <div class='col-sm-6'>
-    </div>
-</div>
+<h4>Part Stock</h4>
 <hr>
 
 {% if part.is_template %}
diff --git a/InvenTree/part/templates/part/supplier.html b/InvenTree/part/templates/part/supplier.html
index ea5baa2759..30fe9ecc0b 100644
--- a/InvenTree/part/templates/part/supplier.html
+++ b/InvenTree/part/templates/part/supplier.html
@@ -4,14 +4,7 @@
 
 {% include 'part/tabs.html' with tab='suppliers' %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <h4>Part Suppliers</h4>
-    </div>
-    <div class='col-sm-6'>
-    </div>
-</div>
-
+<h4>Part Suppliers</h4>
 <hr>
 
 <div id='button-toolbar'>
diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html
index c7dbb2418f..aa7a9fa885 100644
--- a/InvenTree/part/templates/part/tabs.html
+++ b/InvenTree/part/templates/part/tabs.html
@@ -48,6 +48,4 @@
     <li{% ifequal tab 'attachments' %} class="active"{% endifequal %}>
         <a href="{% url 'part-attachments' part.id %}">Attachments {% if part.attachment_count > 0 %}<span class="badge">{{ part.attachment_count }}</span>{% endif %}</a>
     </li>
-</ul>
-
-<br>
\ No newline at end of file
+</ul>
\ 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 135427e313..fb7e76e7e9 100644
--- a/InvenTree/part/templates/part/used_in.html
+++ b/InvenTree/part/templates/part/used_in.html
@@ -4,15 +4,7 @@
 
 {% include 'part/tabs.html' with tab='used' %}
 
-<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>
+<h4>Assemblies</h4>
 
 <hr>