diff --git a/data.json b/data.json
index b9556d3..a989ecf 100644
--- a/data.json
+++ b/data.json
@@ -42,7 +42,7 @@
             "saturday": "8u30 - 22u",
             "sunday": "8u30 - 22u"
         },
-        "extra": "Enkel weekend en feestdagen. Registratie noodzakelijk: ieder zondag om 19u student.ugent.be",
+        "extra": "Enkel weekend, kerstverlof en feestdagen,Registratie noodzakelijk! Registreer <a href=\"http://student.UGent.be/blok/\">hier</a>. Vanaf 9u kunnen studenten zonder registratie toegang krijgen.",
         "type": "UGent"
     }
 },
@@ -90,7 +90,7 @@
             "saturday": "8u30 - 22u",
             "sunday": "8u30 - 22u"
         },
-        "extra": "Registratie noodzakelijk! Registreer via http://student.UGent.be/blok/ . Vanaf 9u kunnen studenten zonder registratie toegang krijgen.",
+        "extra": "Registratie noodzakelijk! Registreer <a href=\"http://student.UGent.be/blok/\">hier</a>. Vanaf 9u kunnen studenten zonder registratie toegang krijgen.",
         "type": "UGent"
     }
 },
@@ -114,7 +114,7 @@
             "saturday": "8u30 - 22u",
             "sunday": "8u30 - 22u"
         },
-        "extra": "Registratie noodzakelijk! Registreer via http://student.UGent.be/blok/ . Vanaf 9u kunnen studenten zonder registratie toegang krijgen. Sluitingsdagen: 25/12, 01/01, 3/01, 4/01, 5/01,6/01, 13/01 en 20/01.<br/>24/12 en 31/12: 8u-16u",
+        "extra": "Registratie noodzakelijk! Registreer <a href=\"http://student.UGent.be/blok/\">hier</a>. Vanaf 9u kunnen studenten zonder registratie toegang krijgen. Sluitingsdagen: 25/12, 01/01, 3/01, 4/01, 5/01,6/01, 13/01 en 20/01.<br/>24/12 en 31/12: 8u-16u",
         "type": "UGent"
     }
 },
