diff --git a/app/assets/stylesheets/locomotive/backoffice/application.css.scss b/app/assets/stylesheets/locomotive/backoffice/application.css.scss
index ba3abc3d..4a63465f 100644
--- a/app/assets/stylesheets/locomotive/backoffice/application.css.scss
+++ b/app/assets/stylesheets/locomotive/backoffice/application.css.scss
@@ -262,19 +262,21 @@ ul.list {
     }
 
     &.folder {
+
       li {
         em {
           background-position: left -31px;
           cursor: move;
         }
 
-        &.templatized > strong a {
+        &.templatized > .inner > a {
           padding-right: 24px;
-          background: transparent image-url("locomotive/list/icons/template.png") no-repeat right 3px;
+          background: transparent image-url("locomotive/list/icons/template.png") no-repeat right 2px;
         }
 
-        &.redirect > strong a {
-          background: transparent image-url("locomotive/list/icons/redirect.png") no-repeat right 2px;
+        &.redirect > .inner > a {
+          padding-right: 24px;
+          background: transparent image-url("locomotive/list/icons/redirect.png") no-repeat right 1px;
         }
       } // ul.folder li
     } // ul.folder
diff --git a/app/controllers/locomotive/api/tokens_controller.rb b/app/controllers/locomotive/api/tokens_controller.rb
index 637fd2d0..250279d0 100644
--- a/app/controllers/locomotive/api/tokens_controller.rb
+++ b/app/controllers/locomotive/api/tokens_controller.rb
@@ -1,6 +1,6 @@
 module Locomotive
   module Api
-    class TokensController < BaseController
+    class TokensController < Locomotive::Api::BaseController
 
       skip_before_filter :require_account
 
diff --git a/app/models/locomotive/extensions/page/tree.rb b/app/models/locomotive/extensions/page/tree.rb
index ed308961..a6050536 100644
--- a/app/models/locomotive/extensions/page/tree.rb
+++ b/app/models/locomotive/extensions/page/tree.rb
@@ -19,6 +19,9 @@ module Locomotive
           ## indexes ##
           index :position
           index [:depth.asc, :position.asc]
+
+          ## scopes ##
+          default_scope :where => {} # disable the default_scope from the Mongoid::Tree gem
         end
 
         module ClassMethods
@@ -102,7 +105,8 @@ module Locomotive
         protected
 
         def persist_depth
-          self.attributes[:depth] = self.depth
+          self.attributes['depth'] = self.depth
+          self.depth_will_change!
         end
 
       end