diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 5da69b3..3d9d60a 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/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 5ee124f..14d676a 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 %>
 
@@ -88,7 +76,7 @@
                   <i class="fa fa-user" title="<%= scheme.name %>" aria-hidden="true" style="font-size:16px; width:16px; text-align:center;"></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}",
@@ -100,10 +88,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 %>
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/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 8b63228..9f964b4 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -38,7 +38,7 @@
   
       <br />
       <div>
-        <label><strong><%= _('Data Contact Person') %></strong></label>
+        <%= f.label(:data_contact, raw("<strong>#{_('Data Contact Person')}</strong>"), class: 'no-colon') %>
       </div>
       <div class="form-input">
         <%= f.label _('Name'), for: :data_contact %>
@@ -50,22 +50,37 @@
       <br />
       <div class="form-input">
         <div class="button-spacer">&nbsp;</div>
-        <input type="submit" class="form-submit" value="<%= _('Save') %>" />
+        <%= submit_tag(_('Save'), class: 'form-submit') %>
       </div>
     </fieldset>
   </div>
 
   <div class="edit-plan-right">
     <fieldset class="standard">
-      <input type="hidden" id="plan_visibility" name="plan[visibility]" value="<%= visibility %>" />
+      <%= f.hidden_field(:visibility, value: visibility) %>
       <span class="fa fa-question-circle"></span>
       <div class="left-indent inline">
-        <label for="visibility"> <%= _('Plan Visibility') %></label>
+        <%= f.label(:visibility, _('Plan Visibility')) %>
         <div class="left-indent">(<%= _('Limited to finished plans') %>)</div>
         <br />
-        <div><input type="radio" name="vis" id='privately_visible' class="right-indent"<%= !['publicly_visible', 'organisationally_visible'].include?(visibility) ? ' checked=true' : '' %> /><%= raw display_visibility('privately_visible') %></div>
-        <div><input type="radio" name="vis" id="organisationally_visible" class="right-indent"<%= 'organisationally_visible' == visibility ? ' checked=true' : '' %> /><%= raw display_visibility('organisationally_visible') %></div>
-        <div><input type="radio" name="vis" id="publicly_visible" class="right-indent"<%= 'publicly_visible' == visibility ? ' checked=true' : '' %> /><%= raw display_visibility('publicly_visible') %></div>
+        <div>
+          <%= radio_button_tag(:vis, 0, !['publicly_visible', 'organisationally_visible'].include?(visibility),
+              class: 'right-indent',
+              id:'privately_visible') %>
+          <%= raw display_visibility('privately_visible') %>
+        </div>
+        <div>
+          <%= radio_button_tag(:vis, 0, 'organisationally_visible' == visibility,
+              class: 'right-indent',
+              id: 'organisationally_visible') %>
+          <%= raw display_visibility('organisationally_visible') %>
+        </div>
+        <div>
+          <%= radio_button_tag(:vis, 0, 'publicly_visible' == visibility,
+              class: 'right-indent',
+              id: 'publicly_visible') %>
+          <%= raw display_visibility('publicly_visible') %>
+        </div>
       </div>
     </fieldset>
     
@@ -74,8 +89,7 @@
       <p><%= _('To help you write your plan, %{application_name} can show you guidance from a variety of organisations.') % {application_name: Rails.configuration.branding[:application][:name]} %></p>
       <br />
       <p><% _('Select up to 3 organisations to see their guidance.') %></p>
-      
-<%= @important_ggs.inspect %>
+      <% #@important_ggs.inspect %>
     </div>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index eea3a57..b500f23 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>
     
@@ -66,10 +63,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>
 
@@ -81,9 +76,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/_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/settings/phases/_export_formatting_form.html.erb b/app/views/settings/phases/_export_formatting_form.html.erb
index a44944c..915bce1 100644
--- a/app/views/settings/phases/_export_formatting_form.html.erb
+++ b/app/views/settings/phases/_export_formatting_form.html.erb
@@ -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|
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_template.html.erb b/app/views/templates/_edit_template.html.erb
index 0481d27..76e5905 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>