diff --git a/app/adapters/node.js b/app/adapters/node.js
index 0464c21a72685c16e02cdb32f0549f07ffc80c8e..23fbe9a860c5b3778dd7a2f8e3b7558006499672 100644
--- a/app/adapters/node.js
+++ b/app/adapters/node.js
@@ -3,14 +3,13 @@ import ApplicationAdapter from './application';
 export default class NodeAdapter extends ApplicationAdapter {
 
   findNode(node_id) {
-    let url, ret, json;
+    let url, ret, json, query;
 
     url = this.buildURL('nodes', node_id);
 
     return this.ajax(url, 'GET').then((node) => {
       this.store.pushPayload('folder', node);
       ret = this.store.peekRecord('folder', node.data.id);
-      console.log(node.data);
       return ret;
     });
 
diff --git a/app/components/folder.hbs b/app/components/folder.hbs
index d711d74110c93dcdf61ffcef0a7983e1f09c9276..ed43bb691807c5792021e06fe9b93b1d82388e43 100644
--- a/app/components/folder.hbs
+++ b/app/components/folder.hbs
@@ -1,6 +1,9 @@
 <div class="node folder">
     <div class="icon folder"></div>
     <div class="title">
-        {{@model.title}}
+        <LinkTo
+            @route="authenticated.nodes" @model={{@model}}>
+            {{@model.title}}
+        </LinkTo>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/router.js b/app/router.js
index b46490efee02cf461b859fd3dbd461d18de56925..014e1720eb88dc7ed45ddc9bb82cffa3631b8ab4 100644
--- a/app/router.js
+++ b/app/router.js
@@ -13,7 +13,6 @@ Router.map(function () {
     this.route('document', { path: '/document/:document_id' });
 
     this.route('nodes', { path: '/nodes/:node_id' });
-    this.route('nodes', { path: '/nodes/' });
 
     this.route('tags');
 
diff --git a/app/routes/application.js b/app/routes/application.js
index 6768ea9f7a0b15799da4e549964e4f7e219d63bf..56b9f8f9e0623441e495b8f53dc475e129488d32 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -1,19 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
-export default class ApplicationRoute extends Route {
-  @service session;
-  @service currentUser;
-
-  beforeModel() {
-    return this._loadCurrentUser();
-  }
 
-  async _loadCurrentUser() {
-    try {
-      await this.currentUser.loadCurrentUser();
-    } catch (err) {
-      await this.session.invalidate();
-    }
-  }
+export default class ApplicationRoute extends Route {
 }
diff --git a/app/services/current-user.js b/app/services/current-user.js
index e805e33162aa708a93c29d586c33c6124514f678..16bbbdfe7db762ac4a18a567d9ce6073fa597adc 100644
--- a/app/services/current-user.js
+++ b/app/services/current-user.js
@@ -1,6 +1,7 @@
 import Service from '@ember/service';
 import { inject as service } from '@ember/service';
 
+
 export default class CurrentUserService extends Service {
   @service session;
   @service store;