diff --git a/app/views/branded/contact_us/contacts/new.html.erb b/app/views/branded/contact_us/contacts/new.html.erb
index a3b35f5..8766dd2 100644
--- a/app/views/branded/contact_us/contacts/new.html.erb
+++ b/app/views/branded/contact_us/contacts/new.html.erb
@@ -1,3 +1,4 @@
+<% title _('Contact Us') %>
 <div class="row dmpopidor-contact-us">
   <div class="col-md-12">
     <h1><%= _("Contact Us") %></h1>
diff --git a/app/views/branded/guidance_groups/admin_edit.html.erb b/app/views/branded/guidance_groups/admin_edit.html.erb
index 26d90c9..8858f8b 100644
--- a/app/views/branded/guidance_groups/admin_edit.html.erb
+++ b/app/views/branded/guidance_groups/admin_edit.html.erb
@@ -1,3 +1,4 @@
+<% title _('Guidance group') %>
 <div class="row org-admin">
   <div class="col-md-12">
     <h1><%= _('Guidance group') %></h1>
@@ -11,7 +12,7 @@
       
         <div class="form-group col-xs-8">
           <%= f.label _('Name'), for: :name, class: "control-label" %>
-          <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the organisation or department name e.g. "OU" or "Maths & Stats"') %>
+          <%= f.text_field :name, as: :string, class: "form-control", 'aria-required': true, 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the organisation or department name e.g. "OU" or "Maths & Stats"') %>
         </div>
 
         <div class='form-input col-xs-8'> 
diff --git a/app/views/branded/guidance_groups/admin_new.html.erb b/app/views/branded/guidance_groups/admin_new.html.erb
index cd2610c..a5aa0ac 100644
--- a/app/views/branded/guidance_groups/admin_new.html.erb
+++ b/app/views/branded/guidance_groups/admin_new.html.erb
@@ -1,3 +1,4 @@
+<% title _('Guidance group') %>
 <div class="row org-admin">
   <div class="col-md-12">
     <h1><%= _('Guidance group') %></h1>
@@ -7,10 +8,10 @@
 
 <div class="row org-admin">
   <div class="col-md-12">
-    <%= form_for :guidance_group, url: {action: "admin_create"}, id: 'admin_create_guidance_group_form' do |f| %>
+    <%= form_for :guidance_group, url: {action: "admin_create"}, html: {id: 'admin_create_guidance_group_form'} do |f| %>
         <div class="form-group col-xs-8">
           <%= f.label _('Name'), for: :name, class: "control-label" %>
-          <%= f.text_field :name, as: :string, class: "form-control", 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the organisation or department name e.g. "OU" or "Maths & Stats"') %>
+          <%= f.text_field :name, as: :string, class: "form-control", 'aria-required': true, 'data-toggle': 'tooltip', title: _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the organisation or department name e.g. "OU" or "Maths & Stats"') %>
         </div>
 
         <div class='form-input col-xs-8'> 
diff --git a/app/views/branded/guidances/admin_index.html.erb b/app/views/branded/guidances/admin_index.html.erb
index 8bce990..124ea81 100644
--- a/app/views/branded/guidances/admin_index.html.erb
+++ b/app/views/branded/guidances/admin_index.html.erb
@@ -1,9 +1,10 @@
+<% title _('Guidance') %>
 <div class="row org-admin">
   <div class="col-md-12">
     <h1><%= _('Guidance') %></h1>
 
     <p class="text-justify">
-      <%= _("First create a guidance group. This could be organisation wide or a subset e.g. a particular College / School, Institute or department. When you create guidance you'll be asked to assign it to a guidance group.") %>
+      <%= raw _("First create a guidance group. This could be organisation wide or a subset e.g. a particular College / School, Institute or department. When you create guidance you'll be asked to assign it to a guidance group.") %>
     </p>
   </div>
 </div>
