diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py
index b18b539b63..468c8d41ea 100644
--- a/InvenTree/company/models.py
+++ b/InvenTree/company/models.py
@@ -67,11 +67,3 @@ class Company(models.Model):
     def has_parts(self):
         return self.part_count > 0
 
-    @property
-    def order_count(self):
-        return self.orders.count()
-
-    @property
-    def has_orders(self):
-        return self.order_count > 0
-
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index 2fd12d5348..07bc1e38fb 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -55,8 +55,14 @@
     </div>
 </div>
 
+<hr>
+
+<div class='container-fluid'>
+
 {% block details %}
 
 {% endblock %}
 
+</div>
+
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 8c60890ee1..075af4a628 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -2,4 +2,6 @@
 
 {% block details %}
 
+{% include 'company/tabs.html' with tab='details' %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html
index dae2744c82..fbef8b28c9 100644
--- a/InvenTree/company/templates/company/partdetail.html
+++ b/InvenTree/company/templates/company/partdetail.html
@@ -6,7 +6,7 @@
 
 <table class="table">
     <tr><td>SKU</td><td>{{ part.SKU }}</tr></tr>
-    <tr><td>Supplier</td><td><a href="{% url 'supplier-detail' part.supplier.id %}">{{ part.supplier.name }}</a></td></tr>
+    <tr><td>Supplier</td><td><a href="{% url 'company-detail' part.supplier.id %}">{{ part.supplier.name }}</a></td></tr>
     <tr>
         <td>Parent Part</td>
         <td>
diff --git a/InvenTree/company/templates/company/tabs.html b/InvenTree/company/templates/company/tabs.html
index 559e83f9f0..5ee86df1be 100644
--- a/InvenTree/company/templates/company/tabs.html
+++ b/InvenTree/company/templates/company/tabs.html
@@ -1,6 +1,18 @@
 <ul class='nav nav-tabs'>
-<li{% if tab == 'parts' %} class='active'{% endif %}>
-    <a href="{% url 'supplier-detail' supplier.id %}">Parts <span class='badge'>{{ supplier.part_count }}</span></a></li>
-<li{% if tab == 'order' %} class='active'{% endif %}>
-    <a href="{% url 'supplier-detail-orders' supplier.id %}">Orders <span class="badge">{{ supplier.order_count }}</span></a></li>
+    <li{% if tab == 'details' %} class='active'{% endif %}>
+        <a href="{% url 'company-detail' company.id %}">Details</a>
+    </li>
+    {% if company.is_supplier %}
+    <li{% if tab == 'parts' %} class='active'{% endif %}>
+        <a href="{% url 'company-detail' company.id %}">Supplier Parts <span class='badge'>{{ company.part_count }}</span></a>
+    </li>
+    <li{% if tab == 'po' %} class='active'{% endif %}>
+        <a href="#">Purchase Orders</a>
+    </li>
+    {% endif %}
+    {% if company.is_customer %}
+    <li{% if tab == 'co' %} class='active'{% endif %}>
+        <a href="#">Sales Orders</a>
+    </li>
+    {% endif %}
 </ul>
\ No newline at end of file
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 6a7ddfcd4e..e938c47733 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -353,6 +353,7 @@ class BomItem(models.Model):
             child=self.sub_part.name,
             n=self.quantity)
 
+
 class SupplierPart(models.Model):
     """ Represents a unique part as provided by a Supplier
     Each SupplierPart is identified by a MPN (Manufacturer Part Number)
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 4dc00f96a0..eaa9bde0c9 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -26,13 +26,15 @@
 {% if part.default_location %}
 <tr>
     <td>Default Location</td>
-    <td>{{ part.default_location.pathstring }}</td>
+    <td><a href="{% url 'stock-location-detail' part.default_location.id %}">{{ part.default_location.pathstring }}</a></td>
 </tr>
 {% endif %}
 {% if part.default_supplier %}
 <tr>
     <td>Default Supplier</td>
-    <td>{{ part.default_supplier.supplier.name }} | {{ part.default_supplier.SKU }}</td>
+    <td><a href="{% url 'supplier-part-detail' part.default_supplier.id %}">
+        {{ part.default_supplier.supplier.name }} | {{ part.default_supplier.SKU }}
+    </a></td>
 </tr>
 {% endif %}
 <tr>
diff --git a/InvenTree/part/templates/part/supplier.html b/InvenTree/part/templates/part/supplier.html
index 1a832688c1..7ccc209723 100644
--- a/InvenTree/part/templates/part/supplier.html
+++ b/InvenTree/part/templates/part/supplier.html
@@ -16,7 +16,7 @@
 {% for spart in part.supplier_parts.all %}
 <tr>
     <td><a href="{% url 'supplier-part-detail' spart.id %}">{{ spart.SKU }}</a></td>
-    <td><a href="{% url 'supplier-detail' spart.supplier.id %}">{{ spart.supplier.name }}</a></td>
+    <td><a href="{% url 'company-detail' spart.supplier.id %}">{{ spart.supplier.name }}</a></td>
     <td>
         {% if spart.manufacturer %}{{ spart.manufacturer.name }}{% endif %}
         {% if spart.MPN %} | {{ spart.MPN }}{% endif %}