diff --git a/app/views/annotations/_add_annotation.html.erb b/app/views/annotations/_add_annotation.html.erb
index 8add942..d84fef9 100644
--- a/app/views/annotations/_add_annotation.html.erb
+++ b/app/views/annotations/_add_annotation.html.erb
@@ -25,8 +25,8 @@
 
   <!-- submit buttons -->
   <div class="move_2_right">
-    <%= submit_tag _('Save'), class: "btn btn-primary" %>
+    <%= submit_tag _('Save'), class: "btn btn-primary", role: 'button' %>
     <%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-    <%= link_to _('Cancel'), "#", class: "btn cancel cancel_add_annotations" %>
+    <%= link_to _('Cancel'), "#", class: "btn cancel cancel_add_annotations", role: 'button' %>
   </div>
 <%end%>
diff --git a/app/views/annotations/_edit_annotation.html.erb b/app/views/annotations/_edit_annotation.html.erb
index 3a59362..cae438b 100644
--- a/app/views/annotations/_edit_annotation.html.erb
+++ b/app/views/annotations/_edit_annotation.html.erb
@@ -27,17 +27,17 @@
 
   <!-- submit/ delete buttons -->
   <div class="move_2_right">
-    <%= submit_tag _('Save'), class: 'btn btn-primary' %>
+    <%= submit_tag _('Save'), class: 'btn btn-primary', role: 'button' %>
     <% if example_answer.present? %>
       <%= link_to _('Delete Example Answer'), admin_destroy_annotation_path(id: example_answer.id),
