diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee
index 26baa655c..ba180df23 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.coffee
@@ -133,7 +133,7 @@ class App.Controller extends Spine.Controller
   updateNavMenu: =>
     delay = ->
       App.Event.trigger('menu:render')
-    @delay(delay, 200)
+    @delay(delay, 150)
 
   scrollTo: (x = 0, y = 0, delay = 0) ->
     a = ->
diff --git a/app/assets/javascripts/app/controllers/logout.coffee b/app/assets/javascripts/app/controllers/logout.coffee
index 0f72df7de..73b9fd04e 100644
--- a/app/assets/javascripts/app/controllers/logout.coffee
+++ b/app/assets/javascripts/app/controllers/logout.coffee
@@ -4,10 +4,5 @@ class Index extends App.ControllerContent
 
     App.Auth.logout()
 
-    # redirect to login
-    redirect = =>
-      @navigate 'login'
-    @delay redirect, 100
-
 App.Config.set('logout', Index, 'Routes')
 App.Config.set('Logout', { prio: 1800, parent: '#current_user', name: 'Sign out', translate: true, target: '#logout', divider: true, iconClass: 'signout', role: [ 'Agent', 'Customer' ] }, 'NavBarRight')
diff --git a/app/assets/javascripts/app/lib/app_post/auth.coffee b/app/assets/javascripts/app/lib/app_post/auth.coffee
index 6d69c0bae..7e3599026 100644
--- a/app/assets/javascripts/app/lib/app_post/auth.coffee
+++ b/app/assets/javascripts/app/lib/app_post/auth.coffee
@@ -141,6 +141,7 @@ class App.Auth
 
     App.Event.trigger('auth')
     App.Event.trigger('auth:logout')
+    window.location.href = '#login'
     if rerender
       App.Event.trigger('ui:rerender')
     App.Event.trigger('clearStore')
diff --git a/app/assets/javascripts/app/views/object_manager/index.jst.eco b/app/assets/javascripts/app/views/object_manager/index.jst.eco
index d934bcee3..216b1b7f2 100644
--- a/app/assets/javascripts/app/views/object_manager/index.jst.eco
+++ b/app/assets/javascripts/app/views/object_manager/index.jst.eco
@@ -68,6 +68,8 @@
             <%- @T('will be created') %>
           <% else if item.to_delete is true: %>
             <%- @T('will be deleted') %>
+          <% else if item.to_migrate is true || item.to_config is true: %>
+            <%- @T('has changed') %>
           <% else if item.editable isnt false: %>
             <a href="#" class="js-delete" title="<%- @Ti('Delete') %>"><%- @Icon('trash') %></a>
           <% end %>
diff --git a/app/assets/javascripts/app/views/widget/organization.jst.eco b/app/assets/javascripts/app/views/widget/organization.jst.eco
index 15ef6c5e8..5935cfdc6 100644
--- a/app/assets/javascripts/app/views/widget/organization.jst.eco
+++ b/app/assets/javascripts/app/views/widget/organization.jst.eco
@@ -11,10 +11,10 @@
   <% if @organization[row.name] || row.name is 'note': %>
     <div class="sidebar-block">
     <% if row.tag isnt 'richtext': %>
-      <label><%- @T( row.display ) %></label>
-      <%- @P( @organization, row.name ) %>
+      <label><%- @T(row.display) %></label>
+      <%- @P(@organization, row.name) %>
     <% else: %>
-      <label><%- @T( row.display ) %></label>
+      <label><%- @T(row.display) %></label>
       <div contenteditable="true" data-name="<%= row.name %>" data-type="update-org" data-placeholder="<%- @Ti('Add a Note') %>"><%- @organization[row.name] %></div>
     <% end %>
     </div>
diff --git a/app/assets/javascripts/app/views/widget/user.jst.eco b/app/assets/javascripts/app/views/widget/user.jst.eco
index 21e9f079f..ddb220bad 100644
--- a/app/assets/javascripts/app/views/widget/user.jst.eco
+++ b/app/assets/javascripts/app/views/widget/user.jst.eco
@@ -6,10 +6,10 @@
   <% if @user[row.name] || row.name is 'note': %>
     <div class="sidebar-block">
     <% if row.tag isnt 'richtext': %>
-      <label><%- @T( row.display ) %></label>
-      <%- @P( @user, row.name ) %>
+      <label><%- @T(row.display) %></label>
+      <%- @P(@user, row.name) %>
     <% else: %>
-      <label><%- @T( row.display ) %></label>
+      <label><%- @T(row.display) %></label>
       <div contenteditable="true" data-name="<%= row.name %>" data-type="update" data-placeholder="<%- @Ti('Add a Note') %>"><%- @user[row.name] %></div>
     <% end %>
     </div>
diff --git a/app/models/store/file.rb b/app/models/store/file.rb
index 7aca3cf8e..c5b1ac861 100644
--- a/app/models/store/file.rb
+++ b/app/models/store/file.rb
@@ -9,11 +9,11 @@ class Store
 
 add new file to store
 
-    store_file_id = Store::File.add(binary_data)
+  store_file_id = Store::File.add(binary_data)
 
 do also verify of written data
 
-    store_file_id = Store::File.add(binary_data, true)
+  store_file_id = Store::File.add(binary_data, true)
 
 =end
 
@@ -51,9 +51,9 @@ do also verify of written data
 
 read content of a file
 
-    store = Store::File.find(123)
+  store = Store::File.find(123)
 
-    store.content # returns binary
+  store.content # returns binary
 
 =end
 
@@ -66,13 +66,13 @@ read content of a file
 
 file system check of store, check data and sha (in case fix it)
 
-    Store::File.verify
+  Store::File.verify
 
 read each file which should be in backend and verify agsinst sha hash
 
 in case of fixing sha hash use:
 
-    Store::File.verify(true)
+  Store::File.verify(true)
 
 =end