diff --git a/templates/frontpage.html b/templates/frontpage.html
index 00fa0c4b..154c610e 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -18,7 +18,7 @@
           </div>
         </div>
         <div class="col-md-4">
-	    {% thumbnail 'img/bornhack-2016/fonsmark' 'FA0_1961.JPG' 'BornHack' %}
+          {% thumbnail 'img/bornhack-2016/fonsmark' 'FA0_1961.JPG' 'BornHack' %}
         </div>
       </div>
 
@@ -26,13 +26,13 @@
 
       <div class="row">
         <div class="col-md-4">
-	    {% thumbnail 'img/bornhack-2016/ahf' 'jarlsgaard.jpg' 'Jarlsgård buildings from above' %}
+          {% thumbnail 'img/bornhack-2016/ahf' 'jarlsgaard.jpg' 'Jarlsgård buildings from above' %}
         </div>
         <div class="col-md-8 text-container">
           <div class="lead">
-            The first Bornhack took place from <strong>August 27 to September 3rd 2016</strong>
-            on the Danish island of <strong>Bornholm</strong>. We are preparing 
-            <strong>BornHack 2017</strong> which will be from <strong>22nd to 27th of August 2017</strong>.
+            We are preparing <strong>BornHack 2017</strong> which will take place from the
+            <strong>22nd to 27th of August 2017</strong>. We are returning to the beautiful
+            nature at Jarlsgaard on the Danish island of <strong>BornHolm</strong>.
           </div>
         </div>
       </div>
@@ -48,7 +48,7 @@
           </p>
         </div>
         <div class="col-md-4">
-	    {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5090.JPG' 'Talk at BornHack 2016' %}
+          {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5090.JPG' 'Talk at BornHack 2016' %}
         </div>
       </div>