diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8956a95cc..6fac67e33 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -29,7 +29,7 @@ module ApplicationHelper
   ## added by william
   include PraiseTreadHelper
   # add by nyan
-  include CoursesHelper
+  # include CoursesHelper
 
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 6f1a4bb82..dc7724e95 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -1,18 +1,17 @@
+<h3><!-- %=l(:label_attachment_plural)%></h3 -->
+
+<div class="contextual" style="float:left;padding-top: 5px;">
 <% if @project.project_type == 1 %>
-<div class="contextual" style="padding-right: 540px;padding-top: 5px;">
 	<% if User.current.member_of?(@project) %>
   <!-- %= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) % -->
   <%= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.member_of?(@project) %>
   <% end %>
 </div>
 <% else %>
-<div class="contextual" style="padding-right: 540px;padding-top: 5px;">
   <%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
   <!-- %= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.member_of?(@project) % -->
-</div>	
 <% end %>
-
-<h3><%=l(:label_attachment_plural)%></h3>
+</div>  
 
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
 
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 47cecb863..b90edfd60 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,6 +1,7 @@
 <!--add by huang-->
-<h3 style="padding-top:0px;"><%= l(:field_issue) %>
-<div style="padding-bottom: 10px;padding-right:440px;float:right;font-size:11px;">
+<h3 style="padding-top:0px;"><!--%= l(:field_issue) %-->
+<!-- div style="padding-bottom: 10px;padding-right:440px;float:right;font-size:11px;" -->
+<div style="padding-bottom: 10px;font-size:11px;">
 	<%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %>
 </div>
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index 3422f4d9a..08495e5e3 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -4,6 +4,8 @@
 		<meta charset="utf-8" />
 		<meta name="description" content="<%= Redmine::Info.app_name %>" />
 		<meta name="keywords" content="issue,bug,tracker" />
+		<title><%=h l(:label_active_homework) << " - Trustie" %></title>
+
 		<%= csrf_meta_tag %>
 		<%= favicon %>
 		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index b2ba11134..4464f3945 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,7 +1,7 @@
 <p>
 	<% if @events_by_day.size >0 %>
 	<div style="padding-left: 8px">
-		<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
+		<h3><!-- %= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe % --></h3>
 		<p class="subtitle">
 			<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
 		</p>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 2eef3f356..8921d63f8 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -3,7 +3,7 @@
   <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
 </div>
 
-<h3 style="padding-top:0px;padding-bottom: 0px;"><%=l(:label_roadmap)%></h3>
+<h3 style="padding-top:0px;padding-bottom: 0px;"><!-- %=l(:label_roadmap)% --></h3>
 <!--check boxes-->
 <fieldset id="filters" class="collapsible collapsed" style="background-color: #FFF">
 	<legend><%= l(:label_version_display_settings)%></legend>