-        confirm: _("You are about to delete an example answer for '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary"%>
+        confirm: _("You are about to delete an example answer for '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary", role: 'button' %>
     <% end %>
     <% if guidance.present? %>
       <%= link_to _('Delete Example Answer'), admin_destroy_annotation_path(id: guidance.id),
-        confirm: _("You are about to delete a guidance for '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary"%>
+        confirm: _("You are about to delete a guidance for '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary", role: 'button'%>
     <% end %>
 
     <%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-    <%= link_to _('Cancel'), '#', class: 'btn cancel cancel_edit_annotations' %>
+    <%= link_to _('Cancel'), '#', class: 'btn cancel cancel_edit_annotations', role: 'button' %>
   </div>
 <% end %>
diff --git a/app/views/annotations/_show_annotation.html.erb b/app/views/annotations/_show_annotation.html.erb
index a790d70..9ed4d19 100644
--- a/app/views/annotations/_show_annotation.html.erb
+++ b/app/views/annotations/_show_annotation.html.erb
@@ -22,5 +22,5 @@
 
 <div class="move_2_right">
 	<%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-	<%= link_to _('Edit Annotations'), '# ', class: "btn btn-primary edit_form_for_annotations"%>
+	<%= link_to _('Edit Annotations'), '# ', class: "btn btn-primary edit_form_for_annotations", role: 'button'%>
 </div>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index a82a78f..93dbcfc 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -16,7 +16,7 @@
 				</tr>
 			</table>
 		  	<div class="div_right">
-		  		<%= f.submit t('helpers.save'), :class => 'btn btn-primary' %>
+		  		<%= f.submit t('helpers.save'), :class => 'btn btn-primary', role: 'button'%>
 		  	</div>
 		</div>
 	<% end %>
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index c2daadf..5ee124f 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -126,6 +126,6 @@
 <!-- alert for the default template-->
 <div id="unlink-institutional-credentials-dialog" class="modal" style="display: none;">
   <p><%= _('You are about to unlink %{application_name} of your institutional credentials, would you like to continue?') % { :application_name => user_shibboleth_omniauth_authorize_path } %></p>
-  <a href="#" id="unlink-shibboleth-cancelled" class="btn"><%= _('Cancel') %></a>
-  <a href="#" id="unlink-shibboleth-confirmed" class="btn btn-primary"><%= _('Unlink account') %></a>
+  <a href="#" id="unlink-shibboleth-cancelled" class="btn" role="button"><%= _('Cancel')%></a>
+  <a href="#" id="unlink-shibboleth-confirmed" class="btn btn-primary" role="button"><%= _('Unlink account') %></a>
 </div>
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 40b75cc..ce595ac 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -39,9 +39,9 @@
       <br />
       <div class="form-input">
         <div class="button-spacer">&nbsp;</div>
-        <%= f.submit _('Save'), class: 'btn btn-primary' %>
+        <%= f.submit _('Save'), class: 'btn btn-primary', role="button" %>
         <% if @guidance_group.published == false then %>
-          <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary" %>
+          <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary", role="button" %>
         <% end %>
       </div>
     </fieldset>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index bcef054..df68157 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -30,7 +30,7 @@
       <br />
       <div class="form-input">
         <div class="button-spacer">&nbsp;</div>
-        <%= f.submit _('Save'), name: "draft", class: "btn btn-primary" %>
+        <%= f.submit _('Save'), name: "draft", class: "btn btn-primary", role="button"%>
       </div>
     </fieldset>
   <% end %>
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb
index afadc96..e0a361e 100644
--- a/app/views/guidances/admin_edit.html.erb
+++ b/app/views/guidances/admin_edit.html.erb
@@ -44,7 +44,7 @@
     <br />
     <div class="form-input">
       <div class="button-spacer">&nbsp;</div>
-      <input type="submit" id="edit_guidance_submit" href="#edit_guidance_alert_dialog" class="btn btn-primary" value="<%= _('Save')%>" />
+      <input type="submit" id="edit_guidance_submit" href="#edit_guidance_alert_dialog" class="btn btn-primary" role="button" value="<%= _('Save')%>" />
     </div>
   </fieldset>
 <%end%>
diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb
index 1e77c5e..dc1bf03 100644
--- a/app/views/guidances/admin_new.html.erb
+++ b/app/views/guidances/admin_new.html.erb
@@ -46,7 +46,7 @@
           <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
-    
+
       <br />
       <div class="form-input">
         <div class="button-spacer">&nbsp;</div>
diff --git a/app/views/notes/_archive.html.erb b/app/views/notes/_archive.html.erb
index eae2154..d56684d 100644
--- a/app/views/notes/_archive.html.erb
+++ b/app/views/notes/_archive.html.erb
@@ -13,8 +13,8 @@
 
 	  <!-- submit buttons -->
 	  <div class="move_2_right">
-      <%= f.submit _('Remove'), onclick: "archive_note(#{note.id}, #{question_id})", :class => "btn btn-primary archive_comment_submit_button" %>
-      <%= link_to _('Cancel'), "#", onclick: "cancel_archive_note(#{note.id})", :class => "cancel_archive_comment btn cancel" %>
+      <%= f.submit _('Remove'), onclick: "archive_note(#{note.id}, #{question_id})", class: "btn btn-primary archive_comment_submit_button", role:"button" %>
+      <%= link_to _('Cancel'), "#", onclick: "cancel_archive_note(#{note.id})", class: "cancel_archive_comment btn cancel" role:"button" %>
 	  </div>
     <br>
 <% end %>
diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb
index 7e34808..f9eb2f6 100644
--- a/app/views/phases/_edit_phase.html.erb
+++ b/app/views/phases/_edit_phase.html.erb
@@ -38,8 +38,8 @@
 
   <!-- submit buttons -->
   <div class="move_2_right">
-    <%= f.submit _('Save'), class: 'btn btn-primary' %>
-    <%= link_to _('Cancel'), admin_show_phase_path(phase), class: 'btn cancel' %>
+    <%= f.submit _('Save'), class: 'btn btn-primary', role: 'button' %>
+    <%= link_to _('Cancel'), admin_show_phase_path(phase), class: 'btn cancel', role: 'button' %>
   </div>
 
 <% end %>
\ No newline at end of file
diff --git a/app/views/phases/_note.html.erb b/app/views/phases/_note.html.erb
index c296d9b..b38f3dd 100644
--- a/app/views/phases/_note.html.erb
+++ b/app/views/phases/_note.html.erb
@@ -8,7 +8,8 @@
       <%= link_to _('Add note'),
           "#question-form-#{questionid}",
           class: "btn btn-primary add_comment_button",
-          onclick: "add_note_button(#{questionid})"
+          onclick: "add_note_button(#{questionid})",
+          role: "button"
       %>
     </div>
 
diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb
index 629aa0d..b5fecfa 100644
--- a/app/views/phases/edit.html.erb
+++ b/app/views/phases/edit.html.erb
@@ -106,9 +106,9 @@
             </div>
 
             <div class="modal-foote  r">
-              <a href="#" id="section-<%= sectionid %>-collapse-cancel" data-section="<%= sectionid %>" class="cancel-section-collapse btn"><%= _('Cancel')%></a>
-              <a href="#" id="section-<%= sectionid %>-collapse-discard" data-section="<%= sectionid %>" class="discard-section-collapse btn"><%= _('Discard')%></a>
-              <a href="#" id="section-<%= sectionid %>-collapse-save" data-section="<%= sectionid %>" class="save-section-collapse btn btn-primary"><%= _('Save')%></a>
+              <a href="#" id="section-<%= sectionid %>-collapse-cancel" data-section="<%= sectionid %>" role="button" class="cancel-section-collapse btn"><%= _('Cancel')%></a>
+              <a href="#" id="section-<%= sectionid %>-collapse-discard" data-section="<%= sectionid %>" role="button" class="discard-section-collapse btn"><%= _('Discard')%></a>
+              <a href="#" id="section-<%= sectionid %>-collapse-save" data-section="<%= sectionid %>" role="button" class="save-section-collapse btn btn-primary"><%= _('Save')%></a>
             </div>
 
           </div>  <!-- section-sectionid-collapse-alert -->
diff --git a/app/views/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb
index 25f2202..aca0b53 100644
--- a/app/views/questions/_add_question.html.erb
+++ b/app/views/questions/_add_question.html.erb
@@ -166,9 +166,9 @@
     <!-- submit buttons -->
     <div class="move_2_right">
       <%= hidden_field_tag :section_id, section.id, class: "section_id" %>
-      <%= f.submit _('Save'), class: "btn btn-primary new_question_save_button" %>
+      <%= f.submit _('Save'), class: "btn btn-primary new_question_save_button", role:'button' %>
       <%= hidden_field_tag :section_id, section.id, class: "section_id_new" %>
-      <%= link_to _('Cancel'), '#', class: "btn cancel cancel_add_new_question" %>
+      <%= link_to _('Cancel'), '#', class: "btn cancel cancel_add_new_question", role: 'button' %>
     </div>
   </div>
 
diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb
index f9f1ad6..8de06f0 100644
--- a/app/views/questions/_edit_question.html.erb
+++ b/app/views/questions/_edit_question.html.erb
@@ -169,13 +169,13 @@
     <br />
     <!-- submit buttons -->
     <div class="move_2_right">
-      <%= f.submit _('Save'), class: "btn btn-primary" %>
+      <%= f.submit _('Save'), class: "btn btn-primary", role:'button' %>
       <% if !question.section.phase.template.published? %>
         <%= link_to _('Delete'), admin_destroy_question_path(question_id: question.id),
-        confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary"%>
+        confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary", role:'button'%>
       <% end %>
       <%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-      <%= link_to _('Cancel'), "#", class: "btn cancel cancel_edit_question" %>
+      <%= link_to _('Cancel'), "#", class: "btn cancel cancel_edit_question", role:'button' %>
     </div>
   </div>
 
diff --git a/app/views/questions/_show_question.html.erb b/app/views/questions/_show_question.html.erb
index 6e2be90..4e20c6a 100644
--- a/app/views/questions/_show_question.html.erb
+++ b/app/views/questions/_show_question.html.erb
@@ -121,17 +121,17 @@
   <% if (@edit && question.modifiable) %>
     <div class="move_2_right">
       <%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-      <%= link_to _('Edit question'), '# ', class: "btn btn-primary edit_question_button"%>
+      <%= link_to _('Edit question'), '# ', class: "btn btn-primary edit_question_button", role:"button"%>
 
       <%= link_to _('Delete question'), admin_destroy_question_path(question_id: question.id),
-        confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary"%>
+        confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary", role:"button"%>
     </div>
   <% else %>
     <% if example_answer.nil? && guidance.nil? %>
       <div id="add_annotations_button_<%= question.id%>">
         <div class="move_2_right">
           <%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-          <%= link_to _('Add Annotations'), '# ', class: "btn btn-primary add_annotations_button"%>
+          <%= link_to _('Add Annotations'), '# ', class: "btn btn-primary add_annotations_button", role:"button"%>
         </div>
       </div>
     <% end %>
diff --git a/app/views/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb
index 61dd490..a6b2e30 100644
--- a/app/views/sections/_add_section.html.erb
+++ b/app/views/sections/_add_section.html.erb
@@ -45,8 +45,8 @@
         </table>
         <!-- save buttons-->
         <div class="move_2_right">
-          <%= f.submit _('Save'), class: "btn btn-primary" %>
-          <%= link_to _('Cancel'), "#", id: "", class: "btn cancel" %>
+          <%= f.submit _('Save'), class: "btn btn-primary", role:"button" %>
+          <%= link_to _('Cancel'), "#", id: "", class: "btn cancel", role:"button" %>
         </div>
         <div class="two-column-clear"></div>
       </div>
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index 473c176..d3dee11 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -29,12 +29,12 @@
       <br />
       <div class="form-input">
         <div class="button-spacer">&nbsp;</div>
-        <%= s.submit _('Save'), class: 'btn btn-primary' %>
+        <%= s.submit _('Save'), class: 'btn btn-primary', role:'button' %>
         <% if section.modifiable %>
           <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id),
-          confirm: _("You are about to delete '%{section_title}'. This will affect questions linked to this section. Are you sure?") % { :section_title => section.title }, method: :delete, class: "btn btn-primary"%>
+          confirm: _("You are about to delete '%{section_title}'. This will affect questions linked to this section. Are you sure?") % { :section_title => section.title }, method: :delete, class: "btn btn-primary", role:'button'%>
         <% end %>
-        <%= link_to _('Cancel'), :back, class: 'btn cancel' %>
+        <%= link_to _('Cancel'), :back, class: 'btn cancel', role:'button' %>
       </div>
     </fieldset>
   <% end %>
@@ -69,7 +69,7 @@
   <div id="add_question_button_div_<%= section.id%>">
     <div class="div_left">
       <%= hidden_field_tag :section_id, section.id, class: "section_id" %>
-      <%= link_to _('Add question'), '#', class: "btn btn-primary add_question_button" %>
+      <%= link_to _('Add question'), '#', class: "btn btn-primary add_question_button", role:'button'%>
     </div>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/settings/phases/_export_formatting_form.html.erb b/app/views/settings/phases/_export_formatting_form.html.erb
index 492b416..a44944c 100644
--- a/app/views/settings/phases/_export_formatting_form.html.erb
+++ b/app/views/settings/phases/_export_formatting_form.html.erb
@@ -10,8 +10,8 @@
 
 <%= form_for(@export_settings, url: settings_plan_path(plan), method: :put, as: :export) do |f| %>
   <div class="div_right">
-    <%= submit_tag(_('Reset'), class: "btn btn-primary") %>
-    <%= submit_tag(_('Save'), class: "btn btn-primary", "data-toggle" => "collapse", "data-target" => "#settings-accordion-plan-#{plan.id}") %>
+    <%= submit_tag(_('Reset'), class: "btn btn-primary", role:'button')%>
+    <%= submit_tag(_('Save'), class: "btn btn-primary", "data-toggle" => "collapse", "data-target" => "#settings-accordion-plan-#{plan.id}", role:'button') %>
   </div>
   <span class="label label-inverse unsaved_changes_alert" style="display:none;"><%= _('Unsaved changes') %></span>
   <div id="custom-export-title">
@@ -102,8 +102,8 @@
     </fieldset>
   </div>
   <div class="div_right">
-    <%= submit_tag(_('Reset'), class: "btn btn-primary") %>
-    <%= submit_tag(_('Save'), class: "btn btn-primary", "data-toggle" => "collapse", "data-target" => "#settings-accordion-plan-#{plan.template.id}") %>
+    <%= submit_tag(_('Reset'), class: "btn btn-primary", role:'button') %>
+    <%= submit_tag(_('Save'), class: "btn btn-primary", "data-toggle" => "collapse", "data-target" => "#settings-accordion-plan-#{plan.template.id}", role:"button") %>
   </div>
   <span class="label label-inverse unsaved_changes_alert" style="display:none;"><%= _('Unsaved changes') %></span>
   <div class="div_clear"> </div>
diff --git a/app/views/shared/_accessible_submit_button.html.erb b/app/views/shared/_accessible_submit_button.html.erb
index 32551fb..497c1e8 100644
--- a/app/views/shared/_accessible_submit_button.html.erb
+++ b/app/views/shared/_accessible_submit_button.html.erb
@@ -1,5 +1,6 @@
 <input id="<%= id %>" 
        type="submit" 
+       role="button"
        class="form-submit <%= classes ||= '' %>" 
        value="<%= val %>"
        aria-disabled="<%= disabled_initially %>"
diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb
index 94a7846..fe19a09 100644
--- a/app/views/templates/_edit_annotations.html.erb
+++ b/app/views/templates/_edit_annotations.html.erb
@@ -88,13 +88,13 @@
   <br />
   <!-- submit buttons -->
   <div class="move_2_right">
-    <%= f.submit _('Save'), class: "btn btn-primary" %>
+    <%= f.submit _('Save'), class: "btn btn-primary", role:"button" %>
     <% if !question.section.phase.template.published? %>
       <%= link_to _('Delete'), admin_destroy_question_path(question_id: question.id),
-                  confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary"%>
+                  confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary", role:"button"%>
     <% end %>
     <%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-    <%= link_to _('Cancel'), "#", class: "btn cancel cancel_edit_question" %>
+    <%= link_to _('Cancel'), "#", class: "btn cancel cancel_edit_question", role:"button" %>
   </div>
 </div>
 
diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb
index a1e9bb2..e3e3b42 100644
--- a/app/views/templates/admin_new.html.erb
+++ b/app/views/templates/admin_new.html.erb
@@ -39,8 +39,8 @@
       </table>
       <!-- submit buttons -->
       <div class="move_2_right">
-        <%= f.submit _('Save'), class: "btn btn-primary" %>
-        <%= link_to _('Cancel'), admin_index_template_path, class: "btn cancel" %>
+        <%= f.submit _('Save'), class: "btn btn-primary", role:"button" %>
+        <%= link_to _('Cancel'), admin_index_template_path, class: "btn cancel", role:"button" %>
       </div>
       <br />
     <% end %>
diff --git a/app/views/users/_notification_preferences.html.erb b/app/views/users/_notification_preferences.html.erb
index 81a3c58..819240d 100644
--- a/app/views/users/_notification_preferences.html.erb
+++ b/app/views/users/_notification_preferences.html.erb
@@ -48,7 +48,7 @@
     <br/>
     <div class='form-input'>
       <div class="button-spacer">&nbsp;</div>
-      <%= submit_tag 'Save', class: 'btn btn-primary' %>
+      <%= submit_tag 'Save', class: 'btn btn-primary', role: 'button' %>
     </div>
   <% end %>
 </fieldset>