diff --git a/app/views/admin/assets/_sort_headers.html.erb b/app/views/admin/assets/_sort_headers.html.erb
index 85cb5df5c..e69de29bb 100644
--- a/app/views/admin/assets/_sort_headers.html.erb
+++ b/app/views/admin/assets/_sort_headers.html.erb
@@ -1,7 +0,0 @@
-<%= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
- ['title', 'title','span4', :title],
-													['description', 'description', 'span1-2', :data],
-													['intro', 'intro', 'span1-2', :type],
-													['intro', 'intro', 'span1-2', :size],
-													['intro', 'intro', 'span1-2', :description],
-													['intro', 'intro', 'span1-2', :tags]).html_safe %>
diff --git a/app/views/admin/designs/_sort_headers.html.erb b/app/views/admin/designs/_sort_headers.html.erb
index b66114c9b..e69de29bb 100644
--- a/app/views/admin/designs/_sort_headers.html.erb
+++ b/app/views/admin/designs/_sort_headers.html.erb
@@ -1,5 +0,0 @@
-<%=# render_sort_bar(true, delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
- ['title', 'title','span2', :title],
-                          ['', '', 'span1', :default],
-                          ['intro', 'intro', 'span7', :intro],
-													['author', 'author', 'span2', :author]).html_safe %>
diff --git a/app/views/admin/items/_site_bar.html.erb b/app/views/admin/items/_site_bar.html.erb
index eef5c3239..0a83994bd 100644
--- a/app/views/admin/items/_site_bar.html.erb
+++ b/app/views/admin/items/_site_bar.html.erb
@@ -20,7 +20,7 @@
 
 				<li title="Modules"><%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><span><i class="icons-layout"></i></span><%end%></li>
 
-				<li title="Templates"><%= link_to admin_template_store_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
+				<li title="Templates"><%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
 
 
 				<li title="Site Info"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb
index f2a63ce11..5ddb07e5c 100644
--- a/app/views/admin/sites/_side_bar.html.erb
+++ b/app/views/admin/sites/_side_bar.html.erb
@@ -9,7 +9,7 @@
 
 				<li title="Modules"><%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><span><i class="icons-layout"></i></span><%end%></li>
 
-				<li title="Templates"><%= link_to admin_template_store_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
+				<li title="Templates"><%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
 
 
 				<li title="Site Info"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb
index 26c427933..015c6de76 100644
--- a/app/views/admin/sites/preference.html.erb
+++ b/app/views/admin/sites/preference.html.erb
@@ -130,7 +130,7 @@
                   <div class="control-group">
                     <label class="control-label muted">Disable personal desktop</label>
                     <div class="controls">
-                      <%= f.check_box :desktop_open , :class=>"toggle-check" %>
+                      <%= f.check_box :desktop_closed , :class=>"toggle-check" %>
                     </div>
                   </div>
 
diff --git a/app/views/admin/users_new_interface/_sort_headers.html.erb b/app/views/admin/users_new_interface/_sort_headers.html.erb
index e7e4b4629..e69de29bb 100644
--- a/app/views/admin/users_new_interface/_sort_headers.html.erb
+++ b/app/views/admin/users_new_interface/_sort_headers.html.erb
@@ -1,7 +0,0 @@
-<%#= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
- ['title', 'title','span4', 'title'],
-                          ['description', 'description', 'span1-2', 'data'],
-                          ['intro', 'intro', 'span1-2', 'file_type'],
-                          ['intro', 'intro', 'span1-2', 'file_length'],
-                          ['intro', 'intro', 'span1-2', 'description'],
-                          ['intro', 'intro', 'span1-2', 'tags']).html_safe %>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb
index 34552e76d..e69de29bb 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_sort_headers.html.erb
@@ -1,6 +0,0 @@
-<%= render_sort_bar(true, delete_panel_archive_back_end_archive_files_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
-	['sort_number', 'sort_number', 'span1', :sort_number],
-	['status', ['is_top', 'is_hot', 'is_hidden'], 'span1', :status],
-	['category', 'archive_file_category', 'span2', :category],
-	['title', 'title','span3', :title],
-	['tags', 'tags', 'span2', :tags]).html_safe %>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb
index 6ba238c13..e69de29bb 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb
@@ -1,4 +0,0 @@
-<%= render_sort_bar(false, nil, ['name', 'page','span7', :name],
-													['version', 'version', 'span2', :version],
-													['update_time', 'updated_at', 'span2', :update_at],
-													['last_modified', 'update_user_id', 'span2', :last_modified]).html_safe %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb
index dcfb35c0d..e69de29bb 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_sort_headers.html.erb
@@ -1,4 +0,0 @@
-<%= render_sort_bar(true, delete_panel_personal_book_back_end_writing_books_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
-	['year', 'year', 'span1', 'writing_book.year'],
-	['title', 'title','span3', 'writing_book.title'],
-	['create_modified', 'create_user_id','span1-3', 'writing_book.create_modified']).html_safe %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb
index 9f1aad8ba..e69de29bb 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_sort_headers.html.erb
@@ -1,3 +0,0 @@
-<%= render_sort_bar(true, delete_panel_personal_book_back_end_writing_books_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
-	['year', 'year', 'span1', 'writing_book.year'],
-	['title', 'title','span3', 'writing_book.title']).html_safe %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb
index 29fb20561..e69de29bb 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb
@@ -1,4 +0,0 @@
-<%= render_sort_bar(true, delete_panel_personal_conference_back_end_writing_conferences_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
-	['year', 'year', 'span1', 'writing_conference.year'],
-	['title', 'title','span3', 'writing_conference.title'],
-	['create_modified', 'create_user_id','span1-3', 'writing_conference.create_modified']).html_safe %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb
index 0951e9d85..e69de29bb 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb
@@ -1,3 +0,0 @@
-<%= render_sort_bar(true, delete_panel_personal_conference_back_end_writing_conferences_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
-	['year', 'year', 'span1', 'writing_conference.year'],
-	['title', 'title','span3', 'writing_conference.title']).html_safe %>
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb
index 06abaaa71..e69de29bb 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_sort_headers.html.erb
@@ -1,4 +0,0 @@
-<%= render_sort_bar(true, delete_panel_personal_diploma_back_end_diplomas_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
-	['date', 'date', 'span1', 'diploma.date'],
-	['school_name', 'school_name', 'span3', 'diploma.school_name'],
-	['create_modified', 'create_user_id','span1-3', 'diploma.create_modified']).html_safe %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb
index 4a56b5376..e69de29bb 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_sort_headers.html.erb
@@ -1,3 +0,0 @@
-<%= render_sort_bar(true, delete_panel_personal_diploma_back_end_diplomas_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
-	['date', 'date', 'span1', 'diploma.date'],
-	['school_name', 'school_name', 'span3', 'diploma.school_name']).html_safe %>
\ No newline at end of file