diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 68367e68c..2a4b5fb53 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -25,6 +25,9 @@ class ApplicationController < ActionController::Base
   include Redmine::Pagination
   include RoutesHelper
   helper :routes
+  
+  #added by william
+  helper :watchers
 
   class_attribute :accept_api_auth_actions
   class_attribute :accept_rss_auth_actions
@@ -49,6 +52,7 @@ class ApplicationController < ActionController::Base
   include Redmine::MenuManager::MenuController
   helper Redmine::MenuManager::MenuHelper
 
+
   def session_expiration
     if session[:user_id]
       if session_expired? && !try_to_autologin
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 54befe296..781074403 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -50,8 +50,11 @@ class ProjectsController < ApplicationController
   helper :members
   helper :activities
   helper :documents
+  
   helper :watchers
   
+  ### added by william
+  include ActsAsTaggableOn::TagsHelper
 
   # Lists visible projects
 #  def index
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e41f1dc75..8092af2d0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -35,9 +35,6 @@ class UsersController < ApplicationController
   ### added by william
   include ActsAsTaggableOn::TagsHelper
 
-  helper :watchers
-  helper :activities
-
   #  fq
   helper :words
   #added by young
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b586b313a..40c9117b1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,7 +26,12 @@ module ApplicationHelper
   include GravatarHelper::PublicMethods
   include Redmine::Pagination::Helper
   include AvatarHelper
-
+  
+   ### added by william
+  include ActsAsTaggableOn::TagsHelper
+  # include WatchersHelper
+  
+  
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 88a10395f..d51d8ce58 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -34,6 +34,9 @@
 											<td align="center">
 												<div class="info_font"><%= textilizable @project.name %></div>
 												<div>
+													<% if @project.watched_by?(User.current) %>															
+													   <%= watcher_link(@project, User.current) %>	
+													<% end %>
 												</div>
 											</td>										
 											</tr>																																								
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 06fd2db76..76ad7ef60 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -106,7 +106,7 @@
 						</div>
 						
     					<div id="content" style="padding-top: 0px;">
-    					     <div class="tabs_new">
+    					     <div class="tabs">
         						<%= render_menu :user_menu %>
     					     </div>
     							<%= yield %>