diff --git a/Brocfile.js b/Brocfile.js
index 0e177fa..138b2f6 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -41,16 +41,4 @@ app.import('bower_components/chartjs/Chart.js', {
 
 app.import('vendor/custom-plugins/_amdize.js');
 
-app.import('vendor/list-view.amd.js', {
-  exports: {
-    'list-view/main': ['default'],
-    'list-view/helper': ['default'],
-    'list-view/list_item_view': ['default'],
-    'list-view/list_item_view_mixin': ['default'],
-    'list-view/list_view': ['default'],
-    'list-view/list_view_helper': ['default'],
-    'list-view/list_view_mixin': ['default']
-  }
-});
-
 module.exports = app.toTree();
diff --git a/app/app.js b/app/app.js
index 185b649..68d0967 100644
--- a/app/app.js
+++ b/app/app.js
@@ -2,7 +2,6 @@ import Ember from 'ember';
 import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
-import { setCsrfUrl } from 'rails-csrf/config';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
@@ -12,12 +11,10 @@ var App = Ember.Application.extend({
   Resolver: Resolver
 });
 
-setCsrfUrl(config.railsCsrf.csrfURL);
 
 // requirejs('list-view/main');
 
 loadInitializers(App, 'client');
-loadInitializers(App, 'rails-csrf');
 
 // Ember.onerror = function(error) {
 //   console.log('There was an error', error);
diff --git a/app/clients/route.js b/app/clients/route.js
new file mode 100644
index 0000000..2735173
--- /dev/null
+++ b/app/clients/route.js
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+});
diff --git a/app/routes/application.js b/app/routes/application.js
index 154457d..5fabc24 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -7,10 +7,10 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
     return this.csrf.fetchToken();
   },
   actions: {
-    validSignIn: function() {
+    sessionAuthenticationSucceeded: function() {
       this.transitionTo("dashboard");
     },
-    didSignOut: function() {
+    sessionInvalidationSucceeded: function() {
       this.transitionTo("index");
     },
     willTransition: function() {
diff --git a/app/routes/dashboard.js b/app/routes/dashboard.js
index 425dc80..a1724aa 100644
--- a/app/routes/dashboard.js
+++ b/app/routes/dashboard.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
   model: function() {
     return this.store.find('report');
   },
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 8c313eb..121f5b5 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -1,3 +1,5 @@
+@import 'ember-paper';
+
 *, *:before, *:after {
   box-sizing: border-box;
 }
diff --git a/app/templates/clients.hbs b/app/templates/clients.hbs
deleted file mode 100644
index c24cd68..0000000
--- a/app/templates/clients.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{outlet}}
diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs
index e8375b6..6ea0b52 100644
--- a/app/templates/dashboard.hbs
+++ b/app/templates/dashboard.hbs
@@ -14,7 +14,7 @@
         Cartera
       {{/paper-tile-left}}
       {{#paper-tile-content}}
-        {{format-money model.balance}}
+        {{format-money controller.balance}}
       {{/paper-tile-content}}
     {{/paper-item}}
     {{#paper-item}}
@@ -23,7 +23,7 @@
       {{/paper-tile-left}}
       {{paper-divider}}
       {{#paper-tile-content}}
-        {{model.debtors}}
+        {{controller.debtors}}
       {{/paper-tile-content}}
     {{/paper-item}}
   {{/paper-list}}
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index c85a20f..b466f45 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -12,9 +12,9 @@
   {{paper-text label="Password" type="password" value=password}}
   <p>
     {{#paper-button
-      classNames="md-primary"
-      noink=true
-      action="authenticate"}}
+       classNames="md-primary"
+       noink=true
+       action="authenticate"}}
       Guardar
     {{/paper-button}}
   </p>
diff --git a/bower.json b/bower.json
index e34ecfe..3111c1f 100644
--- a/bower.json
+++ b/bower.json
@@ -2,8 +2,8 @@
   "name": "client",
   "dependencies": {
     "jquery": "^1.11.1",
-    "ember": "canary",
-    "ember-data": "canary",
+    "ember": "1.12.0-beta.1",
+    "ember-data": "1.0.0-beta.16.1",
     "ember-resolver": "~0.1.11",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
@@ -16,11 +16,11 @@
     "momentjs": "~2.6.0",
     "chartjs": "1.0.1-beta.3",
     "ember-simple-auth": "0.7.3",
-    "hammerjs": "~2.0.4",
-    "list-view": "emberjs/list-view"
+    "hammerjs": "~2.0.4"
   },
   "resolutions": {
-    "ember": "canary",
-    "ember-data": "canary"
+    "jquery": "^1.11.1",
+    "qunit": "~1.17.1",
+    "ember": "1.12.0-beta.1"
   }
 }
diff --git a/config/environment.js b/config/environment.js
index 1117a52..3777e19 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -52,5 +52,14 @@ module.exports = function(environment) {
     authorizer: 'simple-auth-authorizer:devise'
   };
 
+  ENV.contentSecurityPolicy = {
+    'default-src': "'none'",
+    'script-src': "'self'",
+    'font-src': "'self' https://fonts.gstatic.com",
+    'connect-src': "'self'",
+    'img-src': "'self'",
+    'media-src': "'self'"
+  };
+
   return ENV;
 };
diff --git a/package.json b/package.json
index 936c2f3..4f37fdf 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,9 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.0",
-    "ember-cli": "0.1.14",
+    "broccoli-autoprefixer": "^2.1.0",
+    "broccoli-sass": "^0.6.3",
+    "ember-cli": "0.2.2",
     "ember-cli-6to5": "^3.0.0",
     "ember-cli-app-version": "0.3.1",
     "ember-cli-build-notifications": "0.0.1",
@@ -30,24 +32,23 @@
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.7",
     "ember-cli-simple-auth": "0.7.3",
-    "ember-cli-simple-auth-devise": "^0.7.3",
+    "ember-cli-simple-auth-devise": "0.7.3",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.14.1",
+    "ember-data": "^1.0.0-beta.16.1",
     "ember-export-application-global": "^1.0.2",
-    "ember-paper": "miguelcobain/ember-paper",
+    "ember-paper": "0.0.21",
     "express": "^4.8.5",
-    "glob": "^4.0.5"
+    "glob": "^4.0.5",
+    "rails-csrf": "^2.0.1"
   },
   "dependencies": {
     "broccoli-gzip": "^0.2.0",
-    "broccoli-sass": "^0.1.4",
     "grunt": "~0.4.2",
     "grunt-cli": "~0.1.9",
     "grunt-gitinfo": "^0.1.4",
     "grunt-redis": "^0.1.1",
     "grunt-redis-manifest": "^0.1.3",
     "grunt-s3": "^0.2.0-alpha.3",
-    "http-proxy": "^1.2.0",
-    "rails-csrf": "^1.0.1"
+    "http-proxy": "^1.2.0"
   }
 }
diff --git a/tests/unit/clients/route-test.js b/tests/unit/clients/route-test.js
new file mode 100644
index 0000000..d026170
--- /dev/null
+++ b/tests/unit/clients/route-test.js
@@ -0,0 +1,14 @@
+import {
+  moduleFor,
+  test
+} from 'ember-qunit';
+
+moduleFor('route:clients', {
+  // Specify the other units that are required for this test.
+  // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+  var route = this.subject();
+  assert.ok(route);
+});