diff --git a/src/index.js b/src/index.js
index e01aa5f..2be2c2d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -39,5 +39,7 @@ app.use((state, emitter) => {
 // which is given the app's state from above and the emitter.emit method that
 // triggers the app's emitter listeners.
 app.route('/', viewManager);
+app.route('/:page', viewManager);
+app.route('/404', viewManager);
 
 app.mount('body');  // Overwrite the `<body>` tag with the content of the Choo app
\ No newline at end of file
diff --git a/src/views/manager.js b/src/views/manager.js
index a57fd95..63c88ec 100644
--- a/src/views/manager.js
+++ b/src/views/manager.js
@@ -7,10 +7,7 @@ export const viewManager = (state, emit) => {
   // In viewManager all we are doing is checking the app's state
   // and passing the state and emit to the relevant view.
   let htmlContent = html`<div>loading</div>`;
-  if (state.query.hasOwnProperty('search')) {
-    state.currentView = 'search'; // Override view if there's a search query
-  }
-  switch (state.currentView) {
+  switch (state.params.page) {
     case 'home':
     default: {
       htmlContent = homeView(state, emit);
@@ -37,11 +34,12 @@ export const viewManager = (state, emit) => {
       <label for="navMenu" class="burger pseudo button">&#8801;</label>
     
       <div class="menu">
-        <form method="GET" style="display:inline-block;">
-          <label>
-            <input type="text" name="search" placeholder="Search">
-          </label>
-        </form>
+        <label style="display: inline-block;">
+          <input type="text" name="search" placeholder="Search" onchange=${e => {
+            console.log(encodeURIComponent(e.target.value.trim()));
+            emit('pushState', '/search?for=' + encodeURIComponent(e.target.value.trim()));
+          }}>
+        </label>
         <a href="https://gitlab.com/Alamantus/book-tracker" class="pseudo button">Repo</a>
         <a href="https://gitter.im/book-tracker/general" class="pseudo button">Chat</a>
       </div>
