diff --git a/_layouts/event.html b/_layouts/event.html
index a8abb6c1..1696ff4b 100644
--- a/_layouts/event.html
+++ b/_layouts/event.html
@@ -14,23 +14,23 @@ layout: default
      <h3>#{{page.number}}</h3>
      <h4>{{page.date_text}}</h4>
 
-     {% if post.title %}
-      <p>{{post.title}}</p>
-     {% endif %}     
+     {% if post.location %}
+      <p><a class="highlight button hvr-sweep-to-top" href={{post.location_website}} target="_blank">{{post.location}}</a></p>
+     {% endif %}
 
-     {% if page.topics %}
      <p>
       <ul>
-       {% assign tags = (page.topics | split:",") %} {% for tag in tags %}
-       <li>{{tag}}</li>
-       {% endfor%}
+      {% for talk in post.talks %}
+       {% if talk.topics %}
+         {% assign tags = (talk.topics | split:",") %}
+          {% for tag in tags | uniq %}
+           <li>{{tag}}</li>
+          {% endfor %}
+       {% endif %}
+      {% endfor %}
       </ul>
      </p>
-     {% endif %} {% if page.location %}
-     <p><a class="highlight button hvr-sweep-to-top" href={{page.location_website}} target="_blank">{{page.location}}</a>
-     </p>
-     {% endif %}
-    </p>
+     
    </div>
 
    <div class="event event-{{page.number}} dark_bg col-md-7">