diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 239354b..c377ae7 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -3,7 +3,7 @@
 
   def edit
     @user.create_default_preferences if @user.prefs == {}
-    @languages = Language.all.order("name")
+    @languages = Language.sorted_by_abbreviation
     @orgs = Org.where(parent_id: nil).order("name")
     @other_organisations = Org.where(parent_id: nil, is_other: true).pluck(:id)
     @identifier_schemes = IdentifierScheme.where(active: true).order(:name)
diff --git a/app/models/language.rb b/app/models/language.rb
index 2d02783..1d86727 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -11,4 +11,6 @@
 
   scope :sorted_by_abbreviation, -> { all.order(:abbreviation) }
   scope :default, -> { where(default_language: true).first }
+  # Retrieves the id for a given abbreviation of a language
+  scope :id_for, -> (abbreviation) { where(abbreviation: abbreviation).pluck(:id).first } 
 end
\ No newline at end of file
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/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 201002d..6be60ae 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -4,7 +4,7 @@
   <p class="alert alert-error"><%= _('The email address you entered is not registered.') %></p>
 <% end %>
 
-<h1><%= t('helpers.forgot_password') %></h1>
+<h1><%= _('Forgot your password?') %></h1>
 
 <p><%= _('Please enter your email below and we will send you instructions on how to reset your password.') %></p>
 
@@ -13,9 +13,8 @@
 
     <fieldset id="password-reset-form" class="standard padded">
       <div class="form-input">
-        <label for="user_email"><%= _('Email') %></label>
-        <input type="email" id="user_email" name="user[email]" 
-               class="left-indent required input-small" />
+        <%= f.label(:email, _('Email'), class: 'required') %>
+        <%= f.email_field(:email, class: 'left-indent required input-small') %>
         <span role="" id="email_error" class="error-tooltip-right left-indent"></span>
       </div>
 
@@ -29,5 +28,4 @@
       </div>
     </fieldset>
   <% end %>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index 9a93588..561f8d7 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -5,33 +5,29 @@
     <%= hidden_field_tag :skip_personal_details, "true" %>
 
     <div class="form-input">
-      <label for="user_current_password"><%= _('Current Password') %></label>
-      <input type="password" id="user_current_password" name="user[current_password]"
-             class="left-indent required input-medium" value="" />
+      <%= f.label(:current_password, _('Current Password'), class: 'required') %>
+      <%= f.password_field(:current_password, class: 'left-indent required input-medium') %>
       <span role="" id="current_password_error"
             class="error-tooltip-right left-indent"></span>
     </div>
 
     <div class="form-input">
-      <label for="user_password"><%= _('New Password') %></label>
-      <input type="password" id="user_new_password" name="user[password]"
-             class="left-indent required input-medium" value="" />
+      <%= f.label(:password, _('New Password'), class: 'required') %>
+      <%= f.password_field(:password, class: 'left-indent required input-medium', id: 'user_new_password') %>
       <span role="" id="password_error"
             class="error-tooltip-right left-indent"></span>
     </div>
 
     <div class="form-input">
-      <label for="user_password_confirmation"><%= _('Password Confirmation') %></label>
-      <input type="password" id="user_password_confirmation"
-             name="user[password_confirmation]"
-             class="left-indent required input-medium" value="" />
+      <%= f.label(:password_confirmation, _('Password Confirmation'), class: 'required') %>
+      <%= f.password_field(:password_confirmation, class: 'left-indent required input-medium') %>
       <span role="" id="password_confirmation_error"
             class="error-tooltip-right left-indent"></span>
     </div>
 
     <div class="form-input">
-      <label for="password_show"><%= _('Show passwords') %></label>
-      <input type="checkbox" id="password_show" class="left-indent" />
+      <%= label_tag(:password_show, _('Show passwords')) %>
+      <%= check_box_tag(:password_show, "1", false, class: 'left-indent') %>
     </div>
     
     <br />
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index 1a509fe..4437580 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -16,47 +16,40 @@
       <%= hidden_field_tag :skip_personal_details, "false" %>
 
       <div class="form-input">
