diff --git a/app/views/results/common/_file_selector.html.erb b/app/views/results/common/_file_selector.html.erb
index 5a97e0cade..eeb7cd4f3c 100644
--- a/app/views/results/common/_file_selector.html.erb
+++ b/app/views/results/common/_file_selector.html.erb
@@ -1,7 +1,7 @@
 <% # Make sure to include the public/javascripts/Grader/file_selector.js
    # file when using this partial
 %>
-<%= form_tag({:action => "download"}, {:id => "grader_view_file_selector_form"}) if can_download %>
+<%= form_tag({:action => "download"}, {:id => "grader_view_file_selector_form"}) do %>
   <%= label_tag "select_file_id", I18n.t("common.submission_file"), :class => "inline_label" %>
   <input type="button" onclick="bump_select($('select_file_id'), -1); return false;" value="<-" />
   <select id="select_file_id" name="select_file_id" onchange="if ($(this).getValue() != '') { load_submitted_file($(this).getValue()); }">
@@ -22,3 +22,4 @@
   <%= label_tag("include_annotations", I18n.t("marker.include_annotations"), :class => "inline_label") if can_download && !files.empty? %>
    <%= check_box_tag("include_annotations", true, false, :id => "include_annotations", :class => "inline_checkbox") if can_download && !files.empty? %>
 
+<% end %>
\ No newline at end of file
diff --git a/app/views/results/common/_rubric_criterion.html.erb b/app/views/results/common/_rubric_criterion.html.erb
index 1ec772b13d..b012b5a4f6 100644
--- a/app/views/results/common/_rubric_criterion.html.erb
+++ b/app/views/results/common/_rubric_criterion.html.erb
@@ -7,7 +7,7 @@ class="mark_criterion_title_div_level" class="float_left">
 <% if old_mark and !old_mark.mark.nil? %>
 <div id="<%="mark_criterion_title_#{mark.id}_oldmark"%>" class="padding_left_old">
   <strong>
-    <%= I18n.t("marker.marks.old") %>
+    <%= I18n.t("marker.marks.old").html_safe %>
     <%= h(old_mark.mark) %>: <%= h(mark_criterion["level_" + old_mark.mark.to_i.to_s + "_name"]) %>&nbsp;
   </strong>
   <%= h(mark_criterion["level_" + old_mark.mark.to_i.to_s + "_description"]) %>
diff --git a/app/views/results/edit.html.erb b/app/views/results/edit.html.erb
index b86ce72052..d79305d408 100644
--- a/app/views/results/edit.html.erb
+++ b/app/views/results/edit.html.erb
@@ -7,7 +7,9 @@
 <% # UI LIBRARIES %>
 <%= javascript_include_tag "livepipe/livepipe.js",
   "livepipe/window.js",
-  "livepipe/tabs.js" %>
+  "livepipe/tabs.js",
+  "effects.js",
+  "dragdrop.js" %>
 
 <%= javascript_include_tag "effects.js" %>
 <%= javascript_include_tag "controls.js" %>
diff --git a/app/views/results/marker/_marker_summary.html.erb b/app/views/results/marker/_marker_summary.html.erb
index a553e146fb..42a80cbf9b 100644
--- a/app/views/results/marker/_marker_summary.html.erb
+++ b/app/views/results/marker/_marker_summary.html.erb
@@ -38,7 +38,7 @@
     </div>
       <div class="clear"></div>
       <div class="summary_block">
-      <b class="total_extra_points_label"><%= I18n.t("marker.marks.total_extra_marks") %></strong>
+      <b class="total_extra_points_label"><%= I18n.t("marker.marks.total_extra_marks").html_safe %></strong>
       <span id="total_extra_points"><%= h(result.get_total_extra_points) %></span><br/>
       </div>
       <div class="clear"></div>
@@ -50,7 +50,7 @@
   </div>
   <div class="clear"></div>
   <div class="summary_block">
-      <strong><%= I18n.t("marker.marks.total_extra_percentages") %></strong>
+      <strong><%= I18n.t("marker.marks.total_extra_percentages").html_safe %></strong>
       <span id="total_extra_percentage"><%= h(result.get_total_extra_percentage) %></span><br />
       <strong><%= I18n.t("marker.marks.translated_to_points") %></strong>
       <span id="total_extra_percentage_as_points"><%= h(result.get_total_extra_percentage_as_points)%></span> <br />
@@ -65,7 +65,7 @@
           <span> / <%= h(assignment.total_mark) %>  </span>
         </span>
 
-        <span><%= I18n.t("marker.marks.previous_mark") %></span>
+        <span><%= I18n.t("marker.marks.previous_mark").html_safe  %></span>
       </div>
     <% end %>
 
@@ -75,5 +75,5 @@
         <span> / <%= h(assignment.total_mark) %>  </span>
       </span>
 
-      <span><%= I18n.t("marker.marks.final_mark") %></span>
+      <span><%= I18n.t("marker.marks.final_mark").html_safe  %></span>
     </div>
diff --git a/app/views/results/marker/_overall_comment.html.erb b/app/views/results/marker/_overall_comment.html.erb
index 085fb5fbc1..c7bdde1791 100644
--- a/app/views/results/marker/_overall_comment.html.erb
+++ b/app/views/results/marker/_overall_comment.html.erb
@@ -5,6 +5,6 @@
        <div>
          <%= f.submit t(:save_changes), :disabled => true, :id => "overall_comment_submit" %>
        </div>
-      <% end -%>
+      <% end %>
   </div>
 </div>
diff --git a/app/views/results/student/_student_summary.html.erb b/app/views/results/student/_student_summary.html.erb
index 7615f83290..416dd48828 100644
--- a/app/views/results/student/_student_summary.html.erb
+++ b/app/views/results/student/_student_summary.html.erb
@@ -37,7 +37,7 @@
                :locals => {:extra_marks_points => extra_marks_points, :result_id => result.id} %>
 
       <div>
-        <div class="float_left"><strong><%= I18n.t("marker.marks.bonus_marks") %></strong></div>
+        <div class="float_left"><strong><%= I18n.t("marker.marks.bonus_marks").html_safe %></strong></div>
         <div class="float_left" id="extra_marks_bonus"><%= h(result.get_positive_extra_points) %></div>
       </div>
       <div class="clear"></div>
diff --git a/config/routes.rb b/config/routes.rb
index 6b2e57750d..b014f68f71 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -128,26 +128,27 @@
 
       resources :results do
         collection do
-          get 'update_mark'
-          get 'expand_criteria'
+          post 'update_mark'
+          post 'expand_criteria'
         end
 
         member do
           get 'add_extra_marks'
           get 'add_extra_mark'
           get 'download'
+          post 'download'
           get 'cancel_remark_request'
           get 'codeviewer'
           post 'codeviewer'
-          get 'collapse_criteria'
-          get 'add_extra_mark'
+          post 'collapse_criteria'
+          post 'add_extra_mark'
           get 'next_grouping'
-          get 'remove_extra_mark'
-          get 'expand_unmarked_criteria'
+          post 'remove_extra_mark'
+          post 'expand_unmarked_criteria'
           get 'set_released_to_students'
-          get 'update_overall_comment'
-          get 'update_overall_remark_comment'
-          get 'update_marking_state'
+          post 'update_overall_comment'
+          post 'update_overall_remark_comment'
+          post 'update_marking_state'
           get 'update_remark_request'
           get 'render_test_result'
           get 'update_positions'