diff --git a/InvenTree/part/templates/part/stock.html b/InvenTree/part/templates/part/stock.html
index 3b2bdec166..e9c22bf1d9 100644
--- a/InvenTree/part/templates/part/stock.html
+++ b/InvenTree/part/templates/part/stock.html
@@ -13,6 +13,12 @@
 </div>
 <hr>
 
+{% if part.is_template %}
+<div class='alert alert-info alert-block'>
+    Showing stock for all variants of <i>{{ part.full_name }}</i>
+</div>
+{% endif %}
+
 {% include "stock_table.html" %}
 
 {% endblock %}
diff --git a/InvenTree/part/templates/part/variants.html b/InvenTree/part/templates/part/variants.html
index 1afcda25d3..0cf9735364 100644
--- a/InvenTree/part/templates/part/variants.html
+++ b/InvenTree/part/templates/part/variants.html
@@ -39,7 +39,8 @@
                         <img class='hover-img-large' src="{{ variant.image.url }}">
                         {% endif %}
                     </div>
-                {{ variant.full_name }}</td>
+                <a href="{% url 'part-detail' variant.id %}">{{ variant.full_name }}</a>
+            </td>
             <td>{{ variant.description }}</td>
             <td>{{ variant.total_stock }}</td>
         </tr>
diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html
index f5411fabb8..fae7b04214 100644
--- a/InvenTree/templates/stock_table.html
+++ b/InvenTree/templates/stock_table.html
@@ -1,6 +1,8 @@
 <div id='button-toolbar'>
     <div class='button-toolbar container-fluid' style='float: right;'>
+        {% if part.is_template == False %}
         <button class="btn btn-success" id='item-create'>New Stock Item</button>
+        {% endif %}
         <div class="dropdown" style='float: right;'>
             <button id='stock-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options<span class="caret"></span></button>
             <ul class="dropdown-menu">