diff --git a/content/index.html b/content/index.html
index fe6760ea..09bea436 100644
--- a/content/index.html
+++ b/content/index.html
@@ -29,38 +29,24 @@ feed:
   </div>
 </div>
 <div class="row">
+  <% upcomingEvents = get_events().select { |e| e[:startdate] > Time.now }
+  if (upcomingEvents.size>0)
+    upcomingEvents.sort! { |a,b| a[:startdate] <=> b[:startdate] }
+  %>
   <div class="span6">
     <div class="well well-large">
       <article itemscope itemtype="http://schema.org/EducationEvent">
         <h1><a href="#">Nächster Vortrag</a></h1>
+        <%= render 'event_header', :item => upcomingEvents[0], :heading => false %>
         <p>
-          <strong>Termin:</strong>
-          <span itemprop="startDate" content="2013-02-14T19:30">Donnerstag, 14. Februar 2013, 19:30 Uhr</span>
-        </p>
-        <p>
-          <strong>Thema:</strong>
-          <span itemprop="name">Über die besonderen Anforderungen beim Sammeln von historischen Großrechnern</span>
-        </p>
-        <p>
-          <strong>Referent:</strong>
-          <span itemprop="performer" itemscope itemtype="http://schema.org/Person">
-            <span itemprop="name">Wolfgang Stief</span>, GUUG München
-          </span>
-        </p>
-        <p>
-          <strong>Ort:</strong>
-          <span itemprop="location" itemscope itemtype="http://schema.org/Location">
-            <span itemprop="name">Stadtbibliothek am Mailänder Platz</span>, Max-Bense-Forum (UG)
-          </span>
-        </p>
-        <p>
-          <a itemprop="url" href="#">Weitere Informationen</a> -
+        <a itemprop="url" href="<%= upcomingEvents[0].path() %>">Weitere Informationen</a> -
           <a href="#">Flyer (PDF)</a> -
           <a href="#">Aushang (PDF)</a>
         </p>
       </article>
     </div>
   </div>
+  <% end %>
   <div class="span6">
     <div class="well well-large">
       <article itemscope itemtype="http://schema.org/SocialEvent">
diff --git a/layouts/event_body.html b/layouts/event_body.html
index c170ab87..83e3bac7 100644
--- a/layouts/event_body.html
+++ b/layouts/event_body.html
@@ -3,7 +3,7 @@
           <div class="row">
             <div class="span8">
               <article itemscope itemtype="http://schema.org/EducationEvent">
-                <%= render 'event_header', :item => item %>
+                <%= render 'event_header', :item => item, :heading => true %>
                 <hr>
                 <section itemprop="description">
                   <%= yield %>
diff --git a/layouts/event_header.erb b/layouts/event_header.erb
index 141d78e5..453682c7 100644
--- a/layouts/event_header.erb
+++ b/layouts/event_header.erb
@@ -1,8 +1,9 @@
                 <header>
-                  <h1 itemprop="name"><a itemprop="url" href="<%= item.path %>"><%= item[:title] %></a></h1>
+                  <% if heading %><h1 itemprop="name"><%= item[:title] %></h1><% end %>
                   <strong>Termin:</strong>
                   <span itemprop="startDate" content="<%= @item[:startdate].strftime("%Y-%m-%d") %>T19:30"><%= @item[:startdate].strftime("%d.%m.%Y") %>, 19:30 Uhr</span>
                   <br />
+                  <% if !heading %><strong>Thema:</strong><span itemprop="name"><%= item[:title] %></span><br /><% end %>
                   <div class="commaseparated">
                     <strong>Referent:</strong>
                     <ul>