-        <label for="user_email"><%= _('Email') %>*</label>
-        <input type="email" id="user_email" name="user[email]"
-               class="left-indent required input-medium"
-               title="<%= _('Please enter your current password below when changing your email address.') %>"
-               value="<%= @user.email %>" />
+        <%= f.label(:email, _('Email'), class: 'required') %>
+        <%= f.email_field(:email, class: 'left-indent required input-medium',
+          title: _('Please enter your current password below when changing your email address.'),
+          value: @user.email) %>
         <span role="" id="email_error" class="error-tooltip-right left-indent"></span>
       </div>
 
       <div class="form-input">
-        <label for="user_firstname"><%= _('First Name') %>*</label>
-        <input type="text" id="user_firstname" name="user[firstname]"
-               class="input-small required left-indent"
-               value="<%= @user.firstname %>" />
+        <%= f.label(:firstname, _('First Name'), class: 'required') %>
+        <%= f.text_field(:firstname, class: 'input-small required left-indent', value: @user.firstname) %>
       </div>
       <div class="form-input">
-        <label for="user_surname"><%= _('Last Name') %>*</label>
-        <input type="text" id="user_surname" name="user[surname]"
-               class="input-small required left-indent"
-               value="<%= @user.surname %>" />
+        <%= f.label(:surname, _('Last Name'), class: 'required') %>
+        <%= f.text_field(:surname, class: 'input-small required left-indent', value: @user.surname) %>
       </div>
 
       <div class="form-input">
-        <label for="user_recovery_email"><%= _('Recovery Email') %>*</label>
-        <input type="email" id="user_recovery_email" name="user[recovery_email]"
-               class="left-indent required input-medium"
-               title="<%= _('This email will be used to recover your account if you change institutions') %>"
-               value="<%= @user.recovery_email %>" />
+        <%= f.label(:recovery_email, _('Recovery Email'), class: 'required') %>
+        <%= f.email_field(:recovery_email, class: 'left-indent required input-medium',
+          title: _('This email will be used to recover your account if you change institutions'),
+          value: @user.recovery_email) %>
         <span role="" id="recovery_email_error"
               class="error-tooltip-right left-indent"></span>
       </div>
 
       <div class="form-input">
-        <label for="user_password"><%= _('Password') %></label>
-        <input type="password" id="user_password" name="user[password]"
-               class="left-indent required input-medium" value="" />
+        <%= f.label(:password, _('Password'), class: 'required') %>
+        <%= f.password_field(:password, class: 'left-indent required input-medium') %>
         <span role="" id="password_error"
               class="error-tooltip-right left-indent"></span>
       </div>
 
       <div class="form-input accessible-combobox-smaller">
