diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
index acfa20a7c..7e7b10a23 100644
--- a/app/views/contestnotifications/_form.html.erb
+++ b/app/views/contestnotifications/_form.html.erb
@@ -1,11 +1,11 @@
 <%= error_messages_for @contestnotifications %>
 <div class="add_frame_header" >
-	<%= l(:label_news_new) %>
+	<%= l(:bale_news_notice) %>
 </div>
 <div class="box tabular">
 <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
-<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @contestnotifications} %></p>
+
 </div>
 
 <%= wikitoolbar_for 'news_description' %>
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 195257237..563b2d3e1 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -1,8 +1,8 @@
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
-	<%= l(:label_news) %>
+	<%= l(:label_notification) %>
 </span>
 
-<%= link_to(l(:label_news_new),
+<%= link_to(l(:bale_news_notice),
             new_contest_contestnotification_path(@contest),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
                   </tr>
                 </table>
               </td>
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index 634cf64c4..42235dc83 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -2,6 +2,8 @@
 <%= labelled_form_for @contestnotification, :url => contest_contestnotifications_path(@contest), :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
   <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%= preview_link preview_contest_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+  <%#= preview_link preview_contest_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+  <%= submit_tag l(:button_cancel), :comfirm=> "are you sure", :class => "whiteButton m3p10 h30",:onclick => "cancel();" %>
+
 <% end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 4a200d457..5aedbf011 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,6 +1,6 @@
 
 <div class="contextual">
-	<%= watcher_link(@contestnotification, User.current) %>
+	<%#= watcher_link(@contestnotification, User.current) %>
 	<%= link_to(l(:button_edit),
 	edit_contest_contestnotification_path(@contestnotification),
 	:class => 'icon icon-edit',
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 4e0135eaa..dfdf0a102 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -234,7 +234,7 @@
   <div class="tabs_new">
     <ul>
       <li>
-        <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview) %>
+        <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overviews) %>
       </li>
       <li>
         <%= link_to l(:label_homework), homework_project_path(@project), :class => link_class(:homework), :project_type => 1 %>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index a4522d289..e1706b00c 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -213,12 +213,11 @@
 						
 						<div id="content">
 							<% if display_main_menu?(@contest) %>
-							<div class="tabs_new">
-								<%#= render_menu :contest_menu %>
+							<div class="tabs_new">			
 								<ul>								
-									<li><a><%= link_to l(:label_user_response), show_contest_contest_path(@contest)%></a></li>
-									<li><a><%= link_to l(:label_attending_contest), show_attendingcontest_contest_path(@contest)%></a></li>
-									<li><a><%= link_to l(:label_contest_notification),  contest_contestnotifications_path(@contest)%></a></li>
+									<li ><%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %></li>
+									<li><%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %></li>
+									<li><%= link_to l(:label_contest_notification),  contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %></li>
 								</ul>								
 							</div>
 							<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 43c24d30b..121810072 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1560,7 +1560,11 @@ en:
   label_course_file: File
   label_stores_index: Resource search
   label_course_news: News
-  
+  #wang
+  label_contest_userresponse: Userresponse
+  label_contest_joincontest: Joincontest
+  label_contest_notification: Notification
+  #end
   label_x_base_courses_member: 
     zero: member
     one: member
@@ -1753,7 +1757,7 @@ en:
   label_copyright: Copyright
   label_contact_us: Contact us
   label_record: 湘ICP备09019772
-  
+  label_check_comment: Check comment
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 027fa726b..ad500d46c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1698,6 +1698,11 @@ zh:
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
   label_fork_homework_new: 选为作业
+  #wang
+  label_contest_userresponse: 用户留言
+  label_contest_joincontest: 参入竞赛
+  label_contest_notification: 竞赛通知
+  #end
   
   label_x_course_data: 
     zero: 资料
@@ -1987,6 +1992,7 @@ zh:
   label_copyright: 版权
   label_contact_us: 联系我们
   label_record: 湘ICP备09019772
+  label_check_comment: 查看通知评论
   #end  
 
   #end