diff --git a/app/views/branded/guidances/new_edit.html.erb b/app/views/branded/guidances/new_edit.html.erb
index 62a21d2..cf41f7d 100644
--- a/app/views/branded/guidances/new_edit.html.erb
+++ b/app/views/branded/guidances/new_edit.html.erb
@@ -1,3 +1,4 @@
+<% title _('Guidance') %>
 <%# locals: { guidance, themes, guidance_groups, options } %>
 <div class="row org-admin">
   <div class="col-xs-12">
@@ -10,11 +11,11 @@
     <%= form_for(guidance, url: options[:url], html: { method: options[:method] , id: 'new_edit_guidance'}) do |f| %>
       <div class="form-group" data-toggle="tooltip" title="<%= _('Enter your guidance here. You can include links where needed.') %>">
         <%= f.label :text, class: 'control-label' %>
-        <%= text_area_tag("guidance-text", guidance.text, class: "tinymce form-control", 'aria-required': true, rows: 10) %>
+        <%= text_area_tag("guidance-text", guidance.text, class: "form-control", 'aria-required': true, rows: 10) %>
       </div>
-      <%= render partial: 'org_admin/shared/theme_selector', 
-                 locals: { f: f, all_themes: themes,
-                           popover_message: _('Select one or more themes that are relevant to this guidance. This will display your generic organisation-level guidance, as well as that from other sources e.g. the %{org_name} guidance or any Schools/Departments that you provide guidance for.') % { org_name: (current_user.org.abbreviation.present? ? current_user.org.abbreviation : current_user.org.name ) } } %>
+      <%= render partial: 'org_admin/shared/theme_selector',
+                 locals: { f: f, all_themes: themes, as_radio: true, required: true,
+                           popover_message: _('Select one theme that is relevant to this guidance. This will display your generic organisation-level guidance, or any Schools/Departments for which you create guidance groups, across all templates that have questions with the corresponding theme tags.') } %>
       <div class="form-group">
         <%= f.label _('Guidance group'), for: :guidance_group_id, class: 'control-label' %>
         <%= f.collection_select(:guidance_group_id, guidance_groups,
@@ -25,7 +26,7 @@
       </div>
       <div class="form-group clear-fix">
         <%= f.submit _('Save'), name: "edit_guidance_submit", class: "btn btn-primary" %>
-        <%= link_to _('Cancel'), admin_index_guidance_path, class: "btn btn-primary", role: 'button' %>
+        <%= link_to _('Cancel'), admin_index_guidance_path, class: "btn btn-primary", role: 'button' %>    
       </div>
     <%end%>
   </div>
diff --git a/app/views/branded/home/_welcome.html.erb b/app/views/branded/home/_welcome.html.erb
index aeec3d2..948ff8a 100644
--- a/app/views/branded/home/_welcome.html.erb
+++ b/app/views/branded/home/_welcome.html.erb
@@ -1,3 +1,4 @@
+<% title d_('dmpopidor', 'Welcome!') %>
 <div class="dmpopidor-front-page">
   <div class="row main-title">
     <h1>
diff --git a/app/views/branded/layouts/application.html.erb b/app/views/branded/layouts/application.html.erb
index ed08fa9..6145d56 100644
--- a/app/views/branded/layouts/application.html.erb
+++ b/app/views/branded/layouts/application.html.erb
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>
-      <%= _('%{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %>
+    <title><%= content_for?(:title) ? yield(:title) : _('%{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %> 
     </title>
       <%= favicon_link_tag "favicon.ico" %>
     <!--[ if lte IE 9]>
@@ -42,7 +41,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   </head>
   <body>
-
+      <div class="skip">
+        <a href="#maincontent"> _('Skip to main content') </a> 
+      </div>
       <!-- header rendering -->
       <header class="dmpopidor-branding">
         <%= render partial: "layouts/header" %>
@@ -54,7 +55,7 @@
       %>
 
       <!-- main page content rendering -->
-      <main class="container dmpopidor-branding">
+      <main class="container dmpopidor-branding" id="maincontent">
         <div id="notification-area"
              class="alert <%= has_alert ? 'alert-warning ' : 'alert-info ' %>
                     <%= (has_alert or has_notice) ? 'show' : 'hide' %>"
diff --git a/app/views/branded/org_admin/phases/container.html.erb b/app/views/branded/org_admin/phases/container.html.erb
index 298e790..35e155f 100644
--- a/app/views/branded/org_admin/phases/container.html.erb
+++ b/app/views/branded/org_admin/phases/container.html.erb
@@ -1,3 +1,4 @@
+<% title "#{template.title}" %>
 <% modifiable = template.latest? && !template.customization_of.present? && template.id.present? && (template.org_id = current_user.org.id) %>
 <div class="row org-admin">
   <div class="col-md-12">
diff --git a/app/views/branded/org_admin/plans/index.html.erb b/app/views/branded/org_admin/plans/index.html.erb
index 45f6ff6..1c87179 100644
--- a/app/views/branded/org_admin/plans/index.html.erb
+++ b/app/views/branded/org_admin/plans/index.html.erb
@@ -1,3 +1,4 @@
+<% title _('%{org_name} Plans') % { org_name: current_user.org.name } %>
 <div class="row org-admin">
   <div class="col-md-12">    
     <h1><%= _('%{org_name} Plans') % { org_name: current_user.org.name } %></h1>
diff --git a/app/views/branded/org_admin/templates/container.html.erb b/app/views/branded/org_admin/templates/container.html.erb
index 28c29e7..96cd19e 100644
--- a/app/views/branded/org_admin/templates/container.html.erb
+++ b/app/views/branded/org_admin/templates/container.html.erb
@@ -1,3 +1,4 @@
+<% title template.id.present? ? template.title : _('New Template') %>
 <% modifiable = template.latest? && !template.customization_of.present? && template.id.present? && (template.org_id = current_user.org.id) %>
 <div class="row org-admin">
   <div class="col-md-12">
diff --git a/app/views/branded/org_admin/templates/index.html.erb b/app/views/branded/org_admin/templates/index.html.erb
index d9d44ef..9dc396e 100644
--- a/app/views/branded/org_admin/templates/index.html.erb
+++ b/app/views/branded/org_admin/templates/index.html.erb
@@ -1,3 +1,4 @@
+<% title _('Templates') %>
 <div class="row org-admin">
   <div class="col-md-12">
     <h1><%= _('Templates') %></h1>
diff --git a/app/views/branded/orgs/admin_edit.html.erb b/app/views/branded/orgs/admin_edit.html.erb
index 886e827..6f1f12d 100644
--- a/app/views/branded/orgs/admin_edit.html.erb
+++ b/app/views/branded/orgs/admin_edit.html.erb
@@ -1,3 +1,4 @@
+<% title org.id.present? ? _('Organisation details') : _('New organisation') %>
 <div class="row org-admin">
   <div class="col-md-12">
     <h1><%= org.id.present? ? _('Organisation details') : _('New organisation') %></h1>
@@ -19,18 +20,29 @@
         </li>
       <% end %>
     </ul>
-  
-    <div class="tab-content">
-      <div id="profile" role="tabpanel" class="tab-pane active px-2">
-        <%= render partial: 'orgs/profile_form', locals: local_assigns %>
-      </div>
 
-      <% if org.id.present? %>
-        <div id="feedback" role="tabpanel" class="tab-pane">
-          <%= render partial: 'orgs/feedback_form', locals: local_assigns %>
+    <!-- render navigation tabs for the template-->
+    <div class="tab-content">
+      <div role="tabpanel" class="tab-pane active" id="profile">
+        <div class="panel panel-default">
+          <div class="panel-body">
+            <div class="px-2">
+              <%= render partial: 'orgs/profile_form', locals: local_assigns %>
+            </div>
+          </div>
         </div>
-      <% end %>
+      </div>
+      <div role="tabpanel" class="tab-pane" id="feedback">
+        <div class="panel panel-default">
+          <div class="panel-body">
+            <% if org.id.present? %>
+              <div>
+                <%= render partial: 'orgs/feedback_form', locals: local_assigns %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
-
diff --git a/app/views/branded/plans/new.html.erb b/app/views/branded/plans/new.html.erb
index de38152..5a28baa 100644
--- a/app/views/branded/plans/new.html.erb
+++ b/app/views/branded/plans/new.html.erb
@@ -1,8 +1,9 @@
+<% title _('Create a new plan') %>
 <div class="row">
   <div class="col-md-12">
     <%= form_for Plan.new, url: plans_path do |f| %>
       <!-- Plan name section -->
-      <h1 id="project-title"><%= _('Project title') %></h1>
+      <h1 id="project-title"><span class="red" title="<%= _('This field is required.') %>">* </span><%= _('Project title') %></h1>
       <div class="form-group row">
         <div class="col-xs-6">
           <%= f.text_field(:title, class: 'form-control', 'aria-describedby': 'project-title', 'aria-required': 'true', 
@@ -27,7 +28,7 @@
         </ul>
         <%= link_to d_('dmpopidor', 'Find the list of the available templates'), public_templates_path, :target => "_blank" %>
       </p>
-      <h2 id="research-org"><%= d_('dmpopidor', 'Select a research organisation:') %></h2>
+      <h2 id="research-org"><span class="red" title="<%= _('You must select a research organisation from the list or click the checkbox.') %>">* </span><%= d_('dmpopidor', 'Select a research organisation:') %></h2>
       <div class="form-group row">
         <div class="col-md-6">
           <%= render partial: "shared/accessible_combobox", 
@@ -43,13 +44,14 @@
         <div class="col-md-1 pad-top-10 create-plan-or"><strong>- <%= _('or') %> -</strong></div>
         <div class="col-md-5 create-plan-checkbox">
           <div class="checkbox">
-            <%= label_tag(:plan_no_org, raw("#{check_box_tag(:plan_no_org)} #{ d_('dmpopidor', 'No research organisation')}")) %>
+            <% primary_research_org_message = d_('dmpopidor', 'No research organisation') %>
+            <%= label_tag(:plan_no_org, raw("#{check_box_tag(:plan_no_org)} #{primary_research_org_message}")) %>
           </div>
         </div>
       </div>
   
       <!-- Funder selection -->
-      <h2 id="funder-org"><%= d_('dmpopidor', 'Select a funder:') %></h2>
+      <h2 id="funder-org"><span class="red" title="<%= _('You must select a funder from the list or click the checkbox.') %>">* </span><%= d_('dmpopidor', 'Select a funder:') %></h2>
       <div class="form-group row">
         <div class="col-xs-6">
           <%= render partial: "shared/accessible_combobox", 
@@ -65,7 +67,8 @@
         <div class="col-md-1 create-plan-or"><strong>- <%= _('or') %> -</strong></div>
         <div class="col-xs-5 create-plan-checkbox">
           <div class="checkbox">
-            <%= label_tag(:plan_no_funder, raw("#{check_box_tag(:plan_no_funder)} #{ d_('dmpopidor', 'No funder associated with this plan')}")) %>
+            <% primary_funding_message = d_('dmpopidor', 'No funder associated with this plan') %>
+            <%= label_tag(:plan_no_funder, raw("#{check_box_tag(:plan_no_funder)} #{primary_funding_message}")) %>
           </div>
         </div>
       </div>
diff --git a/app/views/branded/shared/_accessible_combobox.html.erb b/app/views/branded/shared/_accessible_combobox.html.erb
index 5625068..fd31642 100644
--- a/app/views/branded/shared/_accessible_combobox.html.erb
+++ b/app/views/branded/shared/_accessible_combobox.html.erb
@@ -6,18 +6,20 @@
 
   <% json = {} %>
   <% models.map{|m| json["#{m[attribute]}"] = m.id} %>
-
+  <!-- If the incoming name has a namespace prefix, remove it so that the controller can access the params -->
+  <% name = name.gsub(name.match(/^.*\[/)[0].split('_')[0] + '_', '') %>
   <input type="text" name="<%= name %>" id="<%= id %>" 
          class="js-combobox form-control <%= classes %>" list="<%= id %>_list" 
          placeholder="<%= _('Begin typing to see a filtered list') %>"
          data-combobox-prefix-class="combobox"
          data-combobox-case-sensitive="no"
          data-combobox-limit-number-suggestions="10"
-         data-combobox-see-more-text="Please refine your seach ..."
+         data-combobox-see-more-text="Please refine your search ..."
          data-combobox-search-option="containing"
          data-combobox-allow-suggestion-on-empty="true"
          data-toggle="<%= title == '' ? '' : 'tooltip' %>"
          title="<%= title %>"
+         aria-label= "<%= title %>",
          value="<%= default_selection[attribute] unless default_selection.nil? %>" />
   <datalist id="<%= id %>_list">
     <% models.each do |model| %>
@@ -33,7 +35,7 @@
   <!-- the selected id is found after the combobox loses focus by finding the selected item in the crosswalk json -->
   <input type="hidden" id="<%= id.gsub("_#{attribute}", "_id") %>" name="<%= name.gsub("_#{attribute}]", "_id]") %>"
          value="<%= default_selection.id unless default_selection.nil? %>" aria-required="<%= required %>"
-         data-validation="js-combobox" data-validation-error="<%= error %>" />
+         class="org-id" data-validation="js-combobox" data-validation-error="<%= error %>" />
 
 <% else %>
   <span id="<%= id %>_no_items"><%= _('No items available.') %></span>
diff --git a/app/views/branded/shared/_create_account_form.html.erb b/app/views/branded/shared/_create_account_form.html.erb
index 83520db..2a21f0a 100644
--- a/app/views/branded/shared/_create_account_form.html.erb
+++ b/app/views/branded/shared/_create_account_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for resource, as: 'user', url: registration_path("user"), html: {autocomplete: "off", id: "create_account_form"} do |f| %>
+<%= form_for resource, as: 'user', namespace: 'new_user', url: registration_path("user"), html: {autocomplete: "off", id: "create_account_form"} do |f| %>
 
   <div class="form-group">
     <%= f.label(:firstname, _('First Name'), class: "control-label") %>
@@ -15,7 +15,8 @@
   <div class="form-group">
     <%= render partial: "shared/my_org", 
                locals: {f: f, default_org: @default_org, 
-                        orgs: Org.where("parent_id IS NULL").order("sort_name ASC, name ASC"), allow_other_orgs: true} %>
+                        orgs: Org.where("parent_id IS NULL").order("sort_name ASC, name ASC"), 
+                        allow_other_orgs: true, required: true} %>
   </div>
 
   <div class="form-group">
diff --git a/app/views/branded/static_pages/about_us.html.erb b/app/views/branded/static_pages/about_us.html.erb
index d10af66..09c8c9b 100644
--- a/app/views/branded/static_pages/about_us.html.erb
+++ b/app/views/branded/static_pages/about_us.html.erb
@@ -1,4 +1,4 @@
-
+<% title t("about_page.title") %>
 <h1>
 <%= t("about_page.title")%>
 </h1>
diff --git a/app/views/branded/static_pages/help.html.erb b/app/views/branded/static_pages/help.html.erb
index ca2a212..e2705dd 100644
--- a/app/views/branded/static_pages/help.html.erb
+++ b/app/views/branded/static_pages/help.html.erb
@@ -1,3 +1,4 @@
+<% title _('Help') %>
 <script>
 	$(function(){
 	  var hash = window.location.hash;
diff --git a/app/views/branded/static_pages/termsuse.html.erb b/app/views/branded/static_pages/termsuse.html.erb
index 2ac164b..70e1977 100644
--- a/app/views/branded/static_pages/termsuse.html.erb
+++ b/app/views/branded/static_pages/termsuse.html.erb
@@ -1,3 +1,4 @@
+<% title _('Terms of use') %>
 <h1>
 	<%= t('terms_page.title')%>
 </h1>
diff --git a/app/views/branded/super_admin/notifications/edit.html.erb b/app/views/branded/super_admin/notifications/edit.html.erb
index 47f8970..57d27c7 100644
--- a/app/views/branded/super_admin/notifications/edit.html.erb
+++ b/app/views/branded/super_admin/notifications/edit.html.erb
@@ -1,3 +1,4 @@
+<% title _('Editing Notification') %>
 <div class="row super-admin">
   <div class="col-xs-12">
     <h2><%= _('Editing Notification') %></h2>
diff --git a/app/views/branded/super_admin/notifications/index.html.erb b/app/views/branded/super_admin/notifications/index.html.erb
index 9915b6b..b679eaa 100644
--- a/app/views/branded/super_admin/notifications/index.html.erb
+++ b/app/views/branded/super_admin/notifications/index.html.erb
@@ -1,3 +1,4 @@
+<% title _('Notifications') %>
 <div class="row super-admin">
   <div class="col-xs-12">
     <h2><%= _('Notifications') %></h2>
diff --git a/app/views/branded/super_admin/notifications/new.html.erb b/app/views/branded/super_admin/notifications/new.html.erb
index e0a5431..ee244e3 100644
--- a/app/views/branded/super_admin/notifications/new.html.erb
+++ b/app/views/branded/super_admin/notifications/new.html.erb
@@ -1,3 +1,4 @@
+<% title _('New notification') %>
 <div class="row super-admin">
   <div class="col-xs-12">
     <h2><%= _('New notification') %></h2>
diff --git a/app/views/branded/super_admin/orgs/index.html.erb b/app/views/branded/super_admin/orgs/index.html.erb
index efe7867..07c536d 100644
--- a/app/views/branded/super_admin/orgs/index.html.erb
+++ b/app/views/branded/super_admin/orgs/index.html.erb
@@ -1,4 +1,5 @@
 <%# Available locals: orgs %>
+<% title _('Organisations') %>
 <div class="row super-admin">
   <div class="col-md-12">
     <h1>
diff --git a/app/views/branded/super_admin/themes/index.html.erb b/app/views/branded/super_admin/themes/index.html.erb
index bc59506..b5cf90b 100644
--- a/app/views/branded/super_admin/themes/index.html.erb
+++ b/app/views/branded/super_admin/themes/index.html.erb
@@ -1,3 +1,4 @@
+<% title _('Themes') %>
 <div class="row super-admin">
   <div class="col-xs-12">
     <h2><%= _('Themes') %></h2>
diff --git a/app/views/branded/super_admin/themes/new_edit.html.erb b/app/views/branded/super_admin/themes/new_edit.html.erb
index efe462f..64645fe 100644
--- a/app/views/branded/super_admin/themes/new_edit.html.erb
+++ b/app/views/branded/super_admin/themes/new_edit.html.erb
@@ -1,4 +1,5 @@
 <%# locals: { theme, options } %>
+<% title "#{options[:title]}" %>
 <div class="row super-admin">
   <div class="col-xs-12">
     <h2><%= options[:title] %></h2>
@@ -8,31 +9,31 @@
 <div class="row super-admin">
  <div class="col-xs-12">
     <%= form_for theme, url: options[:url], method: options[:method], html: { class: 'theme' } do |f| %>
-        <div class="form-group">
-            <%= f.label(:title, _('Title'), class: 'control-label') %>
-            <%= f.text_field(:title,
-                class: "form-control",
-                value: theme.title,
-                "aria-required": true) %>
-        </div>
-        <div class="form-group">
-            <%= f.label(:description, _('Guidance')) %>
-            <%= f.text_area(:description,
-                class: "form-control",
-                rows: 10) %>
-        </div>
-        <div class="pull-right">
-            <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
-            <%= link_to(
-                _('Delete'),
-                super_admin_theme_path(theme),
-                class: 'btn btn-default',
-                rel: 'nofollow',
-                    'data-method': 'delete',
-                    'data-confirm': _("Are you sure you want to delete the theme \"%{title}\"?") %{ :title => theme.title }) if options[:method] == :PUT %>
-                <%= link_to(_('Cancel'), super_admin_themes_path, class: 'btn btn-default', role: 'button') %>
-            </div>
-        <% end %>
+    <div class="form-group">
+        <%= f.label(:title, _('Title'), class: 'control-label') %>
+        <%= f.text_field(:title,
+            class: "form-control",
+            value: theme.title,
+            "aria-required": true) %>
+    </div>
+    <div class="form-group">
+        <%= f.label(:description, _('Guidance')) %>
+        <%= f.text_area(:description,
+            class: "form-control",
+            rows: 10) %>
+    </div>
+    <div class="pull-right">
+        <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
+        <%= link_to(
+            _('Delete'),
+            super_admin_theme_path(theme),
+            class: 'btn btn-default',
+            rel: 'nofollow',
+            'data-method': 'delete',
+            'data-confirm': _("Are you sure you want to delete the theme \"%{title}\"?") %{ :title => theme.title }) if options[:method] == :PUT %>
+        <%= link_to(_('Cancel'), super_admin_themes_path, class: 'btn btn-default', role: 'button') %>
+    </div>
+    <% end %>
     </div>
    
 </div>
\ No newline at end of file
diff --git a/app/views/branded/usage/index.html.erb b/app/views/branded/usage/index.html.erb
index 5672350..d291736 100644
--- a/app/views/branded/usage/index.html.erb
+++ b/app/views/branded/usage/index.html.erb
@@ -1,6 +1,8 @@
+<% title _('Usage statistics') %>
+
 <div class="row org-admin">
   <div class="col-md-12">
-    <h1>Usage statistics</h1>
+    <h1><%= _('Usage statistics') %></h1>
     <p><%= _('Use the filters to generate organisational usage statistics for a custom date range. The graphs display new users and plans for your organisation over the past year. You can download a CSV report for each graph.') %></p>
   </div>
 </div>
diff --git a/app/views/branded/users/admin_index.html.erb b/app/views/branded/users/admin_index.html.erb
index d212656..5a61bce 100644
--- a/app/views/branded/users/admin_index.html.erb
+++ b/app/views/branded/users/admin_index.html.erb
@@ -1,3 +1,5 @@
+<% title _('User accounts') %>
+
 <div class="row org-admin">
   <div class="col-md-12">
     <h1><%= _('User accounts') %></h1>
@@ -14,8 +16,8 @@
         partial: '/paginable/users/index',
         controller: 'paginable/users',
         action: 'index', 
-        scope: @users, 
-        locals: { page: 1 }) %>
+        scope: @users,
+        view_all: !current_user.can_super_admin?) %>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/config/locale/fr_FR/app.po b/config/locale/fr_FR/app.po
index eafbe70..2093273 100644
--- a/config/locale/fr_FR/app.po
+++ b/config/locale/fr_FR/app.po
@@ -66,13 +66,13 @@
 msgstr "%{commenter} a fourni une assistance conseil sur le plan \"%{plan_title}\". Pour voir les commentaires, consultez le Tableau de Bord sur %{tool_name} et ouvrez votre plan."
 
 msgid "%{org_name} Plans"
-msgstr "%{org_name} Plans"
+msgstr "Plans %{org_name}"
 
 msgid "%{org_name} Templates"
 msgstr "%{org_name} Modèles"
 
 msgid "%{org_title} Plans"
-msgstr "%{org_title} Plans"
+msgstr "Plans %{org_title}"
 
 msgid "%{org} Example Answer"
 msgstr "Exemple de réponse %{org}"