diff --git a/app/views/challenge_assignments/_assignment_blurb.html.erb b/app/views/challenge_assignments/_assignment_blurb.html.erb
index e4d9772..5d50c96 100755
--- a/app/views/challenge_assignments/_assignment_blurb.html.erb
+++ b/app/views/challenge_assignments/_assignment_blurb.html.erb
@@ -52,12 +52,10 @@
   <% unless assignment.fulfilled? %>
     <ul class="actions" role="menu">
       <% if @user && @user == current_user %>
-        <li><%= link_to t("challenge_assignments.to_fulfill.button"), new_collection_work_path(assignment.collection, assignment_id: assignment.id) %></li>
-        <li>
-          <%= button_to t("challenge_assignments.to_default.button"),
-                default_collection_assignment_path(assignment.collection, assignment),
-                data: { confirm: t("challenge_assignments.to_default.confirmation") },
-                method: :patch %>
+        <li>        <li><%= link_to ts("Fulfill"), new_collection_work_path(assignment.collection, :assignment_id => assignment.id) %></li>
+        <li role="button">
+          <%= link_to ts("Default"), default_collection_assignment_path(assignment.collection, assignment),
+              data: {confirm: ts("Are you sure? This will mark you as having defaulted and notify the collection maintainer! It cannot be undone.")} %>
         </li>
       <% elsif @collection && @collection.user_is_maintainer?(current_user) %>
         <%= fields_for "challenge_assignments[]", assignment do |assignment_form| %>
diff --git a/app/views/challenge_assignments/_maintainer_index.html.erb b/app/views/challenge_assignments/_maintainer_index.html.erb
index cf05d20..583ed25 100755
--- a/app/views/challenge_assignments/_maintainer_index.html.erb
+++ b/app/views/challenge_assignments/_maintainer_index.html.erb
@@ -30,10 +30,10 @@
                         collection_assignments_path(@collection, fulfilled: true) %>
   </li>
   <li>
-    <%= button_to ts("Default All Incomplete"),
+    <%= link_to ts("Default All Incomplete"),
                 default_all_collection_assignments_path(@collection),
                 data: { confirm: ts("Are you sure? This will mark all unposted or unapproved assignments in the challenge as defaulting.") },
-                method: :patch %>
+                role: "button" %>
   </li>
   <li>
     <%= link_to ts("Purge Assignments"),
diff --git a/app/views/challenge_assignments/show.html.erb b/app/views/challenge_assignments/show.html.erb
index 87f7b53..20e61b5 100755
--- a/app/views/challenge_assignments/show.html.erb
+++ b/app/views/challenge_assignments/show.html.erb
@@ -1,4 +1,4 @@
-<% # accessed through My Assignment on challenge dashboard %>
+<% # accessed txhrough My Assignment on challenge dashboard %>
 <!--Descriptive page name, messages and instructions-->
 <h2 class="heading"><%= ts("Assignment for") %> <%= @challenge_assignment.offer_byline %> <% if @challenge_assignment.collection.challenge.user_allowed_to_see_assignments?(current_user) %><%= challenge_assignment_email(@challenge_assignment) %><% end %></h2>
 <!--/descriptions-->
@@ -10,26 +10,20 @@
       <% if @challenge_assignment.defaulted? %>
         <span class="defaulted"><%= ts("Defaulted") %></span>
       <% else %>
-        <%= button_to t("challenge_assignments.to_default.button"),
-              default_collection_assignment_path(@challenge_assignment.collection, @challenge_assignment),
-              data: { confirm: t("challenge_assignments.to_default.confirmation") },
-              method: :patch %>
+        <%= link_to ts("Default"), default_collection_assignment_path(@challenge_assignment.collection, @challenge_assignment),
+          data: {confirm: ts("Are you sure? This will mark you as having defaulted and notify the collection maintainer! It cannot be undone.")} %>
       <% end %>
     </li>
-    <li><%= link_to t("challenge_assignments.to_fulfill.button"),
-              new_collection_work_path(
-                @challenge_assignment.collection,
-                assignment_id: @challenge_assignment.id
-              ) %>
-    </li>
+    <li><%= link_to ts("Fulfill"), new_collection_work_path(@challenge_assignment.collection, :assignment_id => @challenge_assignment.id) %></li>
   </ul>
 <% end %>
 <!--/subnav-->
 
 <!--main content-->
+<% request = (@challenge_assignment.request_signup || @challenge_assignment.pinch_request_signup) %>
 
-<% if @challenge_assignment.request_signup %>
-  <%= render "challenge_signups/show_requests", challenge_signup: @challenge_assignment.request_signup %>
+<% if request %>
+  <%= render "challenge_signups/show_requests", :challenge_signup => request %>
 <% else %>
   <h3 class="heading"><%= ts("No request!") %></h3>
   <p class="note"><%= ts("Contact challenge moderators for help.") %></p>