diff --git a/InvenTree/build/templates/build/notes.html b/InvenTree/build/templates/build/notes.html
index 8eff2eff10..2bdbf07970 100644
--- a/InvenTree/build/templates/build/notes.html
+++ b/InvenTree/build/templates/build/notes.html
@@ -31,8 +31,10 @@
 
 {% else %}
 
+{% if build.notes %}
 {{ build.notes | markdownify }}
 {% endif %}
+{% endif %}
 
 {% endblock %}
 
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 1f2bcf3784..105e0f82ae 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -179,7 +179,9 @@
         </div>
     </div>
     <div class='panel-content'>
+        {% if company.notes %}
         {{ company.notes | markdownify }}
+        {% endif %}
     </div>
 </div>
 
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index 8c9feab452..cbff1b2d1c 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -65,7 +65,9 @@
         </div>
     </div>
     <div class='panel-content'>
+        {% if order.notes %}
         {{ order.notes | markdownify }}
+        {% endif %}
     </div>
 </div>
 
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html
index 8ada362092..277c1f4278 100644
--- a/InvenTree/order/templates/order/sales_order_detail.html
+++ b/InvenTree/order/templates/order/sales_order_detail.html
@@ -64,7 +64,9 @@
         </div>
     </div>
     <div class='panel-content'>
+        {% if order.notes %}
         {{ order.notes | markdownify }}
+        {% endif %}
     </div>
 </div>
 
diff --git a/InvenTree/part/templates/part/allocation.html b/InvenTree/part/templates/part/allocation.html
deleted file mode 100644
index e78456ea3a..0000000000
--- a/InvenTree/part/templates/part/allocation.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% extends "part/part_base.html" %}
-{% load status_codes %}
-{% load i18n %}
-{% load inventree_extras %}
-
-{% block menubar %}
-{% include "part/navbar.html" with tab="allocation" %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Build Order Allocations" %}
-{% endblock %}
-
-{% block details %}
-
-<table class='table table-striped table-condensed' id='build-order-table'></table>
-
-{% endblock %}
-
-{% block pre_content_panel %}
-
-<div class='panel panel-default panel-inventree'>
-    <div class='panel-heading'>
-        <h4>{% trans "Sales  Order Allocations" %}</h4>
-    </div>
-    
-    <div class='panel-content'>
-        <table class='table table-striped table-condensed' id='sales-order-table'></table>
-    </div>
-</div>
-
-{% endblock %}
-
-
-{% block js_ready %}
-{{ block.super }}
-
-    loadSalesOrderAllocationTable("#sales-order-table", {
-        params: {
-            part: {{ part.id }},
-        }
-    });
-
-    loadBuildOrderAllocationTable("#build-order-table", {
-        params: {
-            part: {{ part.id }},
-        }
-    });
-
-{% endblock %}
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 6949879aa4..b44bd25acc 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -84,6 +84,13 @@
         <table class='table table-striped table-condensed po-table' id='sales-order-table' data-toolbar='#so-button-bar'>
         </table>
     </div>
+
+    <div class='panel-heading'>
+        <h4>{% trans "Sales Order Allocations" %}</h4>
+    </div>
+    <div class='panel-content'>
+        <table class='table table-striped table-condensed' id='sales-order-allocation-table'></table>
+    </div>
 </div>
 
 <div class='panel panel-default panel-inventree panel-hidden' id='panel-part-notes'>
@@ -103,7 +110,9 @@
         </div>
     </div>
     <div class='panel-content'>
+        {% if part.notes %}
         {{ part.notes | markdownify }}
+        {% endif %}
     </div>
 </div>
 
@@ -275,6 +284,13 @@
         <table class='table table-striped table-condensed' data-toolbar='#build-button-toolbar' id='build-table'>
         </table>
     </div>
+
+    <div class='panel-heading'>
+        <h4>{% trans "Build Order Allocations" %}</h4>
+    </div>
+    <div class='panel-content'>
+        <table class='table table-striped table-condensed' id='build-order-allocation-table'></table>
+    </div>
 </div>
 
 <div class='panel panel-default panel-inventree panel-hidden' id='panel-part-manufacturers'>
@@ -310,6 +326,18 @@
 {% block js_ready %}
     {{ block.super }}
 
+    loadBuildOrderAllocationTable("#build-order-allocation-table", {
+        params: {
+            part: {{ part.id }},
+        }
+    });
+
+    loadSalesOrderAllocationTable("#sales-order-allocation-table", {
+        params: {
+            part: {{ part.id }},
+        }
+    });
+
     loadPartTable('#used-table',
         '{% url "api-part-list" %}',
         {
diff --git a/InvenTree/part/templates/part/navbar.html b/InvenTree/part/templates/part/navbar.html
index e9d11207ed..4f0e92a80d 100644
--- a/InvenTree/part/templates/part/navbar.html
+++ b/InvenTree/part/templates/part/navbar.html
@@ -31,14 +31,6 @@
             {% trans "Stock" %}
         </a>
     </li>
-    {% if part.component or part.salable %}
-    <li class='list-group-item' title='{% trans "Allocated Stock" %}'>
-        <a href='#' id='select-part-allocations' class='nav-toggle'>
-            <span class='menu-tab-icon fas fa-sign-out-alt sidebar-icon'></span>
-            {% trans "Allocations" %}
-        </a>
-    </li>
-    {% endif %}
     {% if part.assembly %}
     <li class='list-group-item' title='{% trans "Bill of Materials" %}'>
         <a href='#' id='select-bom' class='nav-toggle'>
diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py
index ded9e0b3c4..a2489de058 100644
--- a/InvenTree/part/urls.py
+++ b/InvenTree/part/urls.py
@@ -47,7 +47,6 @@ part_detail_urls = [
     url(r'^bom-upload/?', views.BomUpload.as_view(), name='upload-bom'),
     url(r'^bom-duplicate/?', views.BomDuplicate.as_view(), name='duplicate-bom'),
 
-    url(r'^allocation/?', views.PartDetail.as_view(template_name='part/allocation.html'), name='part-allocation'),
     url(r'^prices/', views.PartPricingView.as_view(template_name='part/prices.html'), name='part-prices'),
     url(r'^track/?', views.PartDetail.as_view(template_name='part/track.html'), name='part-track'),