diff --git a/layouts/event_archive.erb b/layouts/event_archive.erb
index 8cfd188a..f884a44c 100644
--- a/layouts/event_archive.erb
+++ b/layouts/event_archive.erb
@@ -1,14 +1,47 @@
 <%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %>
-<div class="row">
-  <% (@item[:futureitems] + @item[:pastitems]).each do |item| %>
-  <div class="span8">
-    <article itemscope itemtype="http://schema.org/EducationEvent">
-      <%= render 'event_header', :item => item, :heading => true, :link => true %>
-    </article>
-    <p>
-    <a href="<%= item.path() %>">Zum Artikel</a>
-    <hr>
+<% if (@item[:futureitems].size>0 && @item[:pastitems].size>0) %>
+  <div class="row">
+    <div class="span8">
+      <h1><%= @item[:comingtitle] %></h1>
+    </div>
+    <% @item[:futureitems].reverse.each do |item| %>
+    <div class="span8">
+      <article itemscope itemtype="http://schema.org/EducationEvent">
+        <%= render 'event_header', :item => item, :heading => 'h2', :link => true %>
+      </article>
+      <p>
+      <a href="<%= item.path() %>">Zum Artikel</a>
+      <hr>
   </div>
-  <% end %>
-</div>
+    <% end %>
+  </div>
+  <div class="row">
+    <div class="span8">
+      <h1><%= @item[:pasttitle] %></h1>
+    </div>
+    <% @item[:pastitems].each do |item| %>
+    <div class="span8">
+      <article itemscope itemtype="http://schema.org/EducationEvent">
+        <%= render 'event_header', :item => item, :heading => 'h2', :link => true %>
+      </article>
+      <p>
+      <a href="<%= item.path() %>">Zum Artikel</a>
+      <hr>
+    </div>
+    <% end %>
+  </div>
+<% else %>
+  <div class="row">
+    <% (@item[:futureitems] + @item[:pastitems]).each do |item| %>
+    <div class="span8">
+      <article itemscope itemtype="http://schema.org/EducationEvent">
+        <%= render 'event_header', :item => item, :heading => 'h1', :link => true %>
+      </article>
+      <p>
+      <a href="<%= item.path() %>">Zum Artikel</a>
+      <hr>
+    </div>
+    <% end %>
+  </div>
+<% end %>
 <%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %>
diff --git a/layouts/event_body.html b/layouts/event_body.html
index b058efe8..91f6c9ca 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, :heading => true, :link => false %>
+                <%= render 'event_header', :item => item, :heading => 'h1', :link => false %>
                 <hr>
                 <section itemprop="description">
                   <%= yield %>
diff --git a/layouts/event_header.erb b/layouts/event_header.erb
index 6b61ea9b..671dce21 100644
--- a/layouts/event_header.erb
+++ b/layouts/event_header.erb
@@ -1,9 +1,9 @@
                 <header class="event">
                   <% if heading %>
                   <% if link %>
-                  <h1 itemprop="name"><a itemProp="url" href="<%= item.path() %>"><%= item[:title] %></a></h1>
+                  <<%= heading %> itemprop="name"><a itemProp="url" href="<%= item.path() %>"><%= item[:title] %></a></<%= heading %>>
                   <% else %>
-                  <h1 itemprop="name"><%= item[:title] %></h1>
+                  <<%= heading %> itemprop="name"><%= item[:title] %></<%= heading %>>
                   <% end %>
                   <% end %>
                   <ul class="iconlist">