diff --git a/inventory/models/item.py b/inventory/models/item.py
index 22dc74b..f96f574 100644
--- a/inventory/models/item.py
+++ b/inventory/models/item.py
@@ -28,4 +28,4 @@ class Item(CanBeContained):
 
     @property
     def all_tags(self):
-        return self.tags.all() + self.form_factor.tags.all()
+        return list(self.tags.all()) + list(self.form_factor.tags.all())
diff --git a/inventory/templates/inventory/item_detail.html b/inventory/templates/inventory/item_detail.html
index 2e733c3..6489b4a 100644
--- a/inventory/templates/inventory/item_detail.html
+++ b/inventory/templates/inventory/item_detail.html
@@ -22,9 +22,42 @@
     <table class="attribute-list">
         <tbody>
             <tr>
-                <th>Description</th>
-                <td>{{ item }}</td>
+                <th>Name</th>
+                <td>{{ item.name }}</td>
             </tr>
+            <tr>
+                <th>Description</th>
+                <td>{{ item.description }}</td>
+            </tr>
+            <tr>
+                <th>Tags</th>
+                <td>
+                    <ul class="tag-list">
+                        {% for tag in item.all_tags %}
+                            <li><a href="{% url 'tag-detail' tag.id %}" title="{{ tag.name }}">{{ tag.name }}</a></li>
+                        {% empty %}
+                            No tags
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+
+        {% if item.form_factor %}
+            <tr>
+                <th>Form factor</th>
+                <td>
+                    {% if item.form_factor.datasheet %}
+                        <a href="{% url 'distributor-detail' item.distributor.id %}">
+                            {% if item.form_factor.icon %}<img src="{{ item.form_factor.icon.url }}" class="icon">{% endif %}
+                            {{ item.form_factor.name }}
+                        </a>
+                    {% else %}
+                        {% if item.form_factor.icon %}<img src="{{ item.form_factor.icon.url }}" class="icon">{% endif %}
+                        {{ item.form_factor.name }}
+                    {% endif %}
+                </td>
+            </tr>
+        {% endif %}
 
         {% if item.manufacturer %}
             <tr>
@@ -48,23 +81,6 @@
             </tr>
         {% endif %}
 
-        {% if item.form_factor %}
-            <tr>
-                <th>Form factor</th>
-                <td>
-                    {% if item.form_factor.datasheet %}
-                        <a href="{% url 'distributor-detail' item.distributor.id %}">
-                            {% if item.form_factor.icon %}<img src="{{ item.form_factor.icon.url }}" class="icon">{% endif %}
-                            {{ item.form_factor.name }}
-                        </a>
-                    {% else %}
-                        {% if item.form_factor.icon %}<img src="{{ item.form_factor.icon.url }}" class="icon">{% endif %}
-                        {{ item.form_factor.name }}
-                    {% endif %}
-                </td>
-            </tr>
-        {% endif %}
-
         {% if item.price %}
             <tr>
                 <th>Price</th>