@@ -204,7 +204,7 @@
         "hours": {
             "monday": "9u - 17u",
             "tuesday": "9u - 18u",
-            "wednesday": "9u - 11u30 en 12u45 - 16u45",
+            "wednesday": "9u - 11u30 <br> 12u45 - 16u45",
             "thursday": "9u - 18u",
             "friday": "9u - 17u",
             "saturday": false,
@@ -250,11 +250,11 @@
         "capacity": 15,
         "period": { "start": "05/01/2014", "end": "30/01/2015" },
         "hours": {
-            "monday": "10u - 12u30 en 13u - 16u15",
-            "tuesday": "10u - 12u30 en 13u - 16u15",
-            "wednesday": "10u - 12u30 en 13u - 16u15",
+            "monday": "10u - 12u30<br />13u - 16u15",
+            "tuesday": "10u - 12u30<br />13u - 16u15",
+            "wednesday": "10u - 12u30<br />13u - 16u15",
             "thursday": "10u - 12u",
-            "friday": "10u - 12u30 en 13u - 16u15",
+            "friday": "10u - 12u30<br />13u - 16u15",
             "saturday": false,
             "sunday": false
         },
@@ -274,11 +274,11 @@
         "capacity": 50,
         "period": { "start": "05/01/2014", "end": "30/01/2015" },
         "hours": {
-            "monday": "9u - 12u30 en 13u - 17u",
-            "tuesday": "8u30u - 12u30 en 13u - 17u",
-            "wednesday": "9u - 12u30 en 13u - 17u",
-            "thursday": "8u - 12u en 12u30 - 17u",
-            "friday": "8u - 12u en 12u30 - 17u",
+            "monday": "9u - 12u30<br />13u - 17u",
+            "tuesday": "8u30u - 12u30<br />13u - 17u",
+            "wednesday": "9u - 12u30<br />13u - 17u",
+            "thursday": "8u - 12u<br />12u30 - 17u",
+            "friday": "8u - 12u<br />12u30 - 17u",
             "saturday": false,
             "sunday": false
         },
diff --git a/map.css b/map.css
index 792be72..88915c5 100644
--- a/map.css
+++ b/map.css
@@ -59,6 +59,7 @@ table {
 .desktop tr td {
     padding-right: 5px;
     width: 75;
+    vertical-align: top;
 }
 
 .mobile tr td:first-child {
diff --git a/map.html b/map.html
index e120836..90d0757 100644
--- a/map.html
+++ b/map.html
@@ -7,7 +7,7 @@
   <meta name="google-play-app" content="app-id=be.ugent.zeus.hydra">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
-  <meta property="og:site_name" content="zeus.ugent.be">
+  <meta property="og:site_name" content="Zeus WPI">
   <meta property="og:type" content="article">
   <meta property="og:title" content="Bloklocaties in Gent">
   <meta property="og:description" content="Deze kaart biedt Gentse studenten een handige opsomming van de verschillende bloklocaties in hun studentenstad">
@@ -15,7 +15,7 @@
   <meta property="og:image" content="http://www.schamper.ugent.be/files/imagecache/preview/images/IMG_8763.jpg">
 
   <meta name="twitter:card" content="summary">
-  <meta name="twitter:url" content="http://zeus.ugent.be/blokl/">
+  <meta name="twitter:url" content="http://zeus.ugent.be/blok/">
   <meta name="twitter:title" content="Bloklocaties in Gent">
   <meta name="twitter:description" content="Deze kaart biedt Gentse studenten een handige opsomming van de verschillende bloklocaties in hun studentenstad">
   <meta name="twitter:image" content="http://www.schamper.ugent.be/files/imagecache/preview/images/IMG_8763.jpg">
@@ -50,45 +50,45 @@
         <td>Zondag</td>
       </tr>
       <tr>
-        <td>{{#if hours.monday}}{{hours.monday}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.tuesday}}{{hours.tuesday}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.wednesday}}{{hours.wednesday}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.thursday}}{{hours.thursday}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.friday}}{{hours.friday}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.saturday}}{{hours.saturday}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.sunday}}{{hours.sunday}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.monday}}{{{hours.monday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.tuesday}}{{{hours.tuesday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.wednesday}}{{{hours.wednesday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.thursday}}{{{hours.thursday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.friday}}{{{hours.friday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.saturday}}{{{hours.saturday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.sunday}}{{{hours.sunday}}}{{else}}Gesloten{{/if}}</td>
       </tr>
       </table>
       <table class="mobile">
         <tr>
           <td>Maandag</td>
-          <td>{{#if hours.monday}}{{hours.monday}}{{else}}Gesloten{{/if}}</td>
+          <td>{{#if hours.monday}}{{{hours.monday}}}{{else}}Gesloten{{/if}}</td>
         </tr>
         <tr>
             <td>Dinsdag</td>
-            <td>{{#if hours.tuesday}}{{hours.tuesday}}{{else}}Gesloten{{/if}}</td>
+            <td>{{#if hours.tuesday}}{{{hours.tuesday}}}{{else}}Gesloten{{/if}}</td>
         </tr>
         <tr>
             <td>Woensdag</td>
-            <td>{{#if hours.wednesday}}{{hours.wednesday}}{{else}}Gesloten{{/if}}</td>
+            <td>{{#if hours.wednesday}}{{{hours.wednesday}}}{{else}}Gesloten{{/if}}</td>
         </tr>
         <tr>
             <td>Donderdag</td>
-            <td>{{#if hours.thursday}}{{hours.thursday}}{{else}}Gesloten{{/if}}</td>
+            <td>{{#if hours.thursday}}{{{hours.thursday}}}{{else}}Gesloten{{/if}}</td>
         </tr><tr>
             <td>Vrijdag</td>
-            <td>{{#if hours.friday}}{{hours.friday}}{{else}}Gesloten{{/if}}</td>
+            <td>{{#if hours.friday}}{{{hours.friday}}}{{else}}Gesloten{{/if}}</td>
         </tr>
         <tr>
             <td>Zaterdag</td>
-            <td>{{#if hours.saturday}}{{hours.saturday}}{{else}}Gesloten{{/if}}</td>
+            <td>{{#if hours.saturday}}{{{hours.saturday}}}{{else}}Gesloten{{/if}}</td>
         </tr>
         <tr>
             <td>Zondag</td>
-            <td>{{#if hours.sunday}}{{hours.sunday}}{{else}}Gesloten{{/if}}</td>
+            <td>{{#if hours.sunday}}{{{hours.sunday}}}{{else}}Gesloten{{/if}}</td>
         </tr>
       </table>
-      {{#if extra}}{{extra}}{{/if}}
+      {{#if extra}}{{{extra}}}{{/if}}
     </div>
   </script>
   <script id="info-template" type="text/x-handlebars-template">