diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html
index 04041dd7b4..b6339c23c7 100644
--- a/InvenTree/part/templates/part/attachments.html
+++ b/InvenTree/part/templates/part/attachments.html
@@ -11,6 +11,16 @@
 </div>
 
 <table class='table table-striped table-condensed' data-toolbar='#toolbar' id='attachment-table'>
+<tr>
+    <th>File</th>
+    <th>Comment</th>
+</tr>
+{% for attachment in part.attachments.all %}
+<tr>
+    <td><a href='/media/{{ attachment.attachment }}'>{{ attachment.basename }}</a></td>
+    <td>{{ attachment.comment }}</td>
+</tr>
+{% endfor %}
 </table>
 
 {% endblock %}
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 79be275307..a1b4ddc2d1 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -66,13 +66,6 @@
         </tr>
         {% endif %}
     </table>
-
-    <h4>Attachments</h4>
-    <ul>
-    {% for attachment in part.attachments.all %}
-    <li><a href="/media/{{ attachment.attachment }}">{{ attachment.basename }}</a></li>
-    {% endfor %}
-    </ul>
 </div>
 </div>
 
diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html
index 5aee846ebd..2bcf894b2a 100644
--- a/InvenTree/part/templates/part/tabs.html
+++ b/InvenTree/part/templates/part/tabs.html
@@ -1,6 +1,15 @@
 <ul class="nav nav-tabs">
     <li{% ifequal tab 'detail' %} class="active"{% endifequal %}>
-        <a href="{% url 'part-detail' part.id %}">Details</a></li>
+        <a href="{% url 'part-detail' part.id %}">Details</a>
+    </li>
+    <li{% ifequal tab 'stock' %} class="active"{% endifequal %}>
+        <a href="{% url 'part-stock' part.id %}">Stock <span class="badge">{{ part.total_stock }}</span></a>
+    </li>
+    {% if part.allocation_count > 0 %}
+    <li{% ifequal tab 'allocation' %} class="active"{% endifequal %}>
+        <a href="{% url 'part-allocation' part.id %}">Allocated <span class="badge">{{ part.allocation_count }}</span></a>
+    </li>
+    {% endif %}
     {% if part.buildable %}
     <li{% ifequal tab 'bom' %} class="active"{% endifequal %}>
         <a href="{% url 'part-bom' part.id %}">BOM<span class="badge">{{ part.bom_count }}</span></a></li>
@@ -11,12 +20,6 @@
     <li{% ifequal tab 'used' %} class="active"{% endifequal %}>
         <a href="{% url 'part-used-in' part.id %}">Used In{% if part.used_in_count > 0 %}<span class="badge">{{ part.used_in_count }}</span>{% endif %}</a></li>
     {% endif %}
-    <li{% ifequal tab 'stock' %} class="active"{% endifequal %}>
-        <a href="{% url 'part-stock' part.id %}">Stock <span class="badge">{{ part.total_stock }}</span></a></li>
-    {% if part.allocation_count > 0 %}
-    <li{% ifequal tab 'allocation' %} class="active"{% endifequal %}>
-        <a href="{% url 'part-allocation' part.id %}">Allocated <span class="badge">{{ part.allocation_count }}</span></a></li>
-    {% endif %}
     {% if part.purchaseable %}
     <li{% ifequal tab 'suppliers' %} class="active"{% endifequal %}>
         <a href="{% url 'part-suppliers' part.id %}">Suppliers