diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html
index 4e67325e48..71a8b09e9f 100644
--- a/InvenTree/order/templates/order/order_base.html
+++ b/InvenTree/order/templates/order/order_base.html
@@ -135,6 +135,10 @@ src="{% static 'img/blank_image.png' %}"
 {% block js_ready %}
 {{ block.super }}
 
+enableRightNavbar({
+    minWidth: '50px'
+});
+
 {% if order.status == PurchaseOrderStatus.PENDING and order.lines.count > 0 %}
 $("#place-order").click(function() {
     launchModalForm("{% url 'po-issue' order.id %}",
diff --git a/InvenTree/order/templates/order/order_notes.html b/InvenTree/order/templates/order/order_notes.html
index 0b45a5da4b..f392816120 100644
--- a/InvenTree/order/templates/order/order_notes.html
+++ b/InvenTree/order/templates/order/order_notes.html
@@ -5,14 +5,17 @@
 {% load static %}
 {% load markdownify %}
 
+{% block menubar %}
+{% include 'order/po_navbar.html' with tab='notes' %}
+{% endblock %}
+
+{% block heading %}
+{% trans "Order Notes" %}
+{% endblock %}
+
 {% block details %}
 
-{% include 'order/po_tabs.html' with tab='notes' %}
-
 {% if editing %}
-<h4>{% trans "Order Notes" %}</h4>
-<hr>
-
 <form method='POST'>
     {% csrf_token %}
 
@@ -24,25 +27,16 @@
 {{ form.media }}
 
 {% else %}
-<div class='row'>
-    <div class='col-sm-6'>
-        <h4>{% trans "Order Notes" %}</h4>
-    </div>
-    {% if roles.purchase_order.change %}
-    <div class='col-sm-6'>
-        <button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
-    </div>
-    {% endif %}
-</div>
-<hr>
+{% if roles.purchase_order.change %}
+<button title='{% trans "Edit notes" %}' class='btn btn-default action-button' id='edit-notes'><span class='fas fa-edit'></span></button>
+{% endif %}
+{% endif %}
 <div class='panel panel-default'>
     <div class='panel-content'>
         {{ order.notes | markdownify }}
     </div>
 </div>
 
-{% endif %}
-
 {% endblock %}
 
 {% block js_ready %}
diff --git a/InvenTree/order/templates/order/po_attachments.html b/InvenTree/order/templates/order/po_attachments.html
index d60d605771..6488a33f6f 100644
--- a/InvenTree/order/templates/order/po_attachments.html
+++ b/InvenTree/order/templates/order/po_attachments.html
@@ -4,14 +4,15 @@
 {% load i18n %}
 {% load static %}
 
+{% block menubar %}
+{% include 'order/po_navbar.html' with tab='attachments' %}
+{% endblock %}
+
+{% block heading %}
+{% trans "Purchase Order Attachments" %}
+{% endblock %}
+
 {% block details %}
-
-{% include 'order/po_tabs.html' with tab='attachments' %}
-
-<h4>{% trans "Purchase Order Attachments" %}</h4>
-
-<hr>
-
 {% include "attachment_table.html" with attachments=order.attachments.all %}
 
 {% endblock %}
diff --git a/InvenTree/order/templates/order/po_navbar.html b/InvenTree/order/templates/order/po_navbar.html
new file mode 100644
index 0000000000..eac24d47b3
--- /dev/null
+++ b/InvenTree/order/templates/order/po_navbar.html
@@ -0,0 +1,35 @@
+{% load i18n %}
+{% load static %}
+{% load inventree_extras %}
+
+<ul class='list-group'>
+    <li class='list-group-item'>
+        <a href='#' id='po-menu-toggle'>
+            <span class='menu-tab-icon fas fa-expand-arrows-alt'></span>
+        </a>
+    </li>
+    <li class='list-group-item {% if tab == "details" %}active{% endif %}' title='{% trans "Purchase Order Details" %}'>
+        <a href='{% url "po-detail" order.id %}'>
+            <span class='fas fa-info-circle'></span>
+            {% trans "Details" %}
+        </a>
+    </li>
+    <li class='list-group-item {% if tab == "received" %}active{% endif %}' title='{% trans "Received Stock Items" %}'>
+        <a href='{% url "po-received" order.id %}'>
+            <span class='fas fa-sign-in-alt'></span>
+            {% trans "Received Items" %}
+        </a>
+    </li>
+    <li class='list-group-item {% if tab == "attachments" %}active{% endif %}' title='{% trans "Purchase Order Attachments" %}'>
+        <a href='{% url "po-attachments" order.id %}'>
+            <span class='fas fa-paperclip'></span>
+            {% trans "Attachments" %}
+        </a>
+    </li>
+    <li class='list-group-item {% if tab == "notes" %}active{% endif %}' title='{% trans "Notes" %}'>
+        <a href='{% url "po-notes" order.id %}'>
+            <span class='fas fa-clipboard'></span>
+            {% trans "Notes" %}
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/po_received_items.html b/InvenTree/order/templates/order/po_received_items.html
index b3b46c4aa4..96dcb4fcf7 100644
--- a/InvenTree/order/templates/order/po_received_items.html
+++ b/InvenTree/order/templates/order/po_received_items.html
@@ -4,13 +4,16 @@
 {% load i18n %}
 {% load static %}
 
+{% block menubar %}
+{% include 'order/po_navbar.html' with tab='received' %}
+{% endblock %}
+
+{% block heading %}
+{% trans "Received Items" %}
+{% endblock %}
+
 {% block details %}
 
-{% include 'order/po_tabs.html' with tab='received' %}
-
-<h4>{% trans "Received Items" %}</h4>
-<hr>
-
 {% include "stock_table.html" with read_only=True %}
 
 {% endblock %}
diff --git a/InvenTree/order/templates/order/po_tabs.html b/InvenTree/order/templates/order/po_tabs.html
deleted file mode 100644
index 5792107b04..0000000000
--- a/InvenTree/order/templates/order/po_tabs.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load i18n %}
-
-<ul class='nav nav-tabs'>
-    <li{% ifequal tab 'details' %} class='active'{% endifequal %}>
-        <a href="{% url 'po-detail' order.id %}">{% trans "Line Items" %}</a>
-    </li>
-    <li {% if tab == 'received' %} class='active'{% endif %}>
-        <a href="{% url 'po-received' order.id %}">{% trans "Received Items" %}</a>
-    </li>
-    <li{% if tab == 'attachments' %} class='active'{% endif %}>
-        <a href="{% url 'po-attachments' order.id %}">{% trans "Attachments" %}
-            {% if order.attachments.count > 0 %}
-            <span class='badge'>{{ order.attachments.count }}</span>
-            {% endif %}
-        </a>
-    </li>
-    <li{% ifequal tab 'notes' %} class='active'{% endifequal %}>
-        <a href="{% url 'po-notes' order.id %}">{% trans "Notes" %}{% if order.notes %} <span class='fas fa-info-circle'></span>{% endif %}</a>
-    </li>
-</ul>
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index 0829eb18e1..268e83ef4e 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -5,11 +5,18 @@
 {% load i18n %}
 {% load static %}
 
+{% block menubar %}
+{% include 'order/po_navbar.html' with tab='details' %}
+
+{% endblock %}
+
+{% block heading %}
+{% trans "Purchase Order Items" %}
+{% endblock %}
+
+
 {% block details %}
 
-{% include 'order/po_tabs.html' with tab='details' %}
-
-<hr>
 
 <div id='order-toolbar-buttons' class='btn-group' style='float: right;'>
     {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %}
@@ -18,7 +25,6 @@
     {% endif %}
 </div>
 
-<h4>{% trans "Purchase Order Items" %}</h4>
 
 <table class='table table-striped table-condensed' id='po-table' data-toolbar='#order-toolbar-buttons'>
 </table>
diff --git a/InvenTree/part/templates/part/navbar.html b/InvenTree/part/templates/part/navbar.html
index 7b9babf422..17e69172de 100644
--- a/InvenTree/part/templates/part/navbar.html
+++ b/InvenTree/part/templates/part/navbar.html
@@ -6,7 +6,6 @@
     <li class='list-group-item'>
         <a href='#' id='part-menu-toggle'>
             <span class='menu-tab-icon fas fa-expand-arrows-alt'></span>
-            <b>{% trans "Part" %}</b>
         </a>
     </li>
     <li class='list-group-item {% if tab == "details" %}active{% endif %}' title='{% trans "Part Details" %}'>
diff --git a/InvenTree/templates/two_column.html b/InvenTree/templates/two_column.html
index 1c90887b3c..9904ecb804 100644
--- a/InvenTree/templates/two_column.html
+++ b/InvenTree/templates/two_column.html
@@ -3,34 +3,49 @@
 {% load static %}
 {% load i18n %}
 
+{% block menubar %}
+<!-- Custom menubar goes here -->
+{% endblock %}
+
 {% block content %}
 
-<div class='row'>
-    <div class='col-sm-6'>
-        <div class='media-left'>
-            {% block thumbnail %}
-            <!-- Image goes here -->
+<div class='panel panel-default panel-inventree'>
+    
+    <div class='row'>
+        <div class='col-sm-6'>
+            <div class='media-left'>
+                {% block thumbnail %}
+                <!-- Image goes here -->
+                {% endblock %}
+            </div>
+            <div class='media-body'>
+                {% block page_data %}
+                <!-- Data next to image goes here -->
+                {% endblock %}
+            </div>
+        </div>
+        <div class='col-sm-6'>
+            {% block page_details %}
+            <!-- Right column data goes here -->
             {% endblock %}
         </div>
-        <div class='media-body'>
-            {% block page_data %}
-            <!-- Data next to image goes here -->
-            {% endblock %}
-        </div>
-    </div>
-    <div class='col-sm-6'>
-        {% block page_details %}
-        <!-- Right column data goes here -->
-        {% endblock %}
     </div>
 </div>
 
-<hr>
+<div class='panel panel-default panel-inventree'>
+    <div class='panel-heading'>
+        <h4>
+            {% block heading %}
+            <!-- Heading goes here -->
+            {% endblock %}
+        </h4>
+    </div>
 
-<div class='container-fluid'>
-    {% block details %}
-    <!-- Particular page detail views go here -->
-    {% endblock %}
+    <div class='panel-content'>
+        {% block details %}
+        <!-- Particular page detail views go here -->
+        {% endblock %}
+    </div>
 </div>
 
 {% endblock %}