diff --git a/source/_partials/availability.html.twig b/source/_partials/availability.html.twig
index 5373aa98..bd839f18 100644
--- a/source/_partials/availability.html.twig
+++ b/source/_partials/availability.html.twig
@@ -1,26 +1,11 @@
 <div class="availability panel panel-default">
-    <div class="panel-heading">Availability</div>
+    <div class="panel-heading">
+        Availability
+    </div>
 
     <div class="panel-body">
         {% for key, availability in site.availability %}
-            <p>
-                {% if availability == 'yes' %}
-                    <i class="fa fa-thumbs-o-up text-success"></i>
-
-                    {{ key == 'full' ? 'Currently have available full-time capacity' }}
-                    {{ key == 'part' ? 'Currently have available part-time capacity' }}
-                {% elseif availability == 'limited' %}
-                    <i class="fa fa-thumbs-o-up text-warning"></i>
-
-                    {{ key == 'full' ? 'Currently have limited full-time capacity' }}
-                    {{ key == 'part' ? 'Currently have limited part-time capacity' }}
-                {% else %}
-                    <i class="fa fa-thumbs-o-down text-danger"></i>
-
-                    {{ key == 'full' ? 'Currently no spare full-time capacity.' }}
-                    {{ key == 'part' ? 'Currently no spare part-time capacity.' }}
-                {% endif %}
-            </p>
+            {% include 'availability/' ~ availability with { value: key } %}
         {% endfor %}
     </div>
 </div>
diff --git a/source/_partials/availability/limited.html.twig b/source/_partials/availability/limited.html.twig
new file mode 100644
index 00000000..9fbaaab1
--- /dev/null
+++ b/source/_partials/availability/limited.html.twig
@@ -0,0 +1,7 @@
+<p>
+    <i class="fa fa-thumbs-o-up text-warning"></i>
+
+    {{ value == 'full' ? 'Currently have limited full-time capacity' }}
+
+    {{ value == 'part' ? 'Currently have limited part-time capacity' }}
+</p>
diff --git a/source/_partials/availability/no.html.twig b/source/_partials/availability/no.html.twig
new file mode 100644
index 00000000..bf56968b
--- /dev/null
+++ b/source/_partials/availability/no.html.twig
@@ -0,0 +1,7 @@
+<p>
+    <i class="fa fa-thumbs-o-down text-danger"></i>
+
+    {{ value == 'full' ? 'Currently no spare full-time capacity.' }}
+
+    {{ value == 'part' ? 'Currently no spare part-time capacity.' }}
+</p>
diff --git a/source/_partials/availability/yes.html.twig b/source/_partials/availability/yes.html.twig
new file mode 100644
index 00000000..3191624d
--- /dev/null
+++ b/source/_partials/availability/yes.html.twig
@@ -0,0 +1,7 @@
+<p>
+    <i class="fa fa-thumbs-o-up text-success"></i>
+
+    {{ value == 'full' ? 'Currently have available full-time capacity' }}
+
+    {{ value == 'part' ? 'Currently have available part-time capacity' }}
+</p>