diff --git a/app/views/potential_matches/_in_progress.html.erb b/app/views/potential_matches/_in_progress.html.erb
index d6b97a6..506d5dd 100755
--- a/app/views/potential_matches/_in_progress.html.erb
+++ b/app/views/potential_matches/_in_progress.html.erb
@@ -5,7 +5,7 @@
 </p>
 
 <p>
-  <%= ts("If the progress value below doesn't change when you reload the page
+  <%= ts("If the progress value below doesn't change when you reload the page 
           after about 10 minutes, there may have been a problem. Please check again after an hour, and then contact archive support.") %>
 </p>
 
@@ -13,4 +13,4 @@
   <%= ts("Potential match generation progress:") %> <strong><%= @progress %>%</strong>
 </p>
 
-<span class="actions"><%= button_to ts("Cancel Potential Match Generation"), cancel_generate_collection_potential_matches_path(@collection), method: :post %></span>
+<p class="actions" role="button"><%= link_to ts("Cancel Potential Match Generation"), cancel_generate_collection_potential_matches_path(@collection) %></p>
diff --git a/app/views/potential_matches/_match_navigation.html.erb b/app/views/potential_matches/_match_navigation.html.erb
index 9baaec0..39cb820 100755
--- a/app/views/potential_matches/_match_navigation.html.erb
+++ b/app/views/potential_matches/_match_navigation.html.erb
@@ -3,26 +3,22 @@
     <ul class="actions" role="menu">
       <% if @collection.potential_matches.empty? %>
         <li>
-          <% if !@settings || @settings.no_match_required? %>
-            <%= button_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection),
-                  data: { confirm: ts("Your challenge settings don't require any matching. Assignments will be completely random. Is this what you want?") },
-                  method: :post %>
+           <% if !@settings || @settings.no_match_required? %>
+            <%= link_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection),
+                        data: {confirm: ts("Your challenge settings don't require any matching. Assignments will be completely random. Is this what you want?")} %>
           <% else %>
-            <%= button_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection), method: :post %>
+            <%= link_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection) %>
           <% end %>
         </li>
       <% else %>
         <li><%= submit_tag ts("Save Assignment Changes") %></li>
-        <li><%= button_to ts("Regenerate Assignments"), generate_collection_assignments_path(@collection),
-                  data: { confirm: ts("Are you sure? This will delete all current assignments.") },
-                  method: :post %></li>
-        <li><%= button_to ts("Regenerate All Potential Matches"), generate_collection_potential_matches_path(@collection),
-                  data: { confirm: ts("Are you sure? This will delete all current assignments and potential matches.") },
-                  method: :post %></li>
+        <li><%= link_to ts("Regenerate Assignments"), generate_collection_assignments_path(@collection),
+                data: {confirm: ts("Are you sure? This will delete all current assignments.")} %></li>
+        <li><%= link_to ts("Regenerate All Potential Matches"), generate_collection_potential_matches_path(@collection),
+                 data: {confirm: ts("Are you sure? This will delete all current assignments and potential matches.")} %></li>
         <li>
-          <%= button_to ts("Send Assignments"), send_out_collection_assignments_path(@collection),
-                data: { confirm: ts("Are you sure? This will send out the currently saved assignments to all participants!") },
-                method: :post %></li>
+          <%= link_to ts("Send Assignments"), send_out_collection_assignments_path(@collection),
+                 data: {confirm: ts("Are you sure? This will send out the currently saved assignments to all participants!")} %></li>
       <% end %>
     </ul>
   </div>
diff --git a/app/views/potential_matches/_no_potential_givers.html.erb b/app/views/potential_matches/_no_potential_givers.html.erb
old mode 100755
new mode 100644
index cff5e25..c8832cc
--- a/app/views/potential_matches/_no_potential_givers.html.erb
+++ b/app/views/potential_matches/_no_potential_givers.html.erb
@@ -8,19 +8,9 @@
           <ul class="actions" role="menu">
             <li title="<%= ts("email") %>"><%= mailto_link assignment.request_signup.pseud.user,  :subject => "[#{h(@collection.title)}] Message from Collection Maintainer" %></li>
             <li><%= link_to ts("Edit"), edit_collection_signup_path(@collection, assignment.request_signup) %></li>
-            <li>
-              <%= button_to ts("Regenerate Matches For %{name}",
-                    name: assignment.request_byline),
-                    regenerate_for_signup_collection_potential_matches_path(@collection, signup_id: assignment.request_signup.id),
-                    method: :post %>
-            </li>
-            <li>
-              <%= link_to ts("Delete"),
-                    collection_signup_path(@collection, assignment.request_signup),
-                    data: { confirm: ts("Are you sure?") },
-                    method: :delete %>
-            </li>
-          </ul>
+            <li role="button"><%= link_to ts("Regenerate Matches For %{name}", :name => assignment.request_byline), regenerate_for_signup_collection_potential_matches_path(@collection, :signup_id => assignment.request_signup.id) %></li>
+            <li role="button"><%= link_to ts("Delete"),
+                collection_signup_path(@collection, assignment.request_signup), data: {confirm: ts('Are you sure?')}, :method => :delete %></li></ul>
         </dd>
       <% end %>
     </dl>
diff --git a/app/views/potential_matches/_no_potential_recipients.html.erb b/app/views/potential_matches/_no_potential_recipients.html.erb
old mode 100755
new mode 100644
index b35bb46..0fb9ac0
--- a/app/views/potential_matches/_no_potential_recipients.html.erb
+++ b/app/views/potential_matches/_no_potential_recipients.html.erb
@@ -8,11 +8,7 @@
           <ul class="actions" role="menu">
             <li title="<%= ts("email") %>"><%= mailto_link assignment.offer_signup.pseud.user,  :subject => "[#{h(@collection.title)}] Message from Collection Maintainer" %></li>
             <li><%= link_to ts("Edit"), edit_collection_signup_path(@collection, assignment.offer_signup) %></li>
-            <li>
-              <%= button_to ts("Regenerate Matches For %{name}", name: assignment.offer_byline),
-                    regenerate_for_signup_collection_potential_matches_path(@collection, signup_id: assignment.offer_signup.id),
-                    method: :post %>
-            </li>
+            <li role="button"><%= link_to ts("Regenerate Matches For %{name}", :name => assignment.offer_byline), regenerate_for_signup_collection_potential_matches_path(@collection, :signup_id => assignment.offer_signup.id) %></li>
             <li role="button"><%= link_to ts("Delete"),
                 collection_signup_path(@collection, assignment.offer_signup), data: {confirm: ts('Are you sure?')}, :method => :delete %></li></ul>
         </dd>