diff --git a/Rules b/Rules
index 69eb3ba..71e0250 100644
--- a/Rules
+++ b/Rules
@@ -74,7 +74,7 @@ postprocess do
     {
       title: e[:title],
       url: url_for(e),
-      text: e.reps[:text].compiled_content,
+      text: excerptize(e.reps[:text].compiled_content, length: 200),
       tags: ''
     }
   end
diff --git a/content/index.erb b/content/index.erb
index 79ba798..3a667f1 100644
--- a/content/index.erb
+++ b/content/index.erb
@@ -3,7 +3,9 @@
   <div id="container" class="pure-u-xl-3-5 pure-u-lg-2-3 pure-u-md-3-4 pure-u-sm-5-6 pure-u-11-12">
     <header>
       <div class="header-top">
-        <img id="logo" src="https://zeus.ugent.be/wp-content/uploads/2009/05/logo-new.png" alt="" />
+        <a href="/">
+          <img id="logo" src="https://zeus.ugent.be/wp-content/uploads/2009/05/logo-new.png" alt="" />
+        </a>
         <div id="logos">
           <a href="https://github.com/ZeusWPI" target="_blank">
             <i class="logo-link fa fa-github fa-3x"></i>
@@ -20,15 +22,6 @@
       <%= render '/partials/_navbar.*' %>
     </header>
     <main>
-      <form action="?">
-        <input type="text" name="q" id="tipue_search_input" autocomplete="off" required>
-      </form>
-      <div id="tipue_search_content"></div>
-      <script>
-      $(document).ready(function() {
-        $('#tipue_search_input').tipuesearch();
-      });
-      </script>
       <div id="all-events">
         <%= render '/partials/_tile.*', article: sorted_articles[0] %>
         <div class="pure-g">
diff --git a/content/search.erb b/content/search.erb
new file mode 100644
index 0000000..379d139
--- /dev/null
+++ b/content/search.erb
@@ -0,0 +1,31 @@
+<div class="header-top">
+  <a href="/">
+    <img id="logo" src="https://zeus.ugent.be/wp-content/uploads/2009/05/logo-new.png" alt="" />
+  </a>
+  <div id="logos">
+    <a href="https://github.com/ZeusWPI" target="_blank">
+      <i class="logo-link fa fa-github fa-3x"></i>
+    </a>
+    <a href="https://www.facebook.com/zeus.wpi/" target="_blank">
+      <i class="logo-link fa fa-facebook fa-3x"></i>
+    </a>
+    <a href="#" target="_blank">
+      <i class="logo-link fa fa-rss fa-3x"></i>
+    </a>
+  </div>
+</div>
+<%= render '/partials/_navbar.*' %>
+<div class="pure-g">
+  <div class="pure-u-1-24"></div>
+  <div class="pure-u-11-12">
+    <form action="" method="get">
+      <input type="text" name="q" id="tipue_search_input" autocomplete="off" required>
+    </form>
+    <div id="tipue_search_content"></div>
+    <script>
+    $(document).ready(function() {
+      $('#tipue_search_input').tipuesearch();
+    });
+    </script>
+  </div>
+</div>
diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb
index 5e18fc5..98a098b 100644
--- a/layouts/partials/_navbar.erb
+++ b/layouts/partials/_navbar.erb
@@ -8,6 +8,9 @@
   <a href="#">
     Contact
   </a>
+  <a href="/search">
+    Search
+  </a>
   <a href="/cammie">
     Cammie
   </a>
diff --git a/nanoc.yaml b/nanoc.yaml
index f3b1a3d..8e684cd 100644
--- a/nanoc.yaml
+++ b/nanoc.yaml
@@ -1,4 +1,5 @@
-base_url: https://zeus.ugent.be/beta
+#base_url: https://zeus.ugent.be/beta
+base_url: http://localhost:3000
 
 # The syntax to use for patterns in the Rules file. Can be either `"glob"`
 # (default) or `"legacy"`. The former will enable glob patterns, which behave