diff --git a/Rules b/Rules
index 84ab9ef..c26df97 100644
--- a/Rules
+++ b/Rules
@@ -16,7 +16,8 @@ preprocess do
   # We don't want to compile old blogposts in development
   ignore_old_blogposts if development?
   update_blog_attributes
-  create_blog_items
+  create_yearly_items('Blog')
+  create_yearly_items('Events')
   convert_event_time_to_timestamps
 end
 
@@ -42,7 +43,16 @@ end
 #
 # EVENTS
 #
-compile '/events/**/*' do
+
+# Overview page
+compile '/events/*' do
+  layout '/events.*'
+  layout '/generic.*'
+  layout '/default.*'
+  filter :erb
+end
+
+compile '/events/*/*' do
   filter :kramdown
 
   layout '/eventpost.*'
@@ -50,12 +60,12 @@ compile '/events/**/*' do
   filter :erb
 end
 
-compile '/events/**/*', rep: :text do
+compile '/events/*/*', rep: :text do
   filter :kramdown
   filter :strip_html
 end
 
-compile '/events/**/*', rep: :ical do
+compile '/events/*/*', rep: :ical do
   filter :ical
   write ext: 'ics'
 end
diff --git a/content/assets/stylesheets/includes/navbar.scss b/content/assets/stylesheets/includes/navbar.scss
index c706e72..a2fbc8e 100644
--- a/content/assets/stylesheets/includes/navbar.scss
+++ b/content/assets/stylesheets/includes/navbar.scss
@@ -35,7 +35,6 @@
 
   #logo-link {
     #logo {
-      padding-top: 10px;
       padding-left: 10px;
       width: 100px;
     }
@@ -75,3 +74,13 @@
     }
   }
 }
+
+.hero {
+  #logo {
+    padding-top: 25px;
+  }
+  
+  .nav-right {
+    padding-right: 10px;
+  }
+}
diff --git a/content/events.erb b/content/events.erb
deleted file mode 100644
index 7dd7cda..0000000
--- a/content/events.erb
+++ /dev/null
@@ -1,34 +0,0 @@
----
-navigable: true
-title: Events
-order: 20
----
-<div class="container">
-  <div class="content">
-    <h1>Upcoming events</h1>
-  </div>
-  <% upcoming_events.each_slice(2) do |slice| %>
-  <div class="columns">
-    <% slice.each do |event| %>
-    <div class="tile is-parent ">
-      <%= render '/partials/_events_tile.*', event: event %>
-    </div>
-    <% end %>
-  </div>
-  <% end %>
-</div>
-
-<div class="container">
-  <div class="content">
-    <h1>Past events</h1>
-  </div>
-  <% past_events.each_slice(2) do |slice| %>
-  <div class="columns">
-    <% slice.each do |event| %>
-    <div class="tile is-parent ">
-      <%= render '/partials/_events_tile.*', event: event %>
-    </div>
-    <% end %>
-  </div>
-  <% end %>
-</div>
diff --git a/layouts/archive_page.erb b/layouts/archive_page.erb
index a77b803..7a93594 100644
--- a/layouts/archive_page.erb
+++ b/layouts/archive_page.erb
@@ -5,7 +5,7 @@
         Academiejaar
       </p>
       <ul class="menu-list">
-        <% academic_years_items.each do |year, item| %>
+        <% academic_years_blog_items.each do |year, item| %>
         <% if @item_rep && @item_rep.path == item.path %>
         <li>
           <a href="#" class="is-active">
