diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e68085109..68367e68c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -426,7 +426,7 @@ class ApplicationController < ActionController::Base
   #
   # @return [boolean, string] name of the layout to use or false for no layout
   def use_layout
-    request.xhr? ? false : 'base'
+     request.xhr? ? false : 'base'
   end
 
   def invalid_authenticity_token
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index c8f8bbbd7..2b6797b4f 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -51,6 +51,6 @@ class CalendarsController < ApplicationController
       @calendar.events = events
     end
 
-    render :action => 'show', :layout => 'base_projects'
+    render :action => 'show', :layout => 'base_projects'#by young
   end
 end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 8daba49c6..83ba62ab0 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DocumentsController < ApplicationController
-  layout 'base_projects'
+  layout 'base_projects'#by young
   default_search_scope :documents
   model_object Document
   before_filter :find_project_by_project_id, :only => [:index, :new, :create]
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 468ad72e5..cb4c1b8ff 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class FilesController < ApplicationController
-  layout 'base_projects'
+  layout 'base_projects'#by young
   menu_item :files
 
   before_filter :find_project_by_project_id
diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb
index a7d4039db..e404ed425 100644
--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -40,7 +40,7 @@ class GanttsController < ApplicationController
     basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
 
     respond_to do |format|
-      format.html { render :action => "show", :layout => 'base_projects' }
+      format.html { render :action => "show", :layout => 'base_projects' }#by young
       format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
       format.pdf  { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => "#{basename}.pdf") }
     end
diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index 371d9379b..a716653a5 100644
--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -43,7 +43,7 @@ class IssueCategoriesController < ApplicationController
     @category.safe_attributes = params[:issue_category]
 
     respond_to do |format|
-      format.html{render :layout => 'base_projects'}
+      format.html{render :layout => 'base_projects'}# by young
       format.js
     end
   end
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 1002438bb..91da55dda 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class NewsController < ApplicationController
-  layout 'base_projects'
+  layout 'base_projects'# by young
   default_search_scope :news
   model_object News
   before_filter :find_model_object, :except => [:new, :create, :index]
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ccd90474e..64a50fd7a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class ProjectsController < ApplicationController
-  layout 'base_projects'
+  layout 'base_projects'# by young
   menu_item :overview
   menu_item :roadmap, :only => :roadmap
 #  menu_item :settings, :only => :settings
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 2b7d485f5..65f58da00 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -32,7 +32,7 @@ require 'diff'
 #
 # TODO: still being worked on
 class WikiController < ApplicationController
-  layout 'base_projects'
+  layout 'base_projects'#by young
   default_search_scope :wiki_pages
   before_filter :find_wiki, :authorize
   before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index d1798971d..f9ecbc54f 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -28,8 +28,9 @@
         <%= yield %>
         <%= call_hook :view_layouts_base_content %>
         <div style="clear:both;"></div>
+        <%=render :partial => 'layouts/base_footer'%>
     </div>
-    <%=render :partial => 'layouts/base_footer'%>
+    
 </div>
 </div>
 
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 2c8edd908..abf8cd922 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -241,7 +241,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
   menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
 end
-
+#by young
 Redmine::MenuManager.map :project_menu do |menu|
   menu.push :overview, { :controller => 'projects', :action => 'show' }
 #  menu.push :activity, { :controller => 'activities', :action => 'index' }
@@ -263,6 +263,7 @@ Redmine::MenuManager.map :project_menu do |menu|
               :if => Proc.new { |p| p.repository && !p.repository.new_record? }
   menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
 end
+#end
 #added by young
 Redmine::MenuManager.map :user_menu do |menu|
   menu.push :activity, {:controller => 'users', :action => 'show' }
diff --git a/public/images/avatars/User/1 b/public/images/avatars/User/1
index fa4fd4110..cde21f595 100644
Binary files a/public/images/avatars/User/1 and b/public/images/avatars/User/1 differ
diff --git a/public/images/avatars/User/4859 b/public/images/avatars/User/4859
index 2659a14b7..494be09b8 100644
Binary files a/public/images/avatars/User/4859 and b/public/images/avatars/User/4859 differ