diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 511c1253e3..69840829e3 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -42,8 +42,10 @@
         <tr>
             <td>Available Stock</td>
             <td>
-                {% if part.available_stock == 0 or part.available_stock < part.minimum_stock %}
+                {% if part.available_stock == 0 %}
                 <span class='label label-danger'>{{ part.available_stock }}</span>
+                {% elif part.available_stock < part.minimum_stock %}
+                <span class='label label-warning'>{{ part.available_stock }}</span>
                 {% else %}
                 {{ part.available_stock }}
                 {% endif %}
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index 8d0f01a409..d4aac549a5 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -176,6 +176,10 @@ class StockItem(models.Model):
             part=self.part.name,
             loc=self.location.name)
 
+    @property
+    def is_trackable(self):
+        return self.part.trackable
+
 
 class StockItemTracking(models.Model):
     """ Stock tracking entry
diff --git a/InvenTree/supplier/templates/supplier/detail.html b/InvenTree/supplier/templates/supplier/detail.html
index f1c7a8c52a..101446fb95 100644
--- a/InvenTree/supplier/templates/supplier/detail.html
+++ b/InvenTree/supplier/templates/supplier/detail.html
@@ -44,7 +44,7 @@
 <tr>
     <th>SKU</th>
     <th>Description</th>
-    <th>Part</th>
+    <th>Parent Part</th>
     <th>MPN</th>
     <th>URL</th>
 </tr>
@@ -54,7 +54,7 @@
     <td>{{ part.description }}</td>
     <td>
         {% if part.part %}
-        <a href="{% url 'part-detail' part.part.id %}">{{ part.part.name }}</a>
+        <a href="{% url 'part-suppliers' part.part.id %}">{{ part.part.name }}</a>
         {% endif %}
     </td>
     <td>
diff --git a/InvenTree/supplier/templates/supplier/partdetail.html b/InvenTree/supplier/templates/supplier/partdetail.html
index fce66f5fea..6531195486 100644
--- a/InvenTree/supplier/templates/supplier/partdetail.html
+++ b/InvenTree/supplier/templates/supplier/partdetail.html
@@ -8,7 +8,7 @@
     <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>Part</td>
+        <td>Parent Part</td>
         <td>
     {% if part.part %}
         <a href="{% url 'part-suppliers' part.part.id %}">{{ part.part.name }}</a>