diff --git a/src/app/level2/Level2.php b/src/app/level2/Level2.php
index e9e925b..dfea952 100644
--- a/src/app/level2/Level2.php
+++ b/src/app/level2/Level2.php
@@ -42,34 +42,59 @@
         $event[ 'name'        ] = $googleEvent[ 'summary' ];
 
         if ( array_key_exists( 'dateTime' , $googleEvent[ 'start' ] ) ){
-          $event[ 'start' ][ 'datetime' ] = strtotime( $googleEvent[ 'start' ][ 'dateTime' ] );
-        } else {
-          $event[ 'start' ][ 'date'     ] = strtotime( $googleEvent[ 'start' ][ 'date' ] );
-        }
+          $event[ 'start' ] = strtotime( $googleEvent[ 'start' ][ 'dateTime' ] );
+          $event[ 'end'   ] = strtotime( $googleEvent[ 'end'   ][ 'dateTime' ] );
+
+          $event[ 'date'  ] = date( 'l, j. M G:i', $event[ 'start' ] );
 
-        if ( array_key_exists( 'dateTime' , $googleEvent[ 'end' ] ) ){
-          $event[ 'end' ][ 'datetime' ] = strtotime( $googleEvent[ 'end' ][ 'dateTime' ] );
         } else {
-          $event[ 'end' ][ 'date'     ] = strtotime( $googleEvent[ 'end' ][ 'date' ] );
+          $event[ 'start' ] = strtotime( $googleEvent[ 'start' ][ 'date' ] );
+          $event[ 'end'   ] = strtotime( $googleEvent[ 'end'   ][ 'date' ] );
+
+          $event[ 'date'  ] = date( 'l, j. M', $event[ 'start' ] );
+
         }
 
         if ( array_key_exists( 'location' , $googleEvent ) ){
           $event[ 'location'    ] = $googleEvent[ 'location' ];
         }
 
-        unset( $url );
-
         if ( array_key_exists( 'description' , $googleEvent ) ){
+
           $event[ 'description' ] = $googleEvent[ 'description' ];
-        }
 
-        $urlMatch = '/\b(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)[-A-Z0-9+&@#\/%=~_|$\(\)?!:,.]*[A-Z0-9+&@#\/%=~_|$]/i';
-        preg_match_all( $urlMatch, $event[ 'description' ], $url, PREG_PATTERN_ORDER );
+          unset( $image );
 
-        $event[ 'description' ] = preg_replace( $urlMatch, '', $event[ 'description' ] );
+          $imageMatch = '/https?:\/\/[^ ]+?(?:\.jpg|\.png|\.gif)/i';
+          preg_match_all( $imageMatch, $event[ 'description' ], $image, PREG_PATTERN_ORDER );
+
+          $event[ 'description' ] = preg_replace(
+            $imageMatch,
+            '',
+            $event[ 'description' ]
+          );
+
+          if ( is_array( $image ) ) {
+            $event[ 'image' ] = $image[ 0 ];
+          }
+
+          $event[ 'description' ] = nl2br( $event[ 'description' ] );
+
+          unset( $url );
+
+          $urlMatch = '/\b(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)[-A-Z0-9+&@#\/%=~_|$\(\)?!:,.]*[A-Z0-9+&@#\/%=~_|$]/i';
+          preg_match_all( $urlMatch, $event[ 'description' ], $url, PREG_PATTERN_ORDER );
+
+          $event[ 'description' ] = preg_replace(
+            $urlMatch,
+            '',
+            $event[ 'description' ]
+          );
+
+          if ( is_array( $url ) ) {
+            $event[ 'url' ] = $url[ 0 ];
+          }
 
-        if ( is_array( $url ) ) {
-          $event[ 'url' ] = $url[ 0 ];
         }
 
         $events[] = $event;
diff --git a/src/app/views/base.twig b/src/app/views/base.twig
index 202d44f..cecb84c 100644
--- a/src/app/views/base.twig
+++ b/src/app/views/base.twig
@@ -73,7 +73,6 @@
     </div> <!-- /container -->
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.min.js"></script>
 
     <script src="js/d3.v3.min.js"></script>
     <script src="js/trianglify.min.js"></script>
diff --git a/src/app/views/level2.twig b/src/app/views/level2.twig
index 0f97095..2968085 100644
--- a/src/app/views/level2.twig
+++ b/src/app/views/level2.twig
@@ -17,7 +17,17 @@
       <div class="row event well">
 
         <div class="col-sm-4">
-          <img src="https://www.hackerspace.lu/wp-content/uploads/2015/01/cfbtncrop.jpg" />
+          {% if event.image.0 is defined %}
+            <img src="{{ event.image.0 }}" />
+          {% else %}
+            <img src="https://wiki.hackerspace.lu/w/images/8/86/Syn2catLOGO.png" />
+          {% endif %}
+          {% if event.date is defined %}
+            <h4>{{ event.date }}</h4>
+          {% endif %}
+          {% if event.location is defined %}
+            <h4>{{ event.location }}</h4>
+          {% endif %}
         </div>
         <div class="col-sm-8">
           <h2>
@@ -25,14 +35,11 @@
               <a href="{{ event.url.0 }}">
                 {{ event.name }}
               </a>
-              {% else %}
+            {% else %}
                 {{ event.name }}
-              {% endif %}
+            {% endif %}
           </h2>
-          {% if event.location is defined %}
-            <h4>{{ event.location }}</h4>
-          {% endif %}
-          <p>{{ event.description }}</p>
+          <p>{{ event.description|raw }}</p>
         </div>
 
       </div>
diff --git a/src/web/css/level2.css b/src/web/css/level2.css
index 30caed8..f4e1fca 100755
--- a/src/web/css/level2.css
+++ b/src/web/css/level2.css
@@ -3,7 +3,6 @@
  * syn2cat blue: #00AED2
  */
 
-
 * {
   -webkit-transition: all 0.2s ease;
   -moz-transition: all 0.2s ease;
@@ -14,8 +13,9 @@
 html,
 body {
   font-family: 'Patrick Hand SC', sans-serif;
-  font-size: 20px;
+  font-size: 18px;
   height: 100%;
+  overflow-x: hidden;
 }
 .well {
   padding: 0.5rem;
@@ -23,18 +23,20 @@ body {
   background: rgba( 255, 255, 255, 0.7 );
   border-radius: 0.4rem;
 }
-
 .footer {
-  margin-top: 2rem;
+  margin: 1rem 0;
   color: #fff;
   background-color: #4B4949;
   background: rgba( 75, 73, 73, 0.8 );
   border-radius: 0.4rem;
   padding: 0.5rem;
 }
-
-.footer a {
-  color: rgba(127, 213, 225, 1);
+.container a {
+  color: #00AED2; //rgba(127, 213, 225, 1);
+}
+.container a:hover {
+  color: #F56533;
+  text-decoration: none;
 }
 
 /**
@@ -82,6 +84,9 @@ h2, h3, h4 {
 .event h4 {
   color: #777;
 }
+.event p {
+  margin-top: -0.5rem;
+}
 
 img {
   max-width: 100%;