diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 2a2123867..0a0d6ce67 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,23 +1,21 @@
 
 <div class="contextual">
-	<%#= watcher_link(@contestnotification, User.current) %>
 	<%= link_to(l(:button_edit),
-	edit_contest_contestnotification_path(@contestnotification),
+	edit_contest_contestnotification_path(@contest, @contestnotification),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
-	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current%>
-	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if User.current%>
+	:onclick => '$("#edit-contestnotifications").show(); return true;') if User.current %>
+	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if User.current %>
 </div>
 
 <h3><strong><%=h @contestnotification.title %></strong></h3>
 
 <% if authorize_for_contest('contestnotifications', 'edit') %>
 <div id="edit-contestnotifications" style="display:none;">
-	<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
+	<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contest_contestnotification_path(@contestnotifications),
 	:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<%= submit_tag l(:button_save) %>
-	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
 	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
 	<% end %>
 	<div id="preview" class="wiki"></div>