diff --git a/content/sidebar.html b/content/sidebar.html
index 46417c24..f4376456 100644
--- a/content/sidebar.html
+++ b/content/sidebar.html
@@ -6,28 +6,8 @@ if (upcomingEvents.size>0)
   upcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
 %>
 <h1>Kalender</h1>
-<ul>
-  <% upcomingEvents[0..9].each do |e| %>
-  <li>
-    <% if e[:startdate].instance_of?(Date) %>
-    <% if e[:startdate]<e[:enddate] %>
-    <%= e[:startdate].strftime("%d.%m.") %> - <%= e[:enddate].strftime("%d.%m.") %>:
-    <% else %>
-    <%= e[:startdate].strftime("%d.%m.") %>:
-    <% end %>
-    <% else %>
-    <%= e[:startdate].strftime("%d.%m., %H:%M") %>:
-    <% end %>
-    <% if e[:url] %>
-    <a href="<%= e[:url] %>"><%= e[:title] %></a>
-    <% elsif e.identifier.start_with?("/events") %>
-    <a href="<%= e.path %>"><%= e[:title] %></a>
-    <% else %>
-    <%= e[:title] %>
-    <% end %>
-    </li>
-  <% end %>
-</ul>
+<p>
+<%= render 'calendar_list', :events => upcomingEvents.first(10) %>
 <% end %>
 <h1>Letzte Tweets</h1>
 <p>
diff --git a/layouts/calendar_list.erb b/layouts/calendar_list.erb
new file mode 100644
index 00000000..2d5ed48c
--- /dev/null
+++ b/layouts/calendar_list.erb
@@ -0,0 +1,24 @@
+-----
+filter: erb
+-----
+<ul><% @events.each do |e| %>
+  <li>
+    <% if e[:startdate].instance_of?(Date) %>
+    <% if e[:startdate]<e[:enddate] %>
+    <%= e[:startdate].strftime("%d.%m.") %> - <%= e[:enddate].strftime("%d.%m.") %>:
+    <% else %>
+    <%= e[:startdate].strftime("%d.%m.") %>:
+    <% end %>
+    <% else %>
+    <%= e[:startdate].strftime("%d.%m., %H:%M") %>:
+    <% end %>
+    <% if e[:url] %>
+    <a href="<%= e[:url] %>"><%= e[:title] %></a>
+    <% elsif e.identifier.start_with?("/events") %>
+    <a href="<%= e.path %>"><%= e[:title] %></a>
+    <% else %>
+    <%= e[:title] %>
+    <% end %>
+    </li>
+<% end %></ul>
+