diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7f8b1f5..3c83335 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
+
   protect_from_forgery with: :exception
 
   # Look for template overrides before rendering
@@ -16,11 +19,15 @@
 
   private
 
+  def current_org
+    current_user.org
+  end
+
   def user_not_authorized
     if user_signed_in?
-      redirect_to plans_url, alert: _('You are not authorized to perform this action.')
+      redirect_to plans_url, alert: _("You are not authorized to perform this action.")
     else
-      redirect_to root_url, alert: _('You need to sign in or sign up before continuing.')
+      redirect_to root_url, alert: _("You need to sign in or sign up before continuing.")
     end
   end
 
@@ -30,7 +37,8 @@
   end
 
   def store_location
-    # store last url - this is needed for post-login redirect to whatever the user last visited.
+    # store last url - this is needed for post-login redirect to whatever the user last
+    # visited.
     unless ["/users/sign_in",
             "/users/sign_up",
             "/users/password",
@@ -43,7 +51,9 @@
 
   def after_sign_in_path_for(resource)
     referer_path = URI(request.referer).path unless request.referer.nil? or nil
-    if from_external_domain? || referer_path.eql?(new_user_session_path) || referer_path.eql?(new_user_registration_path) || referer_path.nil?
+    if from_external_domain? || referer_path.eql?(new_user_session_path) ||
+         referer_path.eql?(new_user_registration_path) ||
+         referer_path.nil?
       root_path
     else
       request.referer
@@ -51,8 +61,10 @@
   end
 
   def after_sign_up_path_for(resource)
-    referer_path = URI(request.referer).path unless request.referer.nil? or nil
-    if from_external_domain? || referer_path.eql?(new_user_session_path) || referer_path.nil?
+    referer_path = URI(request.referer).path unless request.referer.nil?
+    if from_external_domain? ||
+         referer_path.eql?(new_user_session_path) ||
+         referer_path.nil?
       root_path
     else
       request.referer
@@ -69,23 +81,27 @@
 
   def authenticate_admin!
     # currently if admin has any super-admin task, they can view the super-admin
-    redirect_to root_path unless user_signed_in? && (current_user.can_add_orgs? || current_user.can_change_org? || current_user.can_super_admin?)
+    unless user_signed_in? && (current_user.can_add_orgs? ||
+                               current_user.can_change_org? ||
+                               current_user.can_super_admin?)
+      redirect_to root_path
+    end
   end
 
   def failed_create_error(obj, obj_name)
-    "#{_('Could not create your %{o}.') % {o: obj_name}} #{errors_to_s(obj)}"
+    "#{_('Could not create your %{o}.') % { o: obj_name }} #{errors_to_s(obj)}"
   end
 
   def failed_update_error(obj, obj_name)
-    "#{_('Could not update your %{o}.') % {o: obj_name}} #{errors_to_s(obj)}"
+    "#{_('Could not update your %{o}.') % { o: obj_name }} #{errors_to_s(obj)}"
   end
 
   def failed_destroy_error(obj, obj_name)
-    "#{_('Could not delete the %{o}.') % {o: obj_name}} #{errors_to_s(obj)}"
+    "#{_('Could not delete the %{o}.') % { o: obj_name }} #{errors_to_s(obj)}"
   end
 
   def success_message(obj_name, action)
-    "#{_('Successfully %{action} your %{object}.') % {object: obj_name, action: action}}"
+    _("Successfully %{action} your %{object}.") % { object: obj_name, action: action }
   end
 
   # Override rails default render action to look for a branded version of a
@@ -102,8 +118,8 @@
   def errors_to_s(obj)
     if obj.errors.count > 0
       msg = "<br />"
-      obj.errors.each do |e,m|
-        if m.include?('empty') || m.include?('blank')
+      obj.errors.each do |e, m|
+        if m.include?("empty") || m.include?("blank")
           msg += "#{_(e)} - #{_(m)}<br />"
         else
           msg += "'#{obj[e]}' - #{_(m)}<br />"
@@ -135,4 +151,5 @@
       false
     end
   end
+
 end
diff --git a/app/controllers/org_admin/sections_controller.rb b/app/controllers/org_admin/sections_controller.rb
index bb8d0b7..41c545d 100644
--- a/app/controllers/org_admin/sections_controller.rb
+++ b/app/controllers/org_admin/sections_controller.rb
@@ -62,37 +62,29 @@
 
     # POST /org_admin/templates/[:template_id]/phases/[:phase_id]/sections
     def create
-      phase = Phase.find(params[:phase_id])
-      if phase.present?
-        section = Section.new(section_params.merge(phase_id: phase.id))
-        authorize section
-        begin
-          section = get_new(section)
-          if section.save
-            flash[:notice] = success_message(_("section"), _("created"))
-            redirect_to edit_org_admin_template_phase_path(
-              id: section.phase.id,
-              template_id: section.phase.template.id,
-              section: section.id)
-          else
-            flash[:alert] = failed_create_error(section, _("section"))
-            redirect_to edit_org_admin_template_phase_path(
-              template_id: section.phase.template.id,
-              id: section.phase.id
-            )
-          end
-        rescue StandardError => e
-          flash[:alert] = _("Unable to create a new version of this template.")
-          redirect_to edit_org_admin_template_phase_path(
-            template_id: section.phase.template.id,
-            id: section.phase.id
-                      )
-        end
-      else
-        # rubocop:disable Metrics/LineLength
-        flash[:alert] = _("Unable to create a new section because the phase you specified does not exist.")
-        # rubocop:enable Metrics/LineLength
+      @phase = Phase.find_by(id: params[:phase_id])
+      if @phase.nil?
+        flash[:alert] =
+          _("Unable to create a new section. The phase you specified does not exist.")
         redirect_to edit_org_admin_template_path(template_id: params[:template_id])
+        return
+      end
+      @section = @phase.sections.new(section_params)
+      authorize @section
+      @section = get_new(@section)
+      if @section.save
+        flash[:notice] = success_message(_("section"), _("created"))
+        redirect_to edit_org_admin_template_phase_path(
+          id: @section.phase_id,
+          template_id: @phase.template_id,
+          section: @section.id
+        )
+      else
+        flash[:alert] = failed_create_error(@section, _("section"))
+        redirect_to edit_org_admin_template_phase_path(
+          template_id: @phase.template_id,
+          id: @section.phase_id
+        )
       end
     end
 
diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index 3a9e399..aeb72e2 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -144,31 +144,27 @@
     # GET /org_admin/templates/new
     def new
       authorize Template
-      render "container", locals: {
-        partial_path: "new",
-        template: Template.new(org: current_user.org),
-        referrer: request.referrer.present? ? request.referrer : org_admin_templates_path
-      }
+      @template = current_org.templates.new
     end
 
     # POST /org_admin/templates
     def create
       authorize Template
       # creates a new template with version 0 and new family_id
-      template = Template.new(template_params)
-      template.org_id = current_user.org.id
-      template.links = if params["template-links"].present?
-                         ActiveSupport::JSON.decode(params["template-links"])
-                       else
-                         { "funder": [], "sample_plan": [] }
-                       end
-      if template.save
-        redirect_to edit_org_admin_template_path(template),
-                    notice: success_message(template_type(template), _("created"))
+      @template = Template.new(template_params)
+      @template.org_id = current_user.org.id
+      @template.locale = current_org.language.abbreviation
+      @template.links = if params["template-links"].present?
+                          ActiveSupport::JSON.decode(params["template-links"])
+                        else
+                          { "funder": [], "sample_plan": [] }
+                        end
+      if @template.save
+        redirect_to edit_org_admin_template_path(@template),
+                    notice: success_message(template_type(@template), _("created"))
       else
-        flash[:alert] = failed_create_error(template, template_type(template))
-        render partial: "org_admin/templates/new",
-               locals: { template: template, hash: hash }
+        flash[:alert] = failed_create_error(@template, template_type(@template))
+        render :new
       end
     end
 
diff --git a/app/helpers/template_helper.rb b/app/helpers/template_helper.rb
index 42ab240..3905e98 100644
--- a/app/helpers/template_helper.rb
+++ b/app/helpers/template_helper.rb
@@ -1,8 +1,36 @@
+# frozen_string_literal: true
+
 module TemplateHelper
-  def links_to_a_elements(links, separator = ', ')
+
+  def template_details_path(template)
+    if template_modifiable?(template)
+      edit_org_admin_template_path(template)
+    else
+      if template.persisted?
+        org_admin_template_path(template)
+      else
+        org_admin_templates_path
+      end
+    end
+  end
+
+  # Is this Template modifiable?
+  #
+  # template - A Template object
+  #
+  # Returns Boolean
+  def template_modifiable?(template)
+    template.latest? &&
+      template.customization_of.blank? &&
+      template.id.present? &&
+      template.org_id = current_user.org.id
+  end
+
+  def links_to_a_elements(links, separator = ", ")
     a = links.map do |l|
       "<a href=\"#{l['link']}\">#{l['text']}</a>"
     end
     a.join(separator)
   end
-end
\ No newline at end of file
+
+end
diff --git a/app/models/section.rb b/app/models/section.rb
index 42cb330..49f9237 100644
--- a/app/models/section.rb
+++ b/app/models/section.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: sections
@@ -21,6 +23,7 @@
 #
 
 class Section < ActiveRecord::Base
+
   include ValidationMessages
   include ValidationValues
   include ActsAsSortable
@@ -108,8 +111,8 @@
     copy.phase_id = options.fetch(:phase_id, nil)
     copy.save!(validate: false)  if options.fetch(:save, false)
     options[:section_id] = copy.id
-    self.questions.map{ |question| copy.questions << question.deep_copy(options) }
-    return copy
+    self.questions.map { |question| copy.questions << question.deep_copy(options) }
+    copy
   end
 
   # Can't be modified as it was duplicatd over from another Phase.
@@ -129,6 +132,7 @@
 
   def set_number
     return if phase.nil?
-    self.number ||= phase.sections.maximum(:number) + 1
+    self.number ||= phase.sections.maximum(:number).to_i + 1
   end
+
 end
diff --git a/app/views/org_admin/questions/_form.html.erb b/app/views/org_admin/questions/_form.html.erb
index ccf2757..cfa4a54 100644
--- a/app/views/org_admin/questions/_form.html.erb
+++ b/app/views/org_admin/questions/_form.html.erb
@@ -1,79 +1,95 @@
-<h4><%= question.id.present? ? _('Question %{number}:') % { number: question.number } : _('New question:') %></h4>
-<%= form_for(question, url: url, namespace: question.id.present? ? question.id : 'new_question', html: { method: method, class: 'question_form' }) do |f| %>
-  <% current_format = question.question_format.present? ? question.question_format : QuestionFormat.find_by(formattype: QuestionFormat.formattypes[:textarea]) %>
+<h4>
+  <%= question.id.present? ? _('Question %{number}:') % { number: question.number } : _('New question:') %>
+</h4>
 
-  <!--Question number -->
-  <div class="form-group col-md-4">
-    <%= f.label(:number, _('Question Number'), class: "control-label") %>
-    <%= f.number_field(:number, in: 1..50, class: "form-control", 'aria-required': true) %>
-  </div>
-  <!--Question text -->
-  <div class="form-group col-md-10">
-    <%= f.label(:text, _('Question text'), class: "control-label") %>
-    <%= f.text_area(:text, class: "question", 'aria-required': true) %>
-  </div>
-  <!-- Question format -->
-  <div class="form-group col-md-4">
-    <%= f.label(:question_format_id, _('Answer format'), class: "control-label") %>
-      <%= f.select :question_format_id,
-        options_from_collection_for_select(QuestionFormat.all.order("title"),
-        :id,
-        :title,
-        question.question_format_id),
-        {},
-        class: "form-control question_format",
-        'data-toggle': 'tooltip',
-        'data-html': true,
-        title: _("You can choose from:<ul><li>- text area (large box for paragraphs);</li> <li>- text field (for a short answer);</li> <li>- checkboxes where options are presented in a list and multiple values can be selected;</li> <li>- radio buttons where options are presented in a list but only one can be selected;</li> <li>- dropdown like this box - only one option can be selected;</li> <li>- multiple select box allows users to select several options from a scrollable list, using the CTRL key;</li></ul>")
-      %>
-  </div>
-  <!--display form to enter option for option_based questions -->
-  <div class="form-group col-md-10" data-attribute="question_options" style="<%= current_format.option_based? ? '' : 'display:none;' %>">
-    <div class="col-md-offset-2">
-      <%= render "/org_admin/question_options/option_fields", f: f, q: question %>
-      <!--display for selecting comment box when multiple choice is being used-->
+<%= form_for(question, url: url,
+                       namespace: question.id.present? ? question.id : 'new_question',
+                       html: { method: method, class: 'question_form' }) do |f| %>
+
+  <% current_format = question.question_format.present? ? question.question_format : QuestionFormat.find_by(formattype: QuestionFormat.formattypes[:textarea]) %>
+  <div class="row">
+    <!--Question number -->
+    <div class="form-group col-md-4">
+      <%= f.label(:number, _('Question Number'), class: "control-label") %>
+      <%= f.number_field(:number, in: 1..50, class: "form-control",
+                                  aria: { required: true }) %>
     </div>
-  </div>
-  <% comment_disp = current_format.option_based? || current_format.rda_metadata? %>
-  <div class="form-group col-md-10" data-attribute="option_comment" style="<%=comment_disp ? '' : 'display:none;'%>">
-    <label>
-      <%= f.check_box :option_comment_display, as: :check_boxes %><%= _('Display additional comment area.') %>
-    </label>
-  </div>
+
+    <!--Question text -->
+    <div class="form-group col-md-10">
+      <%= f.label(:text, _('Question text'), class: "control-label") %>
+      <%= f.text_area(:text, class: "question", 'aria-required': true) %>
+    </div>
+
+    <!-- Question format -->
+    <div class="form-group col-md-4">
+      <%= f.label(:question_format_id, _('Answer format'), class: "control-label") %>
+        <%= f.select :question_format_id,
+          options_from_collection_for_select(QuestionFormat.all.order("title"),
+          :id,
+          :title,
+          question.question_format_id),
+          {},
+          class: "form-control question_format",
+          'data-toggle': 'tooltip',
+          'data-html': true,
+          title: _("You can choose from:<ul><li>- text area (large box for paragraphs);</li> <li>- text field (for a short answer);</li> <li>- checkboxes where options are presented in a list and multiple values can be selected;</li> <li>- radio buttons where options are presented in a list but only one can be selected;</li> <li>- dropdown like this box - only one option can be selected;</li> <li>- multiple select box allows users to select several options from a scrollable list, using the CTRL key;</li></ul>")
+        %>
+    </div>
+
+    <!--display form to enter option for option_based questions -->
+    <div class="form-group col-md-10" data-attribute="question_options" style="<%= current_format.option_based? ? '' : 'display:none;' %>">
+      <div class="col-md-offset-2">
+        <%= render "/org_admin/question_options/option_fields", f: f, q: question %>
+        <!--display for selecting comment box when multiple choice is being used-->
+      </div>
+    </div>
+
+    <% comment_disp = current_format.option_based? || current_format.rda_metadata? %>
+    <div class="form-group col-md-10" data-attribute="option_comment"
+         style="<%=comment_disp ? '' : 'display:none;'%>">
+      <label>
+        <%= f.check_box :option_comment_display, as: :check_boxes %><%= _('Display additional comment area.') %>
+      </label>
+    </div>
+
   <!--Question default_value -->
-  <div class="form-group col-md-10" data-attribute="default_value" style="<%= current_format.textfield? || current_format.textarea? ? '' : 'display: none;' %>">
-    <%= f.label(:default_value, _('Default answer'), class: "control-label") %>
-    <div class="" data-toggle="tooltip" title="<%= _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.') %>">
-      <span data-attribute="textfield" style="<%= current_format.textfield? ? '' : 'display:none;' %>">
-        <%= f.text_field(:default_value, class: 'form-control') %>
-      </span>
-      <span data-attribute="textarea" style="<%= current_format.textarea? ? '' : 'display:none;' %>">
-        <%= text_area_tag('question[default_value]', question.default_value, id: "#{question.id.present? ? question.id : 'new'}_question_default_value_area", class: "form-control question") %>
-      </span>
+    <div class="form-group col-md-10" data-attribute="default_value" style="<%= current_format.textfield? || current_format.textarea? ? '' : 'display: none;' %>">
+      <%= f.label(:default_value, _('Default answer'), class: "control-label") %>
+      <div class="" data-toggle="tooltip" title="<%= _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.') %>">
+        <span data-attribute="textfield" style="<%= current_format.textfield? ? '' : 'display:none;' %>">
+          <%= f.text_field(:default_value, class: 'form-control') %>
+        </span>
+        <span data-attribute="textarea" style="<%= current_format.textarea? ? '' : 'display:none;' %>">
+          <%= text_area_tag('question[default_value]', question.default_value, id: "#{question.id.present? ? question.id : 'new'}_question_default_value_area", class: "form-control question") %>
+        </span>
+      </div>
     </div>
   </div>
-  <%# example_answer and guidance annotations as nested fields %>
-  <% question.annotations_per_org(current_user.org_id).each do |annotation| %>
-    <%= f.fields_for(:annotations, annotation) do |annotation_fields| %>
-      <%= render partial: 'org_admin/annotations/form', locals: { f: annotation_fields } %>
-    <% end %>
-  <% end %>
-  <!-- Themes -->
-  <div class="form-group col-md-10">
-    <%= render partial: 'org_admin/shared/theme_selector',
-               locals: { f: f, all_themes: Theme.all.order("title"), as_radio: false, 
-                         popover_message: _('Select one or more themes that are relevant to this question. This will allow similarly themed organisation-level guidance to appear alongside your question.') } %>
-  </div>
-  <div class="form-group col-md-10">
-    <div class="pull-right">
-      <%= f.submit _('Save'), class: "btn btn-default", role:'button' %>
-      <% if question.id.present? && !question.section.phase.template.published? %>
-          <% href = org_admin_template_phase_section_question_path(template_id: template.id, phase_id: question.section.phase.id, section_id: question.section.id, id: question.id) %>
-          <%= link_to _('Delete'), href, method: :delete, class: "btn btn-default", role:'button', 'data-confirm': _("You are about to delete question #%{question_number}. Are you sure?") % { question_number: question.number } %>
-        <%= link_to _('Cancel'), href, class: "btn btn-default ajaxified-question", method: 'get', remote: true %>
-      <% else %>
-        <%= link_to _('Cancel'), '#', class: "btn btn-default cancel-new-question" %>
+  <div class="row">
+    <%# example_answer and guidance annotations as nested fields %>
+    <% question.annotations_per_org(current_user.org_id).each do |annotation| %>
+      <%= f.fields_for(:annotations, annotation) do |annotation_fields| %>
+        <%= render partial: 'org_admin/annotations/form', locals: { f: annotation_fields } %>
       <% end %>
+    <% end %>
+    <!-- Themes -->
+    <div class="form-group col-md-10">
+      <%= render partial: 'org_admin/shared/theme_selector',
+                 locals: { f: f, all_themes: Theme.all.order("title"), as_radio: false,
+                           popover_message: _('Select one or more themes that are relevant to this question. This will allow similarly themed organisation-level guidance to appear alongside your question.') } %>
+    </div>
+    <div class="form-group col-md-10">
+      <div class="pull-right">
+        <%= f.submit _('Save'), class: "btn btn-default", role:'button' %>
+        <% if question.id.present? && !question.section.phase.template.published? %>
+            <% href = org_admin_template_phase_section_question_path(template_id: template.id, phase_id: question.section.phase.id, section_id: question.section.id, id: question.id) %>
+            <%= link_to _('Delete'), href, method: :delete, class: "btn btn-default", role:'button', 'data-confirm': _("You are about to delete question #%{question_number}. Are you sure?") % { question_number: question.number } %>
+          <%= link_to _('Cancel'), href, class: "btn btn-default ajaxified-question", method: 'get', remote: true %>
+        <% else %>
+          <%= link_to _('Cancel'), '#', class: "btn btn-default cancel-new-question" %>
+        <% end %>
+      </div>
     </div>
   </div>
 <% end %>
diff --git a/app/views/org_admin/templates/_form.html.erb b/app/views/org_admin/templates/_form.html.erb
index 9684ac1..146b11d 100644
--- a/app/views/org_admin/templates/_form.html.erb
+++ b/app/views/org_admin/templates/_form.html.erb
@@ -18,9 +18,9 @@
     <div class="checkbox">
       <%= f.label(:visibility) do %>
         <%= check_box_tag('template_visibility', '0',
-                            (template.visibility == 'organisationally_visible')) %>
+                            (f.object.visibility == 'organisationally_visible')) %>
 
