diff --git a/templates/macros.html b/templates/macros.html
new file mode 100644
index 0000000..4cbd05c
--- /dev/null
+++ b/templates/macros.html
@@ -0,0 +1,30 @@
+{% macro print_tool(program) %}
+	<div class="program">
+		{% if program.extra.linkto and program.extra.directlink %}
+			<a href="{{ program.extra.linkto }}">
+		{% else %}
+			<a href="{{ program.permalink }}">
+		{% endif %}
+			<h4>{{ program.title }}</h4>
+		{% if program.extra.logo %}
+			<img src="/software/{{ program.extra.logo }}" alt="{{ program.title }}">
+		{% endif %}
+			</a>
+		<p>{{ program.description | safe }}</p>
+		{% if program.extra.positive_short and program.extra.negative_short %}
+			<div class="stats">
+				<ul class="positive">
+					{% for item in program.extra.positive_short %}
+						<li>{{ item }}</li>
+					{% endfor %}
+				</ul>
+				<ul class="negative">
+					{% for item in program.extra.negative_short %}
+						<li>{{ item }}</li>
+					{% endfor %}
+				</ul>
+			</div>
+		{% endif %}
+	</div>
+{% endmacro print_tool %}
+
diff --git a/templates/page.html b/templates/page.html
index bdbe675..43ee733 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,4 +1,5 @@
 {% extends "index.html" %}
+{% import "macros.html" as macros %}
 
 {% block content %}
 	<section class="meta">
@@ -19,33 +20,16 @@
 			<section class="software">
 			{% for program in section.pages %}
 				{% if program.taxonomies.categories and program.taxonomies.categories is containing(page.slug) %}
-					<div class="program">
-						{% if program.extra.linkto and program.extra.directlink %}
-							<a href="{{ program.extra.linkto }}">
-						{% else %}
-							<a href="{{ program.permalink }}">
-						{% endif %}
-							<h4>{{ program.title }}</h4>
-						{% if program.extra.logo %}
-							<img src="/software/{{ program.extra.logo }}" alt="{{ program.title }}">
-						{% endif %}
-							</a>
-						<p>{{ program.description | safe }}</p>
-						{% if program.extra.positive_short and program.extra.negative_short %}
-							<div class="stats">
-								<ul class="positive">
-									{% for item in program.extra.positive_short %}
-										<li>{{ item }}</li>
-									{% endfor %}
-								</ul>
-								<ul class="negative">
-									{% for item in program.extra.negative_short %}
-										<li>{{ item }}</li>
-									{% endfor %}
-								</ul>
-							</div>
-						{% endif %}
-					</div>
+					{% if program.extra.positive_short and program.extra.negative_short %}
+						{{ macros::print_tool(program=program) }}
+					{% endif %}
+				{% endif %}
+			{% endfor %}
+			{% for program in section.pages %}
+				{% if program.taxonomies.categories and program.taxonomies.categories is containing(page.slug) %}
+					{% if not program.extra.positive_short or not program.extra.negative_short %}
+						{{ macros::print_tool(program=program) }}
+					{% endif %}
 				{% endif %}
 			{% endfor %}
 			</section>