-        <label for="user_surname"><%= _('Organisation') %></label>
+        <%= f.label(:org_name, _('Organisation')) %>
         <%= render partial: "shared/accessible_combobox",
                    locals: {name: "#{resource_name}[org_name]",
                             id: "#{resource_name}_org_name",
@@ -68,16 +61,11 @@
 
       <% if MANY_LANGUAGES %>
         <div class="form-input">
-          <% lang = current_user.language.nil? ? FastGettext.default_locale : current_user.language.abbreviation %>
-          <label for="user_surname"><%= _('Language') %></label>
-          <select id="user_language_id" name="user[language_id]"
-                  class="input-small left-indent">
-            <%= @languages.each do |l| %>
-              <option value="<%= l.id %>"<%= lang == l.abbreviation ? ' selected="selected"' : '' %>>
-                <%= l.name %>
-              </option>
-            <% end %>
-          </select>
+          <% lang_id = current_user.language.nil? ? Language.id_for(FastGettext.default_locale) : current_user.language.id %>
+          <%= f.label(:language_id, _('Language')) %> 
+          <%= select_tag("user[language_id]",
+            options_from_collection_for_select(@languages, "id", "name", lang_id),
+            class: 'input-small left-indent') %>
         </div>
       <% end %>
 
@@ -89,7 +77,7 @@
                   <i class="fa fa-user" title="<%= scheme.description %>" aria-hidden="true"></i>
                 </label>
             <% else %>
-                <label for="scheme_name"><%= scheme.name.capitalize %></label>
+                <%= label_tag(:scheme_name, scheme.name.capitalize ) %>
             <% end %>
             <div class="identifier-scheme left-indent">
               <%= render partial: "external_identifier_#{scheme.name}",
@@ -101,10 +89,9 @@
 
       <% unless @user.api_token.blank? %>
         <div class="form-input">
-          <%= f.label :api_token, _('API token') %>
+          <%= f.label(:api_token, _('API token')) %>
           <div class="input-medium"><%= @user.api_token %></div>
-
-          <label><%= _('API Information') %></label>
+          <%= label_tag(:api_information, _('API Information')) %>
           <div><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></div>
         </div>
       <% end %>
@@ -127,6 +114,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 23ff6e3..cfd27cc 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -45,9 +45,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 2303226..a22ae2b 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 78f15be..8f617f8 100644
--- a/app/views/guidances/admin_edit.html.erb
+++ b/app/views/guidances/admin_edit.html.erb
@@ -36,7 +36,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 d838f14..a487cb5 100644
--- a/app/views/guidances/admin_new.html.erb
+++ b/app/views/guidances/admin_new.html.erb
@@ -33,7 +33,7 @@
         <%= f.collection_select(:guidance_group_id, @guidance_groups,
                 :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%>
       </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..f28234c 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/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 7484fdd..adf3e01 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -6,9 +6,7 @@
   <%= form_for 'shibboleth_ds', url: shibboleth_ds_path, html: {class: "shibboleth-ds-form roadmap-form"} do |f| %>
     <fieldset class="standard padded">
       <div class="form-input">
-        <label for="org_name">
-          <%= _('Look up your institution here') %>
-        </label>
+        <%= f.label(:org_name, _('Look up your institution here')) %>
     
         <% if @orgs.length <= 10 %>
           <select id="org_name" class="left-indent">
diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb
index 5cd86ed..5c0673e 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 233bfd7..a218c63 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/plans/_available_templates.html.erb b/app/views/plans/_available_templates.html.erb
index 900fded..a8842e7 100644
--- a/app/views/plans/_available_templates.html.erb
+++ b/app/views/plans/_available_templates.html.erb
@@ -1,14 +1,13 @@
 <legend><%= _('Which DMP template would you like to use?') %></legend>
 
 <div class="form-left-side left-indent">
-  <label for="plan_template_selector">
-    <%= _('Select a template') %>
-  </label>
+  <%= label_tag(:plan_template_selector, _('Select a template')) %>
 
-  <select id="plan_template_selector" class="left-indent input-extra-large">
-    <option value=""><%= _('Please select one') %></option>
-    <%= raw @templates.collect{|t| "<option value=\"#{t.id}\">#{t.title}</option>" }.join('') %>
-  </select>
+  <%= select_tag(:plan_template_selector,
+    options_from_collection_for_select(@templates, 'id', 'title'),
+    class: 'left-indent input-extra-large',
+    prompt: _('Please select one'))
+  %>
 </div>
 
 <div class="form-right-side">
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index 09961ca..6a7afd6 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -67,7 +67,7 @@
 
       <br />
       <div>
-        <label class="no-colon"><strong><%= _('Data Contact Person') %></strong></label>
+        <%= f.label(:data_contact, raw("<strong>#{_('Data Contact Person')}</strong>"), class: 'no-colon') %>
       </div>
       <div>
         <input type="checkbox" id="show-data-contact" class="left-indent"<%= (@plan.data_contact.blank? && @plan.data_contact_email.blank? ? ' checked="checked"' : '') %> />
@@ -88,7 +88,8 @@
       <br />
       <br />
       <div class="form-input">
-        <input type="submit" class="form-submit left-indent" value="<%= _('Save') %>" />
+        <div class="button-spacer">&nbsp;</div>
+        <%= submit_tag(_('Save'), class: 'form-submit') %>
       </div>
     </fieldset>
   </div>
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index acd9b91..b336152 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -15,14 +15,11 @@
         <legend><%= _('What research project are you planning?') %></legend>
         
         <div class="form-left-side">
-          <input type="text" id="plan_title" name="plan[title]" class="left-indent" 
-                 data-toggle="tooltip" 
-                 data-content="<%= _('If applying for funding, state the project title exactly as in the proposal.') %>" />
-
-          <input type="checkbox" id="is_test" class="left-indent" />
-          <label class="inline checkbox-label" for="is_test">
-            <%= _('mock project for testing, practice, or educational purposes') %>
-          </label>
+          <%= f.text_field(:title, class: 'left-indent',
+              'data-toggle': 'tooltip',
+              'data-content': _('If applying for funding, state the project title exactly as in the proposal.')) %>
+          <%= check_box_tag(:is_test, "1", false, class: 'left-indent') %>
+          <%= label_tag(:is_test, _('mock project for testing, practice, or educational purposes'), class: 'inline checkbox-label') %>
         </div>
       </fieldset>
 
@@ -42,12 +39,12 @@
         
         <div class="form-right-side">
           <p class="inline"><strong>- <%= _('or') %> -</strong></p>
-          <input type="checkbox" id="plan_no_org">
-          <label for="plan_no_org" class="checkbox-label">
-            <%= _('My research organisation is not on the list') %>
-            <em><%= _(' or ') %></em><br />
-            <%= _('no research organisation is associated with this plan')%>
-          </label>
+          <%= check_box_tag(:plan_no_org) %>
+          <%= label_tag(:plan_no_org, raw("
+            #{_('My research organisation is not on the list')}
+            <em>#{_(' or ')}</em>
+            #{_('no research organisation is associated with this plan')}
+            "), class: 'checkbox-label') %>
         </div>
       </fieldset>
     
@@ -67,10 +64,8 @@
         </div>
         <div class="form-right-side">
           <p class="inline"><strong>- <%= _('or') %> -</strong></p>
-          <input type="checkbox" id="plan_no_funder" />
-          <label for="plan_no_funder" class="checkbox-label">
-            <%= _('No funder associated with this plan')%>
-          </label>
+          <%= check_box_tag(:plan_no_funder) %>
+          <%= label_tag(:plan_no_funder, _('No funder associated with this plan'), class: 'checkbox-label') %>
         </div>
       </fieldset>
 
@@ -82,9 +77,8 @@
     
     <fieldset class="standard" id="available-templates">
       <div class="form-left-side">
-        <input type="hidden" id="plan_template_id" name="plan[template_id]"></input>
-        <input type="hidden" id="plan_visibility" name="plan[visibility" value="<%= @is_test ? 'is_test' : Rails.application.config.default_plan_visibility %>"></input>
-    
+        <%= f.hidden_field(:template_id) %>
+        <%= f.hidden_field(:visibility, value: @is_test ? 'is_test' : Rails.application.config.default_plan_visibility) %>
         <%= render partial: 'shared/accessible_submit_button',
                    locals: {id: 'create_plan_submit', 
                             val: 'Create Plan', 
diff --git a/app/views/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb
index 35a70fe..6903424 100644
--- a/app/views/questions/_add_question.html.erb
+++ b/app/views/questions/_add_question.html.erb
@@ -171,9 +171,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 a37a2d5..154a500 100644
--- a/app/views/questions/_edit_question.html.erb
+++ b/app/views/questions/_edit_question.html.erb
@@ -175,13 +175,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/_preview_question.html.erb b/app/views/questions/_preview_question.html.erb
index d4a709c..625cc84 100644
--- a/app/views/questions/_preview_question.html.erb
+++ b/app/views/questions/_preview_question.html.erb
@@ -3,15 +3,15 @@
 <div class="question-div">
 
   <!--question format-->
-  <% q_format = question.question_format%>
+  <% q_format = question.question_format %>
   <form action="">
     <div class="question-form">
       <!-- verify if the question has multiple choice -->
-      <% if q_format.title == _('Check box') || q_format.title == _('Multi select box') || q_format.title == _('Radio buttons') || q_format.title == _('Dropdown') %>
+      <% if q_format.option_based? %>
         <% options = question.question_options.order("number") %>
 
         <!--checkbox display-->
-        <% if q_format.title == _('Check box') %>
+        <% if q_format.checkbox? %>
           <%if !options.nil? %>
             <fieldset class="choices">
               <label class="text_colour"><%= raw question.text %></label>
@@ -23,7 +23,7 @@
             </fieldset>
           <% end %>
         <!--multi select box display-->
-        <% elsif q_format.title == _('Multi select box') %>
+        <% elsif q_format.multiselectbox? %>
           <% if !options.nil? %>
             <label class="text_colour"><%= raw question.text %></label>
             <select multiple="multiple">
@@ -33,7 +33,7 @@
             </select>
           <% end %>
         <!--Radio buttons display-->
-        <% elsif q_format.title == _('Radio buttons') %>
+        <% elsif q_format.radiobuttons? %>
           <% if !options.nil?  %>
             <fieldset class="choices">
               <label class="text_colour"><%= raw question.text %></label>
@@ -45,7 +45,7 @@
             </fieldset>
           <% end %>
         <!--dropdown display-->
-        <% elsif q_format.title == _('Dropdown') %>
+        <% elsif q_format.dropdown? %>
           <% if !options.nil? %>
             <label class="text_colour" ><%= raw question.text %></label>
             <select>
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 7692bdf..36f17fa 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 79a641d..0856f6f 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..915bce1 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">
@@ -31,7 +31,9 @@
   <h3><%= _('Included Elements') %></h3>
   <div class="div_clear"> </div>
   <fieldset class="check_select">
-    <legend><label for="admin_details_toggle"><%= _('Details') %></label></legend>
+    <legend>
+      <%= label_tag(:admin_details_toggle, _('Details')) %>
+    </legend>
     <ol>
     <% Settings::Template::VALID_ADMIN_FIELDS.each do |field|
          name = "export[fields][admin][#{field}]"
@@ -44,13 +46,15 @@
     </ol>
   </fieldset>
   <fieldset class="check_select sections">
-    <legend><label for="sections_toggle"><%= _('Sections') %></label></legend>
+    <legend>
+      <%= label_tag(:sections_toggle, _('Sections')) %>
+    </legend>
     <ol>
         <% phase.sections.each do |section| %>
           <li>
             <fieldset class="check_select">
               <legend title="<%= section.title -%>">
-                <label for="section_toggle_<%= section.id -%>"><%= section.title -%></label>
+                <%= label_tag("section_toggle_#{section.id}", section.title) %>
               </legend>
               <ol>
                 <% section.questions.each do |question|
@@ -102,8 +106,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/shared/_login_form.html.erb b/app/views/shared/_login_form.html.erb
index a6e5061..fb56a41 100644
--- a/app/views/shared/_login_form.html.erb
+++ b/app/views/shared/_login_form.html.erb
@@ -22,8 +22,8 @@
     
     <!-- Login form email address -->
     <div class="form-input">
-      <label for="user_email"><%= _('Email') %></label>
-      <input type="email" id="user_email" name="user[email]" class="left-indent required" />
+      <%= f.label(:email, _('Email'), class: 'required') %>
+      <%= f.email_field(:email, class: 'left-indent required') %>
       <span role="" id="email_error" class="error-tooltip left-indent"></span>
     
       <div class="form-input checkbox-right">
@@ -34,14 +34,13 @@
     
     <!-- Login form password -->
     <div class="form-input">
-      <label for="user_password"><%= _('Password') %></label>
-      <input type="password" id="user_password" name="user[password]" 
-             class="left-indent required" value="" />
+      <%= f.label(:password, _('Password'), class: 'required') %>
+      <%= f.password_field(:password, class: 'left-indent required') %>
       <span role="" id="password_error" class="error-tooltip left-indent"></span>
     
       <div class="form-input checkbox-right">
-        <label for="password_show" class="checkbox-label"><%= _('Show password') %></label>
-        <input type="checkbox" id="password_show" />
+        <%= label_tag(:password_show, _('Show password'), class: 'checkbox-label') %>
+        <%= check_box_tag(:password_show, "1", false) %>
       </div>
     </div>
     
diff --git a/app/views/shared/_register_form.html.erb b/app/views/shared/_register_form.html.erb
index 675d540..081a0a4 100644
--- a/app/views/shared/_register_form.html.erb
+++ b/app/views/shared/_register_form.html.erb
@@ -4,23 +4,21 @@
   <fieldset id="create-account-form" class="standard padded">
     <div class="inline">
       <div class="form-input">
-        <label for="user_firstname"><%= _('First Name') %></label>
-        <input type="text" id="user_firstname" name="user[firstname]" 
-               class="input-small required left-indent" />
+        <%= f.label(:firstname, _('First Name'), class: 'required') %>
+        <%= f.text_field(:firstname, class: 'input-small required left-indent') %>
       </div>
     </div>
     <div class="inline">
       <div class="form-input">
-        <label for="user_surname"><%= _('Last Name') %></label>
-        <input type="text" id="user_surname" name="user[surname]" 
-               class="input-small required left-indent" />
+        <%= f.label(:surname, _('Last Name'), class: 'required') %>
+        <%= f.text_field(:surname, class: 'input-small required left-indent') %>
       </div>
     </div>
     
     <!-- Register form email address -->
     <div class="form-input">
-      <label for="user_email"><%= _('Email') %></label>
-      <input type="email" id="user_email" name="user[email]" class="left-indent required" />
+      <%= f.label(:email, _('Email'), class: 'required') %>
+      <%= f.email_field(:email, class: 'left-indent required') %>
       <span role="" id="email_error" class="error-tooltip left-indent"></span>
     </div>
     
@@ -38,31 +36,31 @@
     
     <!-- Register form recovery email address -->
     <div class="form-input">
-      <label for="user_email"><%= _('Recovery Email') %></label>
-      <input type="email" id="user_recovery_email" name="user[recovery_email]" 
-             class="left-indent required"
-              title="<%= _('We will only use this address to recover your account if you change institutions') %>"/>
+      <%= f.label(:recovery_email, _('Recovery Email'), class: 'required') %>
+      <%= f.email_field(:recovery_email,
+        class: 'left-indent required',
+        title: _('We will only use this address to recover your account if you change institutions')) %>
       <span role="" id="recovery_email_error" class="error-tooltip left-indent"></span>
     </div>
     
     <!-- Register form password -->
     <div class="form-input">
-      <label for="user_password"><%= _('Password') %></label>
-      <input type="password" id="user_password" name="user[password]" 
-             class="left-indent required" value="" />
+      <%= f.label(:password, _('Password'), class: 'required') %>
+      <%= f.password_field(:password, class: 'left-indent required') %>
       <span role="" id="password_error" class="error-tooltip left-indent"></span>
     
       <div class="form-input checkbox-right">
-        <label for="password_show" class="checkbox-label"><%= _('Show password') %></label>
-        <input type="checkbox" id="password_show" />
+        <%= label_tag(:password_show, _('Show password'), class: 'checkbox-label') %>
+        <%= check_box_tag(:password_show, "1", false) %>
       </div>
     </div>
     
     <!-- Register form terms -->
     <div class="form-input top-indent">
-      <input type="checkbox" id="user_accept_terms" name="user[accept_terms]" 
-             class="required right-indent" />
-      <label for="user_accept_terms"><%= _('I accept the') %> <a href="<%= terms_path %>"><%= _('terms and conditions') %></a></label>
+      <%= f.check_box(:accept_terms, class: 'required right-indent') %>
+      <%= f.label(:accept_terms,
+          raw("#{_('I accept the')} <a href=\"#{terms_path}\">#{_('terms and conditions')}</a>"),
+          class: 'no-colon') %>
     </div>          
     
     <div class="form-input top-indent">
diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb
index 03ad822..52a84a5 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/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
index 1037259..d3a8366 100644
--- a/app/views/templates/_edit_template.html.erb
+++ b/app/views/templates/_edit_template.html.erb
@@ -18,7 +18,7 @@
       </div>
     </div>
     <div class="form-input">
-      <label for="status"><%= _('Status') %></label>
+      <%= label_tag(:status, _('Status')) %>
       <div id="status" class="read-only">
         <% if hash[:live].nil? %>
           <%= _('Unpublished') %>
@@ -32,13 +32,13 @@
       </div>
     </div>
     <div class="form-input">
-      <label for="created"><%= _('Created at') %></label>
+      <%= label_tag(:created, _('Created at')) %>
       <div id="created" class="read-only">
         <%= l template.created_at.to_date, formats: :short %>
       </div>
     </div>
     <div class="form-input">
-      <label for="updated"><%= _('Last updated') %></label>
+      <%= label_tag(:updated, _('Last updated')) %>
       <div id="updated" class="read-only">
         <%= l template.updated_at.to_date, formats: :short %>
       </div>
diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb
index c7f63df..0f5cacc 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>
diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss
index e47102d..10dd8b2 100644
--- a/lib/assets/stylesheets/dmproadmap/base.scss
+++ b/lib/assets/stylesheets/dmproadmap/base.scss
@@ -21,7 +21,10 @@
   color: $primary-color;
 }
 
-h1 { font-size: 40px; }
+h1 {
+  width: 65%;
+  font-size: 40px; 
+}
 h2 { font-size: 32px; }
 h3 { font-size: 26px; }
 h4 { font-size: 20px; }