diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 166dfd0ec..298331c69 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -99,7 +99,7 @@ module WatchersHelper
     # 主讲教师不允许退出课程
     return '' if user.id == course.tea_id || course.is_public == 0
     joined = user.member_of_course?(course)
-    text = joined ? l(:label_exit_course) : l(:label_join_course)
+    text = joined ? l(:label_exit_course) : l(:label_new_join)
     url_t = join_path(:object_id => course.id)
     url_f = try_join_path(:object_id => course.id)
     method = joined ? 'delete' : 'post'
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index e26c73195..b67e91d84 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -9,14 +9,15 @@
         (<font color="#CC0000">
         <%= homework_count%>
       </font>)
-        </span><span class="fr">
+        </span>
+      <span class="fr">
         按&nbsp;
-      <%= link_to l(:label_teacher_score), sort_homework_path(@bid, 't_socre', @direction), {:remote => true}%>
-      &nbsp;/&nbsp;
-      <%= link_to l(:label_anonymous_comments), sort_homework_path(@bid, 's_socre', @direction), {:remote => true}%>
-      &nbsp;/&nbsp;
-      <%= link_to l(:label_time), sort_homework_path(@bid, 'time', @direction), {:remote => true}%>
-      &nbsp;<%= l(:label_sort)  %>
+        <%= link_to l(:label_anonymous_comments), sort_homework_path(@bid, 's_socre', @direction), {:remote => true}%>
+        &nbsp;/&nbsp;
+        <%= link_to l(:label_teacher_score), sort_homework_path(@bid, 't_socre', @direction), {:remote => true}%>
+        &nbsp;/&nbsp;
+        <%= link_to l(:label_time), sort_homework_path(@bid, 'time', @direction), {:remote => true}%>
+        &nbsp;<%= l(:label_sort)  %>
       </span>
     </div>
 <% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 929c06846..bb1647a96 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -88,7 +88,7 @@
                   <div id="join_in_course">
                     <% if User.current.logged? %>
                         <% if User.current.allowed_to?(:as_teacher,@course) %>
-                            <%= link_to l(:label_course_modify_settings), {:controller => 'courses', :action => 'settings', :id => @course} %>
+                            <%= link_to l(:button_configure), {:controller => 'courses', :action => 'settings', :id => @course} %>
                             <%= render :partial => 'courses/set_course_time', :locals => {:course => @course} %>
                         <% else %>
                             <%= join_in_course(@course, User.current) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a11ded73a..ddde5ccb7 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1886,7 +1886,7 @@ zh:
     
   label_bids_task_list: 作业列表
   label_join_course: 加入课程
-  label_exit_course: 退出课程
+  label_exit_course: 退出
   label_new_join: 加入
   label_new_course_password: 课程密码
   label_new_course_school: 开课学校