diff --git a/layouts/events.erb b/layouts/events.erb
new file mode 100644
index 0000000..df95b69
--- /dev/null
+++ b/layouts/events.erb
@@ -0,0 +1,56 @@
+<div class="columns">
+  <div class="column is-2 is-narrow">
+    <aside class="menu">
+      <p class="menu-label">
+        Academiejaar
+      </p>
+      <ul class="menu-list">
+        <% academic_years_event_items.each do |year, item| %>
+        <% if @item_rep && @item_rep.path == item.path %>
+        <li>
+          <a href="#" class="is-active">
+            <%= pretty_year(year) %>
+          </a>
+        </li>
+        <% else %>
+        <li>
+          <%= link_to pretty_year(year), item %>
+        </li>
+        <% end %>
+        <% end %>
+      </ul>
+    </aside>
+  </div>
+
+  <div class="column">
+    <% unless upcoming_events(@item[:academic_year]).empty? %>
+      <div class="content">
+        <h1>Upcoming events</h1>
+      </div>
+      <% upcoming_events(@item[:academic_year]).each_slice(2) do |slice| %>
+      <div class="columns">
+        <% slice.each do |event| %>
+        <div class="tile is-parent ">
+          <%= render '/partials/_events_tile.*', event: event %>
+        </div>
+        <% end %>
+      </div>
+      <% end %>
+    <% end %>
+
+    <% unless past_events(@item[:academic_year]).empty? %>
+      <div class="content">
+        <h1>Past events</h1>
+      </div>
+      <% past_events(@item[:academic_year]).each_slice(2) do |slice| %>
+      <div class="columns">
+        <% slice.each do |event| %>
+        <div class="tile is-parent ">
+          <%= render '/partials/_events_tile.*', event: event %>
+        </div>
+        <% end %>
+      </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>
diff --git a/lib/helpers/archives.rb b/lib/helpers/archives.rb
index b4362d6..71f1a7c 100644
--- a/lib/helpers/archives.rb
+++ b/lib/helpers/archives.rb
@@ -3,7 +3,7 @@ module ArchiveHelper
     Set.new(items.find_all('/blog/*/*').map { |i| i.identifier.to_s[/\d\d-\d\d/] }).to_a
   end
 
-  def academic_years_items
+  def academic_years_blog_items
     academic_years.reverse.map { |y| [y, items["/blog/#{y}.html"]] }
   end
 
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb
index 72f190c..a430d7e 100644
--- a/lib/helpers/events.rb
+++ b/lib/helpers/events.rb
@@ -1,17 +1,31 @@
+# frozen_string_literal: true
+
 require 'uri'
+
 module EventsHelper
-  def all_events
-    @items.find_all('/events/*/*.md').sort_by { |x| x[:time] }
+  def all_events(year = nil)
+    items_ = if year
+               @items.find_all("/events/#{year}/*.md")
+             else
+               @items.find_all('/events/*/*.md')
+             end
+
+    items_.sort_by { |x| x[:time] }
   end
 
-  def upcoming_events
-    all_events.reject { |x| x[:time] <= Date.today }
+  def upcoming_events(year = nil)
+    all_events(year).reject { |x| x[:time] <= Date.today }
   end
 
-  def past_events
-    all_events.reject { |x| x[:time] > Date.today }.reverse
+  def past_events(year = nil)
+    all_events(year).reject { |x| x[:time] > Date.today }.reverse
   end
 
+  def academic_years_event_items
+    items.find_all('/events/*').map { |e| [e[:academic_year], e] }.reverse
+  end
+
+
   def grouped_events
     @items.find_all('/events/*/*/main.md')
   end
diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb
index 546197c..d68dc21 100644
--- a/lib/helpers/preprocess.rb
+++ b/lib/helpers/preprocess.rb
@@ -18,17 +18,19 @@ module PreprocessHelper
     end
   end
 
-  def create_blog_items
-    # academic_years is defined in archives.rb
-    academic_years.each do |year|
+  def create_yearly_items(type)
+    type = type.to_s
+    years = @items.find_all("/#{type.downcase}/*/*").map { |i| i.identifier.to_s[/\d\d-\d\d/] }.uniq
+
+    years.each do |year|
       @items.create(
         '',
-        { academic_year: year, title: 'Blog' },
-        "/blog/#{year}.html"
+        { academic_year: year, title: type },
+        "/#{type.downcase}/#{year}.html"
       )
     end
 
-    academic_years_items[0][1].update_attributes(
+    @items["/#{type.downcase}/#{years[-1]}.html"].update_attributes(
       navigable: true,
       order: 10
     )