diff --git a/app/views/branded/answers/_new_edit.html.erb b/app/views/branded/answers/_new_edit.html.erb
index bfa10cd..cb60fd6 100644
--- a/app/views/branded/answers/_new_edit.html.erb
+++ b/app/views/branded/answers/_new_edit.html.erb
@@ -44,7 +44,7 @@
   </div>
 <% end %>
 
-<%= form_for answer, url: {controller: :answers, action: :create_or_update}, html: {method: :post, 'data-autosave': question.id, class: 'form-answer' } do |f| %>
+<%= form_for answer, url: create_or_update_answers_path(question_id: question.id), html: {method: :post, 'data-autosave': question.id, class: 'form-answer' } do |f| %>
   <% if !readonly %>
     <%= f.hidden_field :plan_id %>
     <%= f.hidden_field :question_id %>
diff --git a/app/views/branded/guidances/new_edit.html.erb b/app/views/branded/guidances/new_edit.html.erb
index f6b126a..62a21d2 100644
--- a/app/views/branded/guidances/new_edit.html.erb
+++ b/app/views/branded/guidances/new_edit.html.erb
@@ -23,9 +23,10 @@
       <div class="checkbox">
         <%= f.label :published, raw("#{f.check_box :published, as: :check_boxes, 'data-toggle': 'tooltip', title: _("Check this box when you are ready for this guidance to appear on user's plans.")} #{_('Published?')}") %>
       </div>
-
-      <%= f.submit _('Save'), name: "edit_guidance_submit", class: "btn btn-primary" %>
-      <%= link_to _('Cancel'), admin_index_guidance_path, class: "btn btn-primary", role: 'button' %>
+      <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' %>
+      </div>
     <%end%>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/branded/layouts/_branding.html.erb b/app/views/branded/layouts/_branding.html.erb
index b3b8cdb..ea9994e 100644
--- a/app/views/branded/layouts/_branding.html.erb
+++ b/app/views/branded/layouts/_branding.html.erb
@@ -59,15 +59,16 @@
               <%= _('Admin') %>
               <span class="caret"></span>
             </a>
-            <ul class="dropdown-menu dmpopidor-dropdown" aria-labelledby="admin-menu">
+            <ul class="dropdown-menu dmpopidor-dropdow" aria-labelledby="admin-menu">
               <% if current_user.can_org_admin? %>
                 <li <%= 'class=active' if isActivePage(org_admin_plans_path) %>>
                   <%= link_to _('Plans'), org_admin_plans_path %>
                 </li>
               <% end %>
               <% if current_user.can_modify_templates? %>
-                  <li <%= 'class=active' if isActivePage(org_admin_templates_path) %>>
-                    <%= link_to _('Templates'), org_admin_templates_path %>
+                <% template_path = current_user.can_super_admin? ? org_admin_templates_path : organisational_org_admin_templates_path %>
+                  <li <%= 'class=active' if isActivePage(template_path) %>>
+                    <%= link_to _('Templates'), template_path %>
                   </li>
               <% end %>
               <% if current_user.can_modify_guidance? %>
diff --git a/app/views/branded/org_admin/phases/container.html.erb b/app/views/branded/org_admin/phases/container.html.erb
new file mode 100644
index 0000000..298e790
--- /dev/null
+++ b/app/views/branded/org_admin/phases/container.html.erb
@@ -0,0 +1,50 @@
+<% 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">
+    <h1><%= template.title %></h1>
+    <% referrer = template.customization_of.present? ? customisable_org_admin_templates_path : organisational_org_admin_templates_path %>
+    <%= link_to _('View all templates'), referrer, class: 'btn btn-default pull-right' %>
+  </div>
+</div>
+<div class="row org-admin">
+  <div class="col-md-12">
+    <!-- render navigation tabs for the template-->
+    <%= render partial: "/org_admin/templates/navigation", locals: local_assigns.merge({ modifiable: modifiable }) %>
+    <div class="tab-content">
+      <div role="tabpanel" class="tab-pane active">
+        <div class="panel panel-default">
+          <div class="panel-body">
+            <% # locals: { phase, template, edit, current_section } %>
+            <div class="pull-left">
+              <h2><%= _('Phase details')%></h2>
+            </div>
+            <div class="pull-right">
+              <%= link_to(_('Preview'), preview_org_admin_template_phase_path(template, phase), { class: 'btn btn-default phase_preview_link', role: 'button' }) %>
+            </div>
+            <div class="clearfix"></div>
+            <div class="row">
+              <div class="col-md-12">
+                <%= render partial: partial_path, locals: local_assigns.merge({ modifiable: modifiable }) %>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-md-12">
+                <h2><%= _('Sections') %></h2>
+                <% if phase.sections.length > 1 %>
+                  <div id="sections-accordion-controls">
+                    <div class="accordion-controls" data-parent="sections_accordion">
+                      <a href="#" data-toggle-direction="show"><%= _('expand all') %></a>
+                      <span>|</span>
+                      <a href="#" data-toggle-direction="hide"><%= _('collapse all') %></a>
+                    </div>
+                  </div>
+                <% end %>
+              </div>
+            </div>
+            <%= render partial: 'org_admin/sections/index', locals: local_assigns.merge({ modifiable: modifiable }) %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/branded/org_admin/templates/_edit.html.erb b/app/views/branded/org_admin/templates/_edit.html.erb
index 6041010..0bb0d04 100644
--- a/app/views/branded/org_admin/templates/_edit.html.erb
+++ b/app/views/branded/org_admin/templates/_edit.html.erb
@@ -1,67 +1,12 @@
 <div class="row org-admin">
   <div class="col-md-12">
-    <% if template == current && template.customization_of.nil? %>
-      <div class="template_edit" style="display: none;">
-        <%= render partial: "org_admin/templates/edit_template", locals: { template: template, template_hash: template_hash } %>
-      </div>
-    <% end %>
-  </div>
-</div>
-<div class="row org-admin">
-  <div class="col-md-12">
-    <div class="template_show">
-      <%= render partial: "org_admin/templates/show_template", locals: { template: template, current: current, template_hash: template_hash }%>
-    </div>
-  </div>
-</div>
-<div class="row org-admin">
-  <div class="col-md-12">
-    <% if template_hash[:template][:phases].present? && template_hash[:template][:phases].length > 1 %>
-      <div id="sections-accordion-controls">
-        <div class="accordion-controls" data-parent="phases_accordion">
-          <a href="#" data-toggle-direction="show"><%= _('expand all') %></a>
-          <span>|</span>
-          <a href="#" data-toggle-direction="hide"><%= _('collapse all') %></a>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-<!-- Accordion for phases -->
-<div class="row org-admin">
-  <div class="col-md-12">
-    <div class="panel-group" id="phases_accordion" role="tablist">
-      <!-- If template has phases-->
-      <% if template_hash[:template][:phases].present? %>
-        <% i = 0 %>
-        <% template_hash[:template][:phases].each do |phase_no, phase_hash| %>
-          <% phase = phase_hash[:data] %>
-            <div class="panel panel-default">
-              <div class="heading-button" role="button" data-toggle="collapse"
-                   data-parent="phases_accordion" 
-                   href="#collapsePhase<%= phase.id %>"
-                   aria-expanded="<%= i == 0 ? 'true' : 'false' %>" 
-                   aria-controls="#collapsePhase<%= phase.id %>">
-                   
-                <div class="panel-heading" role="tab" id="<%= "headingPhase#{phase.id}" %>">
-                  <div class="panel-title pull-left">
-                    <%= phase.title %>
-                  </div>
-                  <div class="pull-right">
-                    <i class="fa fa-plus pull-right" aria-hidden="true"></i>
-                  </div>
-                  <div class="clearfix"></div>
-                </div>
-              </div>
-              <div id="<%= "collapsePhase#{phase.id}" %>" class="panel-collapse collapse<%= i == 0 ? 'in' : '' %>" role="tabpanel" aria-labelledby="<%= "headingPhase#{phase.id}" %>"<%= i == 0 ? 'aria-expanded="true"' : '' %>>
-                <div class="panel-body">
-                  <%= render partial: 'org_admin/templates/show_phases_sections', locals: { phase: phase, phase_hash: phase_hash, template: template, current: current } %>
-                </div>
-              </div>
-            </div>
-            <% i += 1 %>
-        <% end %>
+    <div class="template_edit">
+      <%= form_for(template, url: org_admin_template_path(template.id), html: { 'data-method': :put, remote: true }) do |f| %>
+        <%= render partial: 'form', locals: { template: template, referrer: referrer, f: f }%>
       <% end %>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<%# passing phases separately here because we're only pulling down the necessary attributes %>
+<%= render partial: 'org_admin/phases/overview', locals: { template: template, phases: phases, modifiable: modifiable } %>
diff --git a/app/views/branded/org_admin/templates/_new.html.erb b/app/views/branded/org_admin/templates/_new.html.erb
new file mode 100644
index 0000000..2e594ab
--- /dev/null
+++ b/app/views/branded/org_admin/templates/_new.html.erb
@@ -0,0 +1,9 @@
+<div class="row org-admin">
+  <div class="col-md-12">
+    <div class="template_edit">
+      <%= form_for(template, url: org_admin_templates_path) do |f| %>
+        <%= render partial: 'form', locals: { template: template, referrer: referrer, f: f }%>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/branded/org_admin/templates/container.html.erb b/app/views/branded/org_admin/templates/container.html.erb
index d66cb5d..28c29e7 100644
--- a/app/views/branded/org_admin/templates/container.html.erb
+++ b/app/views/branded/org_admin/templates/container.html.erb
@@ -1,19 +1,19 @@
-<%= current_tab = '' unless current_tab.present? %>
+<% 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">
-    <h1><%= template.title %></h1>
-    <%= link_to _('View all templates'), org_admin_templates_path(r: current_tab), class: 'btn btn-default pull-right' %>
+    <h1><%= template.id.present? ? template.title : _('New Template') %></h1>
+    <%= link_to _('View all templates'), referrer, class: 'btn btn-default pull-right' %>
   </div>
 </div>
 <div class="row org-admin">
   <div class="col-md-12">
     <!-- render navigation tabs for the template-->
-    <%= render partial: "/org_admin/templates/admin_nav_tabs", locals: local_assigns %>
+    <%= render partial: "org_admin/templates/navigation", locals: local_assigns.merge({ modifiable: modifiable }) %>
     <div class="tab-content">
       <div role="tabpanel" class="tab-pane active">
         <div class="panel panel-default">
           <div class="panel-body">
-            <%= render partial: partial_path, locals: local_assigns %>
+            <%= render partial: partial_path, locals: local_assigns.merge({ referrer: referrer, modifiable: modifiable }) %>
           </div>
         </div>
       </div>
diff --git a/app/views/branded/org_admin/templates/index.html.erb b/app/views/branded/org_admin/templates/index.html.erb
index dd12050..d9d44ef 100644
--- a/app/views/branded/org_admin/templates/index.html.erb
+++ b/app/views/branded/org_admin/templates/index.html.erb
@@ -1,4 +1,3 @@
-<% # locals: funder_templates, org_templates, current_user, current_org, orgs, current_tab %>
 <div class="row org-admin">
   <div class="col-md-12">
     <h1><%= _('Templates') %></h1>
@@ -8,8 +7,8 @@
       <p><%= _('If you would like to modify one of the templates below, you must first change your organisation affiliation.') %></p>
     </div>
     <div class="col-md-6">
-      <%= form_for current_user, url: org_swap_user_path(current_user), html: {method: :put, id: 'super-admin-switch-org'} do |f| %>
-        <%= render partial: "shared/my_org", locals: {f: f, default_org: current_org, orgs: orgs, allow_other_orgs: false} %>
+      <%= form_for current_user, url: org_swap_user_path(current_user), namespace: 'superadmin', html: {method: :put, id: 'super-admin-switch-org'} do |f| %>
+        <%= render partial: "shared/my_org", locals: {f: f, default_org: current_user.org, orgs: orgs, allow_other_orgs: false} %>
         <%= f.submit _('Change affiliation'), class: 'btn btn-default' %>
       <% end %>
     </div>
@@ -20,62 +19,60 @@
     </p>
   </div>
 </div>
-<% selected_tab = current_tab || (current_user.can_super_admin? ? 'all-templates' : 'organisation-templates') %>
 <div class="row org-admin">
   <div class="col-md-12">
     <ul class="nav nav-tabs" role="tablist">
       <% if current_user.can_super_admin? %>
-        <li role="all-templates"<%= selected_tab == 'all-templates' ? 'class=active' : '' %>>
-          <a href="#all-templates" role="tab" aria-controls="all-templates" data-toggle="tab"><%= _('All Templates') %></a>
+        <li role="presentation" <%= isActivePage(org_admin_templates_path, true) ? ' class=active' : '' %>>
+          <%= link_to(_('All Templates'), org_admin_templates_path, { role: 'tab' }) %>
         </li>
       <% end %>
-      <li role="organisation-templates"<%= selected_tab == 'organisation-templates' ? 'class=active' : '' %>>
-        <a href="#organisation-templates" role="tab" aria-controls="organisation-templates" data-toggle="tab"><%= current_user.can_super_admin? ? _('%{org_name} Templates') % { org_name: current_user.org.name } : _('Own Templates') %></a>
+      <li role="presentation" <%= isActivePage(organisational_org_admin_templates_path) ? ' class=active' : '' %>>
+        <% if current_user.can_super_admin? %>
+          <% link_text = _('%{org_name} Templates') % { org_name: current_user.org.name } %>
+        <% else %>
+          <% link_text = _('Own Templates') %>
+        <% end %>
+        <%= link_to(link_text, organisational_org_admin_templates_path, { role: 'tab' }) %>
       </li>
-      <!-- If the Org is not just a funder then show the customizations table -->
-      <% if !current_org.funder_only? %>
-        <li role="funder-templates"<%= selected_tab == 'funder-templates' ? 'class=active' : '' %>>
-          <a href="#funder-templates" role="tab" aria-controls="funder-templates" data-toggle="tab"><%= _('Customizable Templates') %></a>
+      <% if !current_user.org.funder_only? %>
+        <li role="presentation" <%= isActivePage(customisable_org_admin_templates_path) ? ' class=active' : '' %>>
+          <%= link_to(_('Customizable Templates'), customisable_org_admin_templates_path, { role: 'tab' }) %>
         </li>
       <% end %>
     </ul>
   
     <div class="tab-content">
-      <% if current_user.can_super_admin? %>
-        <div id="all-templates" role="tabpanel" class="tab-pane<%= (selected_tab == 'all-templates' ? ' active' : '') %>">
-          <h2><%= _('All Templates') %></h2>
-          <%= paginable_renderise(
-            partial: 'paginable/templates/all',
-            controller: 'paginable/templates',
-            action: 'all', 
-            scope: all_templates,
-            query_params: { sort_field: 'templates.title', sort_direction: :asc },
-            locals: {current_org: current_org.id, published: published, scopes: scopes[:all], hide_actions: true}) %>
+      <div role="tabpanel" class="tab-pane active">
+        <div class="panel panel-default">
+          <div class="panel-body template-scope">
+            <h2><%= title %></h2>
+            <div class="template-table-filters">
+              <% filter_path = "/paginable/templates/#{action}/#{1}" %>
+              <% qry = query_params.collect{ |k,v| "#{k}=#{v}" }.join('&') %>
+              <ul class="nav navbar-nav">
+                <% if isActivePage(customisable_org_admin_templates_path) %>
+                  <li><%= link_to _('All (%{count})') % { count: all_count}, "#{filter_path}?#{qry}", 'data-remote': "true" %></li>
+                  <li><%= link_to _('Published (%{count})') % { count: published_count}, "#{filter_path}?f=published&#{qry}", 'data-remote': "true" %></li>
+                  <li><%= link_to _('Unpublished (%{count})') % { count: unpublished_count}, "#{filter_path}?f=unpublished&#{qry}", 'data-remote': "true" %></li>
+                  <li><%= link_to _('Not customised (%{count})') % { count: not_customized_count}, "#{filter_path}?f=not-customised&#{qry}", 'data-remote': "true" %></li>
+                <% else %>
+                  <li><%= link_to _('All (%{count})') % { count: all_count}, "#{filter_path}?#{qry}", 'data-remote': "true" %></li>
+                  <li><%= link_to _('Published (%{count})') % { count: published_count}, "#{filter_path}?f=published&#{qry}", 'data-remote': "true" %></li>
+                  <li><%= link_to _('Unpublished (%{count})') % { count: unpublished_count}, "#{filter_path}?f=unpublished&#{qry}", 'data-remote': "true" %></li>
+                <% end %>
+              </ul>
+            </div>
+            <%= paginable_renderise(
+                  partial: "paginable/templates/#{action}",
+                  controller: 'paginable/templates',
+                  action: action, 
+                  scope: templates,
+                  query_params: { sort_field: 'templates.title', sort_direction: :asc },
+                  locals: local_assigns) %>
+          </div>
         </div>
-      <% end %>
-      <div id="organisation-templates" role="tabpanel" class="tab-pane<%= selected_tab == 'organisation-templates' ? ' active' : '' %>">
-        <h2><%= current_user.can_super_admin? ? _('%{org_name} Templates') % { org_name: current_user.org.name } : _('Own Templates') %></h2>
-        <%= paginable_renderise(
-          partial: 'paginable/templates/orgs',
-          controller: 'paginable/templates',
-          action: 'orgs', 
-          scope: own_templates,
-          query_params: { sort_field: 'templates.title', sort_direction: :asc },
-          locals: {current_org: current_org.id, published: published, scopes: scopes[:orgs], hide_actions: false}) %>
       </div>
-      <!-- If the Org is not just a funder then show the customizations table -->
-      <% if !current_org.funder_only? %>
-        <div id="funder-templates" role="tabpanel" class="tab-pane<%= selected_tab == 'funder-templates' ? ' active' : '' %>">
-          <h2><%= _('Customizable Templates') %></h2>
-          <%= paginable_renderise(
-            partial: 'paginable/templates/funders',
-            controller: 'paginable/templates',
-            action: 'funders', 
-            scope: customizable_templates,
-            query_params: { sort_field: 'templates.title', sort_direction: :asc },
-            locals: {current_org: current_org.id, customizations: customized_templates, published: published, scopes: scopes[:funders]}) %>
-        </div>
-      <% end %>
     </div>
 
     <a href="<%= new_org_admin_template_path %>" class="btn btn-primary" role="button">
diff --git a/app/views/branded/questions/_new_edit_question_option_based.html.erb b/app/views/branded/questions/_new_edit_question_option_based.html.erb
index 85633d3..2684da7 100644
--- a/app/views/branded/questions/_new_edit_question_option_based.html.erb
+++ b/app/views/branded/questions/_new_edit_question_option_based.html.erb
@@ -5,7 +5,7 @@
     <% options.each do |op| %>
         <div class="checkbox">
             <label>
-                <%= f.check_box(:question_option_ids, { multiple: true, checked: answer.has_question_option(op.id) }, op.id, nil) %>
+                <%= f.check_box(:question_option_ids, { multiple: true, checked: answer.has_question_option(op.id) || (answer.question_options.empty? && op.is_default?) }, op.id, nil) %>
                 <%= raw op.text %>
             </label>
         </div>
@@ -15,7 +15,7 @@
     <% options.each do |op| %>
         <div class="radio">
             <label>
-                <%= f.radio_button :question_option_ids, op.id, { checked: answer.has_question_option(op.id), id: "answer_option_ids_#{op.id}" } %>
+                <%= f.radio_button :question_option_ids, op.id, { checked: answer.has_question_option(op.id) || (answer.question_options.empty? && op.is_default?), id: "answer_option_ids_#{op.id}" } %>
                 <%= raw op.text %>
             </label>
         </div>
@@ -24,7 +24,7 @@
     <%
         options_html = ""
         options.each do |op|
-            options_html += answer.has_question_option(op.id) ?
+            options_html += answer.has_question_option(op.id) || (answer.question_options.empty? && op.is_default?) ?
                 "<option value=#{op.id} selected=\"selected\">#{op.text}</option>" :
                 "<option value=#{op.id}>#{op.text}</option>"
         end
diff --git a/app/views/branded/super_admin/notifications/edit.html.erb b/app/views/branded/super_admin/notifications/edit.html.erb
new file mode 100644
index 0000000..47f8970
--- /dev/null
+++ b/app/views/branded/super_admin/notifications/edit.html.erb
@@ -0,0 +1,11 @@
+<div class="row super-admin">
+  <div class="col-xs-12">
+    <h2><%= _('Editing Notification') %></h2>
+  </div>
+</div>
+<div class="row super-admin">
+ <div class="col-xs-12">
+    <%= render 'form' %>
+  </div>
+</div>
+
diff --git a/app/views/branded/super_admin/notifications/index.html.erb b/app/views/branded/super_admin/notifications/index.html.erb
new file mode 100644
index 0000000..9915b6b
--- /dev/null
+++ b/app/views/branded/super_admin/notifications/index.html.erb
@@ -0,0 +1,21 @@
+<div class="row super-admin">
+  <div class="col-xs-12">
+    <h2><%= _('Notifications') %></h2>
+  </div>
+</div>
+<div class="row super-admin">
+  <div class="col-xs-12">
+    <div class="pull-right">
+      <%= link_to _('+ Add New Notification'), new_super_admin_notification_path, class: 'btn btn-default', role: 'button' %>
+    </div>
+    <div class="table-responsive">
+      <%= paginable_renderise(
+        partial: '/paginable/notifications/index',
+        controller: 'paginable/notifications',
+        action: 'index',
+        scope: notifications,
+        query_params: { sort_field: 'notifications.starts_at', sort_direction: 'desc' })
+      %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/branded/super_admin/notifications/new.html.erb b/app/views/branded/super_admin/notifications/new.html.erb
new file mode 100644
index 0000000..e0a5431
--- /dev/null
+++ b/app/views/branded/super_admin/notifications/new.html.erb
@@ -0,0 +1,11 @@
+<div class="row super-admin">
+  <div class="col-xs-12">
+    <h2><%= _('New notification') %></h2>
+  </div>
+</div>
+<div class="row super-admin">
+ <div class="col-xs-12">
+    <%= render 'form' %>
+  </div>
+</div>
+