-        <%= _('for internal %{org_name} use only') % { org_name: template.org.name } %>
+        <%= _('for internal %{org_name} use only') % { org_name: f.object.org.name } %>
       <% end %>
     </div>
   </div>
@@ -29,9 +29,9 @@
 <div class="form-group col-xs-8">
   <%= label_tag(:status, _('Status'), class: "control-label") %>
     <p class="form-control-static">
-      <% if template.published? %>
+      <% if f.object.published? %>
         <%= _('Published') %>
-      <% elsif (template.version.present? && template.version <= 0) || !template.id.present? %>
+      <% elsif (f.object.version.present? && f.object.version <= 0) || !f.object.id.present? %>
         <%= _('Unpublished') %>
       <% else %>
         <%= _('Draft') %>
@@ -39,28 +39,28 @@
     </p>
 </div>
 
-<% if template.id.present? %>
+<% if f.object.id.present? %>
   <div class="form-group col-xs-8">
     <%= label_tag(:created_at, _('Created at'), class: "control-label") %>
     <p class="form-control-static">
-      <%= l template.created_at.to_date, formats: :short %>
+      <%= l f.object.created_at.to_date, formats: :short %>
     </p>
   </div>
   <div class="form-group col-xs-8">
     <%= label_tag(:updated, _('Last updated'), class: "control-label") %>
     <p class="form-control-static">
