diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py
index e069df6ed6..4b91d3bc22 100644
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -93,6 +93,7 @@ class EditPartForm(HelperForm):
             'name',
             'IPN',
             'variant',
+            'is_template',
             'description',
             'keywords',
             'URL',
diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py
index 445a10601a..540f754765 100644
--- a/InvenTree/part/serializers.py
+++ b/InvenTree/part/serializers.py
@@ -85,6 +85,8 @@ class PartSerializer(serializers.ModelSerializer):
             'full_name',
             'name',
             'IPN',
+            'is_template',
+            'variant_of',
             'variant',
             'description',
             'keywords',
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 748303df35..f91c5ac1e2 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -47,10 +47,12 @@
                 <button type='button' class='btn btn-default btn-glyph' id='toggle-starred' title='Star this part'>
                     <span id='part-star-icon' class='starred-part glyphicon {% if starred %}glyphicon-star{% else %}glyphicon-star-empty{% endif %}'/>
                 </button>
+                {% if part.is_template == False %}
                 {% include "qr_button.html" %}
                 <button type='button' class='btn btn-default btn-glyph' id='price-button' title='Show pricing information'>
                     <span id='part-price-icon' class='part-price glyphicon glyphicon-usd'/>
                 </button>
+                {% endif %}
             </div>
         </p>
         <table class='table table-condensed'>
diff --git a/InvenTree/static/script/inventree/part.js b/InvenTree/static/script/inventree/part.js
index 51d86f1c7a..1001ef11a1 100644
--- a/InvenTree/static/script/inventree/part.js
+++ b/InvenTree/static/script/inventree/part.js
@@ -124,7 +124,12 @@ function loadPartTable(table, url, options={}) {
                 sortable: true,
                 formatter: function(value, row, index, field) {
 
+                    if (row.is_template) {
+                        value = '<i>' + value + '</i>';
+                    }
+
                     var display = imageHoverIcon(row.image_url) + renderLink(value, row.url);
+                    
                     if (!row.active) {
                         display = display + "<span class='label label-warning' style='float: right;'>INACTIVE</span>";
                     }
@@ -135,6 +140,14 @@ function loadPartTable(table, url, options={}) {
                 sortable: true,
                 field: 'description',
                 title: 'Description',
+                formatter: function(value, row, index, field) {
+
+                    if (row.is_template) {
+                        value = '<i>' + value + '</i>';
+                    }
+
+                    return value;
+                }
             },
             {
                 sortable: true,