diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index f8500b0fe0..c412b1ea75 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -1,4 +1,4 @@
-{% include "base.html" %}
+{% extends "base.html" %}
 
 {% block content %}
 <h3>Build Details</h3>
diff --git a/InvenTree/customer/templates/customer/order_index.html b/InvenTree/customer/templates/customer/order_index.html
index b71db4932b..2bc8554196 100644
--- a/InvenTree/customer/templates/customer/order_index.html
+++ b/InvenTree/customer/templates/customer/order_index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block contents %}
+{% block content %}
 
 <table class="table table-striped">
         <tr>
diff --git a/InvenTree/supplier/templates/supplier/order_detail.html b/InvenTree/supplier/templates/supplier/order_detail.html
index 1a9f650410..1aa3d8c8e9 100644
--- a/InvenTree/supplier/templates/supplier/order_detail.html
+++ b/InvenTree/supplier/templates/supplier/order_detail.html
@@ -1,7 +1,50 @@
-{% include "base.html" %}
+{% extends "base.html" %}
 
 {% block content %}
 
-Details for supplier order {{ order.id }}.
+<h3>Supplier Order Details</h3>
+
+<table class='table table-striped'>
+<tr>
+    <td>Reference</td>
+    <td>{{ order.internal_ref }}</td>
+</tr>
+<tr>
+    <td>Supplier</td>
+    <td>
+        {% if order.supplier %}
+        <a href="{% url 'supplier-detail-orders' order.supplier.id %}">{{ order.supplier.name }}</a>
+        {% endif %}
+    </td>
+</tr>
+<tr>
+    <td>Status</td>
+    <td>{% include "supplier/order_status.html" with order=order %}</td>
+</tr>
+<tr>
+    <td>Created Date</td>
+    <td>{{ order.created_date }}</td>
+</tr>
+<tr>
+    <td>Issued Date</td>
+    <td>{{ order.issued_date }}</td>
+</tr>
+<tr>
+    <td>Delivered Date</td>
+    <td>{{ order.delivery_date }}</td>
+</tr>
+</table>
+
+
+{% if order.notes %}
+<div class="panel panel-default">
+  <div class="panel-heading"><b>Notes</b></div>
+  <div class="panel-body">{{ order.notes }}</div>
+</div>
+
+<h2>TODO</h2>
+Here we list all the line ites which exist under this order...
+
+{% endif %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/supplier/templates/supplier/order_status.html b/InvenTree/supplier/templates/supplier/order_status.html
new file mode 100644
index 0000000000..49ccc7f170
--- /dev/null
+++ b/InvenTree/supplier/templates/supplier/order_status.html
@@ -0,0 +1,13 @@
+{% if order.status == order.PENDING %}
+<span class='label label-info'>
+{% elif order.status == order.PLACED %}
+<span class='label label-primary'>
+{% elif order.status == order.RECEIVED %}
+<span class='label label-success'>
+{% elif order.status == order.CANCELLED %}
+<span class='label label-warning'>
+{% else %}
+<span class='label label-danger'>
+{% endif %}
+{{ order.get_status_display }}
+</span>
\ No newline at end of file
diff --git a/InvenTree/supplier/templates/supplier/orders.html b/InvenTree/supplier/templates/supplier/orders.html
index 84adf17585..29ac20dad0 100644
--- a/InvenTree/supplier/templates/supplier/orders.html
+++ b/InvenTree/supplier/templates/supplier/orders.html
@@ -18,7 +18,7 @@
     <td><a href="{% url 'supplier-order-detail' order.id %}">{{ order.internal_ref }}</a></td>
     <td>{% if order.issued_date %}{{ order.issued_date }}{% endif %}</td>
     <td>{% if order.delivery_date %}{{ order.delivery_date }}{% endif %}</td>
-    <td>{{ order.get_status_display }}</td>
+    <td>{% include "supplier/order_status.html" with order=order %}</td>
 </tr>
 {% endfor %}
 </table>
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 0124c9018d..3151fd1477 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -33,7 +33,7 @@ InvenTree
 
 {% include "navbar.html" %}
 
-<div class="container-fluid inventree-content">
+<div class="container container-fluid inventree-content">
 {% block content %}
 <!-- Each view fills in here.. -->
 {% endblock %}