-      <%= l template.updated_at.to_date, formats: :short %>
+      <%= l f.object.updated_at.to_date, formats: :short %>
     </p>
   </div>
 <% end %>
 
-<% if template.org.funder? %>
+<% if f.object.org.funder? %>
   <div class="col-xs-8">
     <%= render(partial: '/shared/links',
     locals: {
       context: 'funder',
       title: _('Funder Links'),
-      links: Hash(template.links).fetch('funder', []),
+      links: Hash(f.object.links).fetch('funder', []),
       max_number_links: MAX_NUMBER_LINKS_FUNDER,
       tooltip: _('Add links to funder websites that provide additional information about the requirements for this template') }) %>
   </div>
@@ -69,11 +69,11 @@
     locals: {
       context: 'sample_plan',
       title: _('Sample Plan Links'),
-      links: Hash(template.links).fetch('sample_plan', []),
+      links: Hash(f.object.links).fetch('sample_plan', []),
       max_number_links: MAX_NUMBER_LINKS_SAMPLE_PLAN,
       tooltip: _('Add links to sample plans if provided by the funder.') }) %>
   </div>
-  <%= hidden_field_tag('template-links', ActiveSupport::JSON.encode(template.links)) %>
+  <%= hidden_field_tag('template-links', ActiveSupport::JSON.encode(f.object.links)) %>
 <% end %>
 
 <div class="form-group col-xs-8">
