diff --git a/inventory/templates/inventory/distributor_detail.html b/inventory/templates/inventory/distributor_detail.html
index 6df6208..5dbd787 100644
--- a/inventory/templates/inventory/distributor_detail.html
+++ b/inventory/templates/inventory/distributor_detail.html
@@ -95,70 +95,9 @@
 
     <h2>Items</h2>
 
-    <div class="pagination" id="paginator_top">
-        {% if items.has_previous %}
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page=1#paginator_top"><img src="{% static 'inventory/img/first.svg' %}" class="icon" title="First page"></a>
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page={{ items.previous_page_number }}#paginator_top"><img src="{% static 'inventory/img/previous.svg' %}" class="icon" title="Previous page"></a>
-        {% endif %}
-        {% if items.paginator.num_pages > 1 %}
-            {{ items.number }}/{{ items.paginator.num_pages }}
-        {% endif %}
-        {% if items.has_next %}
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page={{ items.next_page_number }}#paginator_top"><img src="{% static 'inventory/img/next.svg' %}" class="icon" title="Next page"></a>
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page={{ items.paginator.num_pages}}#paginator_top"><img src="{% static 'inventory/img/last.svg' %}" class="icon" title="Last page"></a>
-        {% endif %}
-    </div>
-    
-    <table class="list">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th></th>
-                <th>Description</th>
-                <th>Container</th>
-                <th>Manufacturer</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for item in items %}
-            <tr>
-                <td><a href="{% url 'item-detail' item.id %}">{{ item.name }}</a></td>
-                <td class="right">
-                    {% if item.documentation.all %}
-                        <a class="datasheet" href="{{ item.documentation.all.0.file.url }}"><img class="icon" src="{% static "inventory/img/datasheet.svg" %}"></a>
-                    {% endif %}
-                    {% if user.is_staff %}
-                        <a class="edit" href="{% url "admin:inventory_item_change" object_id=item.pk %}"><img class="icon" src="{% static "inventory/img/edit.svg" %}"></a>
-                    {% endif %}
-                </td>
-                <td>{{ item.description }}</td>
-                <td><a href="{{ item.container_url }}">{{ item.container.display_name }}</a></td>
-                <td>
-                    {% if item.manufacturer %}
-                    <a href="{% url 'manufacturer-detail' item.manufacturer.id %}">
-                        {% if item.manufacturer.icon %}<img src="{{ item.manufacturer.icon.url }}" class="logo">{% endif %}{{ item.manufacturer.name }}
-                    </a>
-                    {% else %}
-                        -
-                    {% endif %}
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-
-    <div class="pagination" id="paginator_bottom">
-        {% if items.has_previous %}
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page=1#paginator_bottom"><img src="{% static 'inventory/img/first.svg' %}" class="icon" title="First page"></a>
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page={{ items.previous_page_number }}#paginator_bottom"><img src="{% static 'inventory/img/previous.svg' %}" class="icon" title="Previous page"></a>
-        {% endif %}
-        {% if items.paginator.num_pages > 1 %}
-            {{ items.number }}/{{ items.paginator.num_pages }}
-        {% endif %}
-        {% if items.has_next %}
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page={{ items.next_page_number }}#paginator_bottom"><img src="{% static 'inventory/img/next.svg' %}" class="icon" title="Next page"></a>
-            <a href="{% url 'distributor-detail' distributor.id %}?item_page={{ items.paginator.num_pages}}#paginator_bottom"><img src="{% static 'inventory/img/last.svg' %}" class="icon" title="Last page"></a>
-        {% endif %}
-    </div>
+    {% url 'distributor-detail' distributor.id as this_url %}
+    {% include "inventory/pagination.html" with url=this_url id="paginator_top" param="item" paginator=items %}
+    {% include "inventory/item_list.html" with items=items show_manufacturer=1 %}
+    {% include "inventory/pagination.html" with url=this_url id="paginator_top" param="item" paginator=items %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/inventory/templates/inventory/item_list.html b/inventory/templates/inventory/item_list.html
new file mode 100644
index 0000000..694c1b4
--- /dev/null
+++ b/inventory/templates/inventory/item_list.html
@@ -0,0 +1,58 @@
+{% load static %}
+
+<table class="list">
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th></th>
+            <th>Description</th>
+            <th>Container</th>
+            {% if show_manufacturer %}
+            <th>Manufacturer</th>
+            {% endif %}
+            {% if show_distributor %}
+            <th>Distributor</th>
+            {% endif %}
+        </tr>
+    </thead>
+    <tbody>
+        {% for item in items %}
+        <tr>
+            <td><a href="{% url 'item-detail' item.id %}">{{ item.name }}</a></td>
+            <td class="right">
+                {% if item.documentation.all %}
+                    <a class="datasheet" href="{{ item.documentation.all.0.file.url }}"><img class="icon" src="{% static "inventory/img/datasheet.svg" %}"></a>
+                {% endif %}
+                {% if user.is_staff %}
+                    <a class="edit" href="{% url "admin:inventory_item_change" object_id=item.pk %}"><img class="icon" src="{% static "inventory/img/edit.svg" %}"></a>
+                {% endif %}
+            </td>
+            <td>{{ item.description }}</td>
+            <td><a href="{{ item.container_url }}">{{ item.container.display_name }}</a></td>
+            {% if show_manufacturer %}
+            <td>
+                {% if item.manufacturer %}
+                <a href="{% url 'manufacturer-detail' item.manufacturer.id %}">
+                    {% if item.manufacturer.icon %}<img src="{{ item.manufacturer.icon.url }}" class="logo">{% endif %}{{ item.manufacturer.name }}
+                </a>
+                {% else %}
+                    -
+                {% endif %}
+            </td>
+            {% endif %}
+            {% if show_distributor %}
+            <td>
+                {% if item.distributor %}
+                <a href="{% url 'distributor-detail' item.distributor.id %}">
+                    {% if item.distributor.icon %}<img src="{{ item.distributor.icon.url }}" class="icon">{% endif %}{{ item.distributor.name }}
+                </a>
+                {% else %}
+                    -
+                {% endif %}
+            </td>
+            {% endif %}
+
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
diff --git a/inventory/templates/inventory/manufacturer_detail.html b/inventory/templates/inventory/manufacturer_detail.html
index b220af5..c5c675a 100644
--- a/inventory/templates/inventory/manufacturer_detail.html
+++ b/inventory/templates/inventory/manufacturer_detail.html
@@ -62,70 +62,9 @@
 
     <h2>Items</h2>
 
-    <div class="pagination" id="paginator_top">
-        {% if items.has_previous %}
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page=1#paginator_top"><img src="{% static 'inventory/img/first.svg' %}" class="icon" title="First page"></a>
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page={{ items.previous_page_number }}#paginator_top"><img src="{% static 'inventory/img/previous.svg' %}" class="icon" title="Previous page"></a>
-        {% endif %}
-        {% if items.paginator.num_pages > 1 %}
-            {{ items.number }}/{{ items.paginator.num_pages }}
-        {% endif %}
-        {% if items.has_next %}
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page={{ items.next_page_number }}#paginator_top"><img src="{% static 'inventory/img/next.svg' %}" class="icon" title="Next page"></a>
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page={{ items.paginator.num_pages}}#paginator_top"><img src="{% static 'inventory/img/last.svg' %}" class="icon" title="Last page"></a>
-        {% endif %}
-    </div>
-    
-    <table class="list">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th></th>
-                <th>Description</th>
-                <th>Container</th>
-                <th>Distributor</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for item in items %}
-            <tr>
-                <td><a href="{% url 'item-detail' item.id %}">{{ item.name }}</a></td>
-                <td class="right">
-                    {% if item.documentation.all %}
-                        <a class="datasheet" href="{{ item.documentation.all.0.file.url }}"><img class="icon" src="{% static "inventory/img/datasheet.svg" %}"></a>
-                    {% endif %}
-                    {% if user.is_staff %}
-                        <a class="edit" href="{% url "admin:inventory_item_change" object_id=item.pk %}"><img class="icon" src="{% static "inventory/img/edit.svg" %}"></a>
-                    {% endif %}
-                </td>
-                <td>{{ item.description }}</td>
-                <td><a href="{{ item.container_url }}">{{ item.container.display_name }}</a></td>
-                <td>
-                    {% if item.distributor %}
-                    <a href="{% url 'distributor-detail' item.distributor.id %}">
-                        {% if item.distributor.icon %}<img src="{{ item.distributor.icon.url }}" class="icon">{% endif %}{{ item.distributor.name }}
-                    </a>
-                    {% else %}
-                        -
-                    {% endif %}
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-
-    <div class="pagination" id="paginator_bottom">
-        {% if items.has_previous %}
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page=1#paginator_bottom"><img src="{% static 'inventory/img/first.svg' %}" class="icon" title="First page"></a>
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page={{ items.previous_page_number }}#paginator_bottom"><img src="{% static 'inventory/img/previous.svg' %}" class="icon" title="Previous page"></a>
-        {% endif %}
-        {% if items.paginator.num_pages > 1 %}
-            {{ items.number }}/{{ items.paginator.num_pages }}
-        {% endif %}
-        {% if items.has_next %}
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page={{ items.next_page_number }}#paginator_bottom"><img src="{% static 'inventory/img/next.svg' %}" class="icon" title="Next page"></a>
-            <a href="{% url 'manufacturer-detail' manufacturer.id %}?item_page={{ items.paginator.num_pages}}#paginator_bottom"><img src="{% static 'inventory/img/last.svg' %}" class="icon" title="Last page"></a>
-        {% endif %}
-    </div>
+    {% url 'manufacturer-detail' manufacturer.id as this_url %}
+    {% include "inventory/pagination.html" with url=this_url id="paginator_top" param="item" paginator=items %}
+    {% include "inventory/item_list.html" with items=items show_distributor=1 %}
+    {% include "inventory/pagination.html" with url=this_url id="paginator_bottom" param="item" paginator=items %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/inventory/templates/inventory/pagination.html b/inventory/templates/inventory/pagination.html
new file mode 100644
index 0000000..bd8a29e
--- /dev/null
+++ b/inventory/templates/inventory/pagination.html
@@ -0,0 +1,15 @@
+{% load static %}
+
+<div class="pagination" id="paginator_top">
+    {% if paginator.has_previous %}
+        <a href="{{ url }}?{{ param }}_page=1#{{ id }}"><img src="{% static 'inventory/img/first.svg' %}" class="icon" title="First page"></a>
+        <a href="{{ url }}?{{ param }}_page={{ paginator.previous_page_number }}#{{ id }}"><img src="{% static 'inventory/img/previous.svg' %}" class="icon" title="Previous page"></a>
+    {% endif %}
+    {% if paginator.paginator.num_pages > 1 %}
+        {{ paginator.number }}/{{ paginator.paginator.num_pages }}
+    {% endif %}
+    {% if paginator.has_next %}
+        <a href="{{ url }}?{{ param }}_page={{ paginator.next_page_number }}#{{ id }}"><img src="{% static 'inventory/img/next.svg' %}" class="icon" title="Next page"></a>
+        <a href="{{ url }}?{{ param }}_page={{ paginator.paginator.num_pages}}#{{ id }}"><img src="{% static 'inventory/img/last.svg' %}" class="icon" title="Last page"></a>
+    {% endif %}
+</div>