diff --git a/src/main/resources/templates/home.mustache b/src/main/resources/templates/home.mustache
index 6f401d18..5d5d9401 100644
--- a/src/main/resources/templates/home.mustache
+++ b/src/main/resources/templates/home.mustache
@@ -17,58 +17,72 @@
 
     <h2 class="hide">{{#i18n}}home.topics.title{{/i18n}}</h2>
 
-    <div class="row align-middle">
-      <div class="columns medium-push-9">
-          <a href="{{localePrefix}}/2017/makers"><img src="/images/svg/mxt-icon--makers.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.makers.title{{/i18n}}"></a>
-      </div>
-      <div class="columns small-9 medium-pull-3">
-        <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.makers.title{{/i18n}}<br><small>{{#i18n}}home.topics.makers.description{{/i18n}}</small></h3>
+    <a href="{{localePrefix}}/2017/makers">
+      <div class="row align-middle">
+        <div class="columns medium-push-9">
+            <img src="/images/svg/mxt-icon--makers.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.makers.title{{/i18n}}">
+        </div>
+        <div class="columns small-9 medium-pull-3">
+          <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.makers.title{{/i18n}}<br><small>{{#i18n}}home.topics.makers.description{{/i18n}}</small></h3>
+        </div>
       </div>
-    </div>
+    </a>
 
-    <div class="row align-middle">
-      <div class="columns medium-push-9">
-          <a href="{{localePrefix}}/2017/aliens"> <img src="/images/svg/mxt-icon--aliens.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.aliens.title{{/i18n}}"></a>
+    <a href="{{localePrefix}}/2017/aliens">
+      <div class="row align-middle">
+        <div class="columns medium-push-9">
+            <img src="/images/svg/mxt-icon--aliens.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.aliens.title{{/i18n}}">
+        </div>
+          <div class="columns small-9 medium-pull-3">
+          <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.aliens.title{{/i18n}}<br><small>{{#i18n}}home.topics.aliens.description{{/i18n}}</small></h3>
+        </div>
       </div>
+    </a>
+
+    <a href="{{localePrefix}}/2017/tech">
+      <div class="row align-middle">
+        <div class="columns medium-push-9">
+            <img src="/images/svg/mxt-icon--tech.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.tech.title{{/i18n}}">
+        </div>
         <div class="columns small-9 medium-pull-3">
-        <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.aliens.title{{/i18n}}<br><small>{{#i18n}}home.topics.aliens.description{{/i18n}}</small></h3>
+          <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.tech.title{{/i18n}}<br><small>{{#i18n}}home.topics.tech.description{{/i18n}}</small></h3>
+        </div>
       </div>
-    </div>
+    </a>
 
-    <div class="row align-middle">
-      <div class="columns medium-push-9">
-          <a href="{{localePrefix}}/2017/tech"><img src="/images/svg/mxt-icon--tech.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.tech.title{{/i18n}}"></a>
-      </div>
-      <div class="columns small-9 medium-pull-3">
-        <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.tech.title{{/i18n}}<br><small>{{#i18n}}home.topics.tech.description{{/i18n}}</small></h3>
+    <a href="{{localePrefix}}/2017/design">
+      <div class="row align-middle">
+       <div class="columns medium-push-9">
+           <img src="/images/svg/mxt-icon--design.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.design.title{{/i18n}}">
+        </div>
+        <div class="columns small-9 medium-pull-3">
+          <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.design.title{{/i18n}}<br><small>{{#i18n}}home.topics.design.description{{/i18n}}</small></h3>
+        </div>
       </div>
-    </div>
+    </a>
 
-    <div class="row align-middle">
-     <div class="columns medium-push-9">
-         <a href="{{localePrefix}}/2017/design"><img src="/images/svg/mxt-icon--design.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.design.title{{/i18n}}"></a>
-      </div>
-      <div class="columns small-9 medium-pull-3">
-        <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.design.title{{/i18n}}<br><small>{{#i18n}}home.topics.design.description{{/i18n}}</small></h3>
+    <a href="{{localePrefix}}/2017/hacktivism">
+      <div class="row align-middle">
+        <div class="columns medium-push-9">
+            <img src="/images/svg/mxt-icon--hacktivism.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.hacktivism.title{{/i18n}}">
+        </div>
+        <div class="columns small-9 medium-pull-3">
+          <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.hacktivism.title{{/i18n}}<br><small>{{#i18n}}home.topics.hacktivism.description{{/i18n}}</small></h3>
+        </div>
       </div>
-    </div>
+    </a>
 
-    <div class="row align-middle">
-      <div class="columns medium-push-9">
-          <a href="{{localePrefix}}/2017/hacktivism"><img src="/images/svg/mxt-icon--hacktivism.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.hacktivism.title{{/i18n}}"></a>
-      </div>
-      <div class="columns small-9 medium-pull-3">
-        <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.hacktivism.title{{/i18n}}<br><small>{{#i18n}}home.topics.hacktivism.description{{/i18n}}</small></h3>
-      </div>
-    </div>
-    <div class="row align-middle">
-      <div class="columns medium-push-9">
-         <a href="{{localePrefix}}/2017/learn"><img src="/images/svg/mxt-icon--learn.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.learn.title{{/i18n}}"></a>
-      </div>
-      <div class="columns small-9 medium-pull-3">
-          <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.learn.title{{/i18n}}<br><small>{{#i18n}}home.topics.learn.description{{/i18n}}</small></h3>
+    <a href="{{localePrefix}}/2017/learn">
+      <div class="row align-middle">
+        <div class="columns medium-push-9">
+           <img src="/images/svg/mxt-icon--learn.svg" class="mxt-icon--cat" alt="{{#i18n}}home.topics.learn.title{{/i18n}}">
+        </div>
+        <div class="columns small-9 medium-pull-3">
+            <h3 class="subheader mxt-subheader--categories">{{#i18n}}home.topics.learn.title{{/i18n}}<br><small>{{#i18n}}home.topics.learn.description{{/i18n}}</small></h3>
+        </div>
       </div>
-    </div>
+    </a>
+
   </div>
 
   <div class="medium-5 columns">