diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 3136c5838..8f48d3857 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -715,13 +715,14 @@ class BidsController < ApplicationController
   
   def update
     @bid = Bid.find(params[:id])
+    @project = @bid.courses.first
     if @bid.update_attributes(params[:bid])
       flash[:notice] = l(:label_update_homework_succeed)
-      @project = Project.find(params[:course_id])
+      #@project = Project.find(params[:course_id])
       redirect_to project_homework_path(@project)
     else
       @bid.safe_attributes = params[:bid]
-      render :action => 'edit'
+      render :action => 'edit', :layout =>'base_courses' ,:bid_id=>@bid.id,:project_id =>@project
     end
   end
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index bddf9d0d4..a42a626dc 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -32,7 +32,7 @@ module ProjectsHelper
             {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
             # {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
             {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
-            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
+            #{:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
             {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
             ]
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
@@ -145,7 +145,7 @@ module ProjectsHelper
   #Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
-            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural, :project_type => 1},
+            #{:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural, :project_type => 1},
             # {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
             {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural}
             ]
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 005f53710..eef2401f8 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -60,7 +60,7 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
   <h3><strong>新开课程</strong></h3>
-  <% if(find_miracle_course(10, 7,params[:school_id]).map.count == 0) %>
+  <% if(find_miracle_course(10, 7,params[:school_id]).count == 0) %>
       <span><%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1, :school_id => nil} %></span>
       <div class="d-p-projectlist-box">
         <ul class="d-p-projectlist">
diff --git a/db/migrate/20140508030039_create_attachmentstypes.rb b/db/migrate/20140508030039_create_attachmentstypes.rb
index c8cfdd9dd..39ee703a7 100644
--- a/db/migrate/20140508030039_create_attachmentstypes.rb
+++ b/db/migrate/20140508030039_create_attachmentstypes.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class CreateAttachmentstypes < ActiveRecord::Migration
   def self.up
     create_table :attachmentstypes do |t|
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 723b93bd6..7b0a0099c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1840,7 +1840,7 @@ a.remove-upload:hover {text-decoration:none !important;}
 
 /*gcm upload file count and deleteall*/
 #upload_file_count #count {color:red; font-size:1.5em;}
-span.add_attachment .remove_all {background:none;background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block;position:absolute;right:21px;text-decoration:none;}
+span.add_attachment .remove_all {background:none;background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block;position:absolute;right:61px;text-decoration:none;}
 
 
 div.fileover { background-color: lavender; }