diff --git a/.gitignore b/.gitignore
index 3a11a65..82e6258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ output/
 tmp/
 
 # Crash Log
-crash.log
+crash.log*
 
 .idea/
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e780af9..ece43fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     icalendar (2.4.0)
-    json (2.0.1)
+    json (2.0.2)
     kramdown (1.11.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -50,7 +50,7 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    notiffany (0.1.0)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pkg-config (1.1.7)
diff --git a/Rules b/Rules
index 111b328..57e2ea8 100644
--- a/Rules
+++ b/Rules
@@ -161,7 +161,7 @@ route '/posts/**/*', rep: :ical do
 end
 
 route '/**/*.{erb,html,md}' do
-  "#{item.identifier.without_ext}/index.html"
+  "#{item.identifier.without_ext}.html"
 end
 
 #
diff --git a/content/about.erb b/content/about.erb
index 7ad92d4..c526ec6 100644
--- a/content/about.erb
+++ b/content/about.erb
@@ -1,3 +1,7 @@
+---
+navigable: true
+title: About
+---
 <div class="content">
   <h1>Over Zeus WPI</h1>
 
@@ -15,26 +19,26 @@
 
   <h2>Het bestuur</h2>
 
-  Het bestuur zorgt ervoor dat alle wieltjes blijven draaien en organiseert regelmatig activiteiten voor de leden. Het bestuur voor het academiejaar 2015-2016 van Zeus WPI is.
+  Het bestuur zorgt ervoor dat alle wieltjes blijven draaien en organiseert regelmatig activiteiten voor de leden. Het bestuur voor het academiejaar 2016-2017 van Zeus WPI is.
 
   <ul>
     <li>
-      Voorzitter: Jeroen De Clerck
+      Voorzitter: Wout Schellaert
     </li>
     <li>
-      Secretaris: Eloïse Piret
+      Vice-voorzitter: Isaura Claeys
     </li>
     <li>
-      Penning: Kenneth Van den Driessche
+      Penning: Jeroen De Clerck
     </li>
     <li>
-      Systeembeheerder: Titouan Vervack
+      Systeembeheerders: Rien Maertens &amp; Lorin Werthen
     </li>
     <li>
-      Activiteiten: Lorin Werthen
+      Activiteiten: Eloïse Piret
     </li>
     <li>
-      Project: Ilion Beyst
+      Project: Feliciaan De Palmenaer
     </li>
   </ul>
 
@@ -60,7 +64,7 @@
       bezoek ons IRC-kanaal. (server: wina.ugent.be, kanaal: #zeus)
     </li>
     <li>
-      bel naar 09 264 4751 (intern: 4751)
+      bel naar <a href="tel://+3292644751">09 264 4751</a> (intern: 4751)
     </li>
     <li>
       stort op BE32 9799 9370 6502 (BIC: ARSP BE 22)
diff --git a/content/archives.erb b/content/archives.erb
index 2c734a9..4bd7e5d 100644
--- a/content/archives.erb
+++ b/content/archives.erb
@@ -1,4 +1,9 @@
-7<ul class="archive_list">
+<ul class="archive_list">
+---
+navigable: true
+title: Archieven
+---
+<ul>
   <% academic_years_items.each do |year, item| %>
   <li>
     <%= link_to pretty_year(year), item %>
diff --git a/content/cammie.erb b/content/cammie.erb
index 2a297a3..aa7b719 100644
--- a/content/cammie.erb
+++ b/content/cammie.erb
@@ -1,3 +1,7 @@
+---
+navigable: true
+title: Cammie
+---
 <div class="fullpage">
   <img
     id="cammie"
diff --git a/content/projects.erb b/content/projects.erb
index cbbaa68..7b336a8 100644
--- a/content/projects.erb
+++ b/content/projects.erb
@@ -1,3 +1,7 @@
+---
+navigable: true
+title: Projecten
+---
 <% 5.times do %>
 <section class="hero is-primary">
   <div class="hero-body">
diff --git a/content/search.erb b/content/search.erb
index 4bc0e7d..499adea 100644
--- a/content/search.erb
+++ b/content/search.erb
@@ -1,3 +1,7 @@
+---
+navigable: true
+title: Search
+---
 <form action="?" method="get">
   <input type="text" name="q" id="tipue_search_input" autocomplete="off" required>
 </form>
diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb
index d856c7c..cc69bd0 100644
--- a/layouts/partials/_navbar.erb
+++ b/layouts/partials/_navbar.erb
@@ -4,21 +4,11 @@
       <img id="logo" src="https://zeus.ugent.be/wp-content/uploads/2009/05/logo-new.png" alt="" />
     </a>
 
-    <a class="nav-item is-tab" href="/about">
-      About
-    </a>
-    <a class="nav-item is-tab" href="/archives">
-      Archief
-    </a>
-    <a class="nav-item is-tab" href="/projects">
-      Projecten
-    </a>
-    <a class="nav-item is-tab" href="/cammie">
-      Cammie
-    </a>
-    <a class="nav-item is-tab" href="/search">
-      Zoeken
-    </a>
+    <% nav_items do |item, active| %>
+      <a class="nav-item is-tab <%= 'is-active' if active %>" href="<%= relative_path_to(item) %>">
+        <%= item[:title] %>
+      </a>
+    <% end %>
   </div>
 
   <div class="nav-right">
diff --git a/lib/helpers/nav.rb b/lib/helpers/nav.rb
new file mode 100644
index 0000000..ec6a8fb
--- /dev/null
+++ b/lib/helpers/nav.rb
@@ -0,0 +1,10 @@
+module NavigationHelper
+  def nav_items
+    navigables = items.select { |i| i[:navigable] }
+
+    navigables.each do |item|
+      is_active = @item_rep && @item_rep.path == item.path
+      yield item, is_active
+    end
+  end
+end
diff --git a/lib/helpers_.rb b/lib/helpers_.rb
index 86f3a76..686ba03 100644
--- a/lib/helpers_.rb
+++ b/lib/helpers_.rb
@@ -6,3 +6,4 @@ include Nanoc::Helpers::Text
 
 include ArchiveHelper
 include IcalHelper
+include NavigationHelper