diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index ad7443ab5..85276ca46 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -42,7 +42,7 @@ class AccountController < ApplicationController
       redirect_to home_url
     elsif request.post?
       logout_user
-      redirect_to home_url
+      redirect_to signin_path
     end
     # display the logout form
   end
diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
index b0ccee89a..1ba801df0 100644
--- a/app/views/documents/index.html.erb
+++ b/app/views/documents/index.html.erb
@@ -1,5 +1,11 @@
 <div class="contextual">
-<%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
+  <%= l(:label_documents_sort) %>
+  <%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %>
+  <%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %>
+  <%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %>
+  <%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %>
+  |
+  <%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
       :onclick => 'showAndScrollTo("add-document", "document_title"); return false;' if User.current.allowed_to?(:add_documents, @project) %>
 </div>
 
@@ -21,14 +27,6 @@
 <% @grouped.keys.sort.each do |group| %>
     <!-- <h3><%= group %></h3> -->
     <%= render :partial => 'documents/document', :collection => @grouped[group] %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <h3><%= l(:label_sort_by, '') %></h3>
-  <%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %><br />
-  <%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %><br />
-  <%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %><br />
-  <%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %>
-<% end %>
+<% end %> 
 
 <% html_title(l(:label_document_plural)) -%>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 4defbc091..f15fbf6b1 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -48,7 +48,7 @@
 			<%= pagination_links_full @events_pages%>
 		</ul>
     </div>
-</div>
+</div> 
 </div>
 
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2b496b27c..dfed39345 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -500,10 +500,12 @@ zh:
   lastest_respond: 最新反馈
   label_respond_view_all: 其他120个反馈
   label_news_lastest: 最新动态
-  label_versions_settings: 显示配置
+  label_versions_settings: 显示设置
   label_versions_progress: 完成进度
   label_versions_description: 版本描述
   label_my_photo: 我的头像
+  label_documents_sort: 排序设置：
+  label_activities_settings: 显示设置
   #end
   label_my_page: 我的工作台
   label_my_account: 我的帐号
diff --git a/public/images/avatars/User/4859 b/public/images/avatars/User/4859
index 494be09b8..78704a099 100644
Binary files a/public/images/avatars/User/4859 and b/public/images/avatars/User/4859 differ