diff --git a/content/index.html b/content/index.html
index e8019f26..1e798b2c 100644
--- a/content/index.html
+++ b/content/index.html
@@ -29,11 +29,11 @@ feed:
   </div>
 </div>
 <div class="row">
-  <% upcomingEvents = get_events().select { |e| e[:startdate].to_datetime > DateTime.now }
-  if (upcomingEvents.size>0)
-    upcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
-  %>
-  <div class="span6">
+  <div class="span8">
+    <% upcomingEvents = get_events().select { |e| e[:startdate].to_datetime > DateTime.now }
+    if (upcomingEvents.size>0)
+      upcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
+    %>
     <div class="well well-large">
       <article itemscope itemtype="http://schema.org/EducationEvent">
         <h1><a href="<%= upcomingEvents[0].path() %>">Nächster Vortrag</a></h1>
@@ -43,13 +43,11 @@ feed:
         </p>
       </article>
     </div>
-  </div>
-  <% end %>
-  <% upcomingRegularsTable = get_regulars_tables().select { |e| e[:startdate].to_datetime > DateTime.now }
-  if (upcomingRegularsTable.size>0)
-    upcomingRegularsTable.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
-  %>
-  <div class="span6">
+    <% end %>
+    <% upcomingRegularsTable = get_regulars_tables().select { |e| e[:startdate].to_datetime > DateTime.now }
+    if (upcomingRegularsTable.size>0)
+      upcomingRegularsTable.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
+    %>
     <div class="well well-large">
       <article itemscope itemtype="http://schema.org/SocialEvent">
         <h1><a href="#">Nächster <span itemprop="name">CCCS Stammtisch</span></a></h1>
@@ -59,8 +57,18 @@ feed:
         </p>
       </article>
     </div>
+    <% end %>
+  </div>
+  <div class="span4">
+    <h1>Kalender</h1>
+    <p>
+    <% allUpcomingEvents = get_public_events().select { |e| e[:startdate].to_datetime > DateTime.now }
+    if (allUpcomingEvents.size>0)
+      allUpcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
+    %>
+    <%= render 'calendar_list', :events => allUpcomingEvents.first(10) %>
+    <% end %>
   </div>
-  <% end %>
 </div>
 <div class="row">
   <div class="span8">