diff --git a/index-template-2017.html b/index-template-2017.html
index 8f9f8bb..5eeb60e 100644
--- a/index-template-2017.html
+++ b/index-template-2017.html
@@ -66,7 +66,7 @@
 	      </ul>
 	      </p>
 	      <hr/>
-	      <p>JUNE 16th 18.OO-22.00: <a href="https://kinorotterdam.nl/">KINO Cinema</a></p>
+	      <p>JUNE 16th 18.OO-22.00: <i><a href="https://kinorotterdam.nl/">KINO Cinema</a></i></p>
 <ul>
 <li>18.00 - 18.30 KINO GRAND Cafe: welcome drinks </li>
 <li>18.30 - 19.30 Lens-Based Cohort Screening</li>
@@ -124,23 +124,18 @@ Gouvernestraat 129-133<br/>
 
 
 	  <p>The second day of the festival is an evening of public screenings: works by first year students of the lens-based path, followed by films of graduating students.</p>
-	  <p><strong>18.00 - 18.30</strong></p>
-	  <p> Come and join us for drinks in the KINO GRAND Cafe</p>
-	  <p><strong>18.30 - 19.30</strong></p>
-	  <p> Lens-Based Cohort Screening <em>Works &amp; Research In Progress</em></p>
-	  <p><strong>20.00 - 22.00</strong> KINO 4</p>
-	  <p>Graduation Film Screenings</strong> </p>
-
+	  <p><strong>18.00 - 18.30</strong></p><p>Come and join us for drinks in the KINO GRAND Cafe</p>
+	  <p><strong>18.30 - 19.30</strong></p><p>Lens-Based Cohort Screening <em>Works &amp; Research In Progress</em></p>
+	  <p><strong>20.00 - 22.00</strong> KINO 4</p><p>Graduation Film Screenings</p>
+<hr/>
 <p>PZI / WDKA</p>
 <p>Rotterdam University of Applied Sciences</p>
-<p><a href="http://www.pzimediadesign.nl/"><em>www.pzimediadesign.nl</em></a></p>
-
-
 	    <div class="project">
-	    <p ><a href="http://www.pzwart.nl/">Master Media Design & Communication</a></p>
-	    <p ><a href="http://xpub.nl">Experimental Publishing Blog</a></p>
-	    <p ><a href="2015.html">Graduation Projects 2015</a></p>
-	    <p ><a href="2016.html">Graduation Projects 2016</a></p>
+	      <p ><a href="http://www.pzwart.nl/">Piet Zwart Institute</a></p>
+	      <p><a href="http://www.pzimediadesign.nl/">Master Media Design & Communication</a></p>
+	      <p><a href="http://xpub.nl">Experimental Publishing Blog</a></p>
+	      <p><a href="2015.html">Graduation Projects 2015</a></p>
+	      <p><a href="2016.html">Graduation Projects 2016</a></p>
 	    </div>
 	    <hr />
 	  <p>Piet Zwart Institute Master Media Design and Communication<br/>Willem de Kooning Academy<br /> Rotterdam University of Applied Sciences
diff --git a/mmdc_wiki2web.py b/mmdc_wiki2web.py
index ff4a746..3a42dbe 100755
--- a/mmdc_wiki2web.py
+++ b/mmdc_wiki2web.py
@@ -7,6 +7,10 @@ from mmdc_modules import pandoc2html, parse_work, write_html_file, mw_cats, mw_p
 from argparse import ArgumentParser
 from random import shuffle
 
+### TO DO ######
+# * For different user categories serve different templates
+#########
+
 #####
 # Args
 ####