diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6ac7d3a31..ae8cb9870 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -17,8 +17,9 @@
 class UsersController < ApplicationController
   layout 'base_users'
 
-  before_filter :require_admin, :except => [:show, :index,:tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist]
-  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info]
+  before_filter :require_admin, :except => [:show, :index,:tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist,:edit]
+  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, 
+                                  :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info]
   accept_api_auth :index, :show, :create, :update, :destroy
   
   #william
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 8aa4e5803..23927392f 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -40,7 +40,7 @@
 															<% unless User.current == @user %>															
 															  <%= watcher_link(@user, User.current) %>														
 															<% else %>
-															<%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %></td>
+															<%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current %><% end %></td>
 													</tr>
 												</table></td>
 											</tr>
diff --git a/public/images/sidebar/tool_tag2.png b/public/images/sidebar/tool_tag2.png
new file mode 100644
index 000000000..3c14e5ebb
Binary files /dev/null and b/public/images/sidebar/tool_tag2.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ca1064e76..1ecc265a9 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -11,16 +11,6 @@ h4 {border-bottom: 1px dotted #bbb;}
 
 /*new by huang*/
 /**/
-.footer_color{
-	background-image: -moz-linear-gradient(top,#BBBBBB,#FFFFEC);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#15bccf));
-	background-image: -webkit-linear-gradient(top,#ffffff,#15bccf);
-	background-image: -o-linear-gradient(top,#ffffff,#15bccf);
-	background-image: linear-gradient(to bottom,#ffffff,#15bccf);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)
-}
-
 ul.list_watch{list-style-type:none;
 			  height:auto;
 			  border-bottom: 1px dashed rgb(204, 204, 204);
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 4c8c5ec1d..46f1a8fbb 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -376,12 +376,13 @@ ul.projects li.root
 
 #top-menu ul
 {
-	padding:0 1px   /*控制顶层导航宽度*/
+	padding:0px 1px   /*控制顶层导航宽度*/
 }
 
 #top-menu li,#top-menu #loggedas
 {
 	/*by young*/
+	padding-top: 4px;
 	color:#fff;
 	line-height:21px;
 	margin-right:4px