diff --git a/app/views/org_admin/templates/_navigation.html.erb b/app/views/org_admin/templates/_navigation.html.erb
index ca7a7b1..3c87adf 100644
--- a/app/views/org_admin/templates/_navigation.html.erb
+++ b/app/views/org_admin/templates/_navigation.html.erb
@@ -1,7 +1,6 @@
-<% details_path = modifiable ? edit_org_admin_template_path(template.id) : template.id.present? ? org_admin_template_path(template.id) : org_admin_templates_path %>
 <ul class="nav nav-tabs" role="tablist">
-  <li role="presentation" <%= active_page?(details_path, true) ? ' class=active' : '' %>>
-    <%= link_to(_('Template details'), details_path, { 'aria-controls': 'show_template', role: 'tab' }) %>
+  <li role="presentation" <%= active_page?(template_details_path(template), true) ? ' class=active' : '' %>>
+    <%= link_to(_('Template details'), template_details_path(template), { 'aria-controls': 'show_template', role: 'tab' }) %>
   </li>
   <% template.phases.each do |phase| %><%# TODO when phase is modifiable and show is accessed, it does not get active tab %>
     <% phase_path = (modifiable && !template.customization_of.present?) ? edit_org_admin_template_phase_path(template.id, phase.id) : org_admin_template_phase_path(template.id, phase.id) %>
