diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 5271a9b362..0aab04f941 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -907,6 +907,7 @@ input[type="submit"] {
 
 .info-messages .alert {
     padding: 5px;
+    margin-bottom: 10px;
 }
 
 .part-allocation {
diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html
index 177fad8d6c..2376daf0cf 100644
--- a/InvenTree/build/templates/build/build_base.html
+++ b/InvenTree/build/templates/build/build_base.html
@@ -9,44 +9,54 @@
 {% inventree_title %} | {% trans "Build Order" %} - {{ build }}
 {% endblock %}
 
+{% block below_thumbnail %}
+
+<div class='info-messages'>
+    {% if build.sales_order %}
+    <div class='alert alert-block alert-info'>
+        {% object_link 'so-detail' build.sales_order.id build.sales_order as link %}
+        {% blocktrans %}This Build Order is allocated to Sales Order {{link}}{% endblocktrans %}
+    </div>
+    {% endif %}
+
+    {% if build.parent %}
+    <div class='alert alert-block alert-info'>
+        {% object_link 'build-detail' build.parent.id build.parent as link %}
+        {% blocktrans %}This Build Order is a child of Build Order {{link}}{% endblocktrans %}
+    </div>
+    {% endif %}
+
+    {% if build.active %}
+    {% if build.can_complete %}
+    <div class='alert alert-block alert-success'>
+        {% trans "Build Order is ready to mark as completed" %}
+    </div>
+    {% endif %}
+    {% if build.incomplete_count > 0 %}
+    <div class='alert alert-block alert-danger'>
+        {% trans "Build Order cannot be completed as outstanding outputs remain" %}
+    </div>
+    {% endif %}
+    {% if build.completed < build.quantity %}
+    <div class='alert alert-block alert-warning'>
+        {% trans "Required build quantity has not yet been completed" %}
+    </div>
+    {% endif %}
+    {% if not build.areUntrackedPartsFullyAllocated %}
+    <div class='alert alert-block alert-warning'>
+        {% trans "Stock has not been fully allocated to this Build Order" %}
+    </div>
+    {% endif %}
+    {% endif %}
+</div>
+{% endblock %}
+
 {% block header_pre_content %}
-{% if build.sales_order %}
-<div class='alert alert-block alert-info'>
-    {% object_link 'so-detail' build.sales_order.id build.sales_order as link %}
-    {% blocktrans %}This Build Order is allocated to Sales Order {{link}}{% endblocktrans %}
-</div>
-{% endif %}
-{% if build.parent %}
-<div class='alert alert-block alert-info'>
-    {% object_link 'build-detail' build.parent.id build.parent as link %}
-    {% blocktrans %}This Build Order is a child of Build Order {{link}}{% endblocktrans %}
-</div>
-{% endif %}
+
 {% endblock %}
 
 {% block header_post_content %}
-{% if build.active %}
-{% if build.can_complete %}
-<div class='alert alert-block alert-success'>
-    {% trans "Build Order is ready to mark as completed" %}
-</div>
-{% endif %}
-{% if build.incomplete_count > 0 %}
-<div class='alert alert-block alert-danger'>
-    {% trans "Build Order cannot be completed as outstanding outputs remain" %}
-</div>
-{% endif %}
-{% if build.completed < build.quantity %}
-<div class='alert alert-block alert-warning'>
-    {% trans "Required build quantity has not yet been completed" %}
-</div>
-{% endif %}
-{% if not build.areUntrackedPartsFullyAllocated %}
-<div class='alert alert-block alert-warning'>
-    {% trans "Stock has not been fully allocated to this Build Order" %}
-</div>
-{% endif %}
-{% endif %}
+
 {% endblock %}
 
 {% block thumbnail %}
diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html
index 45bcc76244..d3f4ba74a2 100644
--- a/InvenTree/order/templates/order/sales_order_base.html
+++ b/InvenTree/order/templates/order/sales_order_base.html
@@ -9,13 +9,15 @@
 {% inventree_title %} | {% trans "Sales Order" %}
 {% endblock %}
 
-{% block pre_content %}
-{% if order.status == SalesOrderStatus.PENDING and not order.is_fully_allocated %}
-<div class='alert alert-block alert-danger'>
-    {% trans "This SalesOrder has not been fully allocated" %}
+{% block below_thumbnail %}
+<div class='info-messages'>
+    {% if order.status == SalesOrderStatus.PENDING and not order.is_fully_allocated %}
+    <div class='alert alert-block alert-danger'>
+        {% trans "This Sales Order has not been fully allocated" %}
+    </div>
+    {% endif %}
 </div>
-{% endif %}
-{% endblock %}
+    {% endblock %}
 
 {% block thumbnail %}
 <img class='part-thumb'
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index b0cc69e661..f2f1f6557a 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -12,13 +12,6 @@
 
 <div class='panel panel-default panel-inventree'>
 
-{% if part.variant_of %}
-<div class='alert alert-info alert-block'>
-    {% object_link 'part-variants' part.variant_of.id part.variant_of.full_name as link %}
-    {% blocktrans %}This part is a variant of {{link}}{% endblocktrans %}
-</div>
-{% endif %}
-
     <div class="row">
     <div class="col-sm-6">
         {% include "part/part_thumb.html" %}
@@ -107,6 +100,15 @@
             </table>
         </div>
         </div>
+
+        <div class='info-messages'>
+            {% if part.variant_of %}
+            <div class='alert alert-info alert-block'>
+                {% object_link 'part-variants' part.variant_of.id part.variant_of.full_name as link %}
+                {% blocktrans %}This part is a variant of {{link}}{% endblocktrans %}
+            </div>
+            {% endif %}
+        </div>
     </div>
     <div class="col-sm-6">
         <table class="table table-striped">