@@ -10,7 +9,7 @@
     </li>
   <% end %>
   <!-- Add another phase button -->
-  <% if modifiable %>
+  <% if template_modifiable?(template) %>
     <li role="presentation" <%= active_page?(new_org_admin_template_phase_path(template.id)) ? ' class=active' : '' %>>
       <%= link_to(_('Add new phase'), new_org_admin_template_phase_path(template.id), { 'aria-controls': 'add_phase', role: 'tab' }) %>
     </li>
diff --git a/app/views/org_admin/templates/_new.html.erb b/app/views/org_admin/templates/_new.html.erb
deleted file mode 100644
index c0db94e..0000000
--- a/app/views/org_admin/templates/_new.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="row">
-  <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/org_admin/templates/new.html.erb b/app/views/org_admin/templates/new.html.erb
new file mode 100644
index 0000000..3fc2046
--- /dev/null
+++ b/app/views/org_admin/templates/new.html.erb
@@ -0,0 +1,30 @@
+<div class="row">
+  <div class="col-md-12">
+    <h1><%= @template.id.present? ? template.title : _('New Template') %></h1>
+    <%= link_to _('View all templates'),
+        org_admin_templates_path,
+        class: 'btn btn-default pull-right' %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <!-- render navigation tabs for the template-->
+    <%= render partial: "org_admin/templates/navigation",
+               locals: { template: @template } %>
+
+    <div class="tab-content">
+      <div role="tabpanel" class="tab-pane active">
+        <div class="panel panel-default">
+          <div class="panel-body">
+            <div class="template_edit">
+              <%= form_for([:org_admin, @template]) do |f| %>
+                <%= render 'form', { f: f }%>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>