diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index ea3fc36..7ad732e 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -8,8 +8,7 @@
   # GET /dmptemplates
   def admin_index
     authorize Template
-  	#institutional templates
-    #@dmptemplates_own = Template.own_institutional_templates(current_user.org_id)
+    #institutional templates
     all_versions_own_templates = Template.where(org_id: current_user.org_id, customization_of: nil).order(:version)
     current_templates = {}
     all_versions_own_templates.each do |temp|
@@ -17,34 +16,31 @@
         current_templates[temp.dmptemplate_id] = temp
       end
     end
-    @dmptemplates_own = current_templates.values
+    @templates_own = current_templates.values
     #funders templates
-    @dmptemplates_funders = Template.funders_templates
+    @templates_funders = Template.funders_templates
   end
 
   # GET /dmptemplates/1
   def admin_template
-    @dmptemplate = Dmptemplate.find(params[:id])
-    authorize @dmptemplate
-    respond_to do |format|
-      format.html # show.html.erb
-    end
+    @template = Template.find(params[:id])
+    authorize @template
   end
 
 
 
   # PUT /dmptemplates/1
   def admin_update
- 		@dmptemplate = Dmptemplate.find(params[:id])
+    @dmptemplate = Dmptemplate.find(params[:id])
     authorize @dmptemplate
- 		@dmptemplate.description = params["template-desc"]
-		  respond_to do |format|
+    @dmptemplate.description = params["template-desc"]
+      respond_to do |format|
       if @dmptemplate.update_attributes(params[:dmptemplate])
         format.html { redirect_to admin_template_dmptemplate_path(params[:dmptemplate]), notice: I18n.t('org_admin.templates.updated_message') }
       else
         format.html { render action: "edit" }
       end
-  	end
+    end
   end
 
 
@@ -76,91 +72,91 @@
 
   # DELETE /dmptemplates/1
   def admin_destroy
-   	@dmptemplate = Dmptemplate.find(params[:id])
+    @dmptemplate = Dmptemplate.find(params[:id])
     authorize @dmptemplate
     @dmptemplate.destroy
     respond_to do |format|
       format.html { redirect_to admin_index_dmptemplate_path }
     end
-	end
+  end
 
 
 
-	# PHASES
+  # PHASES
 
-	#show and edit a phase of the template
-	def admin_phase
-		@phase = Phase.find(params[:id])
+  #show and edit a phase of the template
+  def admin_phase
+    @phase = Phase.find(params[:id])
     authorize @phase.dmptemplate
-		if !params.has_key?(:version_id) then
-			@edit = 'false'
-			#check for the most recent published version, if none is available then return the most recent one
-			versions = @phase.versions.where('published = ?', true).order('updated_at DESC')
-			if versions.any?() then
-				@version = versions.first
-			else
-				@version = @phase.versions.order('updated_at DESC').first
-			end
-			# When the version_id is passed as an argument
-		else
-			@edit = params[:edit]
-			@version = Version.find(params[:version_id])
-		end
-		#verify if there are any sections if not create one
-		@sections = @version.sections
-		if !@sections.any?() || @sections.count == 0 then
-			@section = @version.sections.build
-			@section.title = ''
-			@section.version_id = params[:version_id]
-			@section.number = 1
-			@section.organisation_id = current_user.organisation.id
-			@section.published = true
+    if !params.has_key?(:version_id) then
+      @edit = 'false'
+      #check for the most recent published version, if none is available then return the most recent one
+      versions = @phase.versions.where('published = ?', true).order('updated_at DESC')
+      if versions.any?() then
+        @version = versions.first
+      else
+        @version = @phase.versions.order('updated_at DESC').first
+      end
+      # When the version_id is passed as an argument
+    else
+      @edit = params[:edit]
+      @version = Version.find(params[:version_id])
+    end
+    #verify if there are any sections if not create one
+    @sections = @version.sections
+    if !@sections.any?() || @sections.count == 0 then
+      @section = @version.sections.build
+      @section.title = ''
+      @section.version_id = params[:version_id]
+      @section.number = 1
+      @section.organisation_id = current_user.organisation.id
+      @section.published = true
               @section.save
               @new_sec = true
-		end
-		#verify if section_id has been passed, if so then open that section
-		if params.has_key?(:section_id) then
-			@open = true
-			@section_id = params[:section_id].to_i
-		end
-		if params.has_key?(:question_id) then
-			@question_id = params[:question_id].to_i
-		end
-		respond_to do |format|
-			format.html
-		end
-	end
-
-
-	#preview a phase
-	def admin_previewphase
-		@version = Version.find(params[:id])
-    authorize @version.phase.dmptemplate
-		respond_to do |format|
-			format.html
-		end
-	end
-
-
-	#add a new phase to a template
-	def admin_addphase
-		@dmptemplate = Dmptemplate.find(params[:id])
-		@phase = Phase.new
-    authorize @dmptemplate
-		if @dmptemplate.phases.count == 0 then
-			@phase.number = '1'
-		else
-			@phase.number = @dmptemplate.phases.count + 1
-		end
-		respond_to do |format|
+    end
+    #verify if section_id has been passed, if so then open that section
+    if params.has_key?(:section_id) then
+      @open = true
+      @section_id = params[:section_id].to_i
+    end
+    if params.has_key?(:question_id) then
+      @question_id = params[:question_id].to_i
+    end
+    respond_to do |format|
       format.html
     end
-	end
+  end
 
 
-	#create a phase
-	def admin_createphase
-	 	@phase = Phase.new(params[:phase])
+  #preview a phase
+  def admin_previewphase
+    @version = Version.find(params[:id])
+    authorize @version.phase.dmptemplate
+    respond_to do |format|
+      format.html
+    end
+  end
+
+
+  #add a new phase to a template
+  def admin_addphase
+    @dmptemplate = Dmptemplate.find(params[:id])
+    @phase = Phase.new
+    authorize @dmptemplate
+    if @dmptemplate.phases.count == 0 then
+      @phase.number = '1'
+    else
+      @phase.number = @dmptemplate.phases.count + 1
+    end
+    respond_to do |format|
+      format.html
+    end
+  end
+
+
+  #create a phase
+  def admin_createphase
+    @phase = Phase.new(params[:phase])
     authorize @phase.dmptemplate
     @phase.description = params["phase-desc"]
     @version = @phase.versions.build
@@ -174,15 +170,15 @@
       else
         format.html { render action: "admin_phase" }
       end
-		end
+    end
   end
 
 
-	#update a phase of a template
-	def admin_updatephase
- 		@phase = Phase.find(params[:id])
+  #update a phase of a template
+  def admin_updatephase
+    @phase = Phase.find(params[:id])
     authorize @phase.dmptemplate
-		@phase.description = params["phase-desc"]
+    @phase.description = params["phase-desc"]
     respond_to do |format|
       if @phase.update_attributes(params[:phase])
         format.html { redirect_to admin_phase_dmptemplate_path(@phase), notice: I18n.t('org_admin.templates.updated_message') }
@@ -190,24 +186,24 @@
         format.html { render action: "admin_phase" }
       end
     end
-	end
+  end
 
-	#delete a version, sections and questions
-	def admin_destroyphase
-   	@phase = Phase.find(params[:phase_id])
+  #delete a version, sections and questions
+  def admin_destroyphase
+    @phase = Phase.find(params[:phase_id])
     authorize @phase.dmptemplate
-   	@dmptemplate = @phase.dmptemplate
+    @dmptemplate = @phase.dmptemplate
     @phase.destroy
     respond_to do |format|
       format.html { redirect_to admin_template_dmptemplate_path(@dmptemplate), notice: I18n.t('org_admin.templates.destroyed_message') }
     end
-	end
+  end
 
 # VERSIONS
 
-	#update a version of a template
-	def admin_updateversion
- 		@version = Version.find(params[:id])
+  #update a version of a template
+  def admin_updateversion
+    @version = Version.find(params[:id])
     authorize @version.phase.dmptemplate
     @version.description = params["version-desc"]
     @phase = @version.phase
@@ -230,14 +226,14 @@
         format.html { render action: "admin_phase" }
       end
     end
-	end
+  end
 
-	#clone a version of a template
-	def admin_cloneversion
+  #clone a version of a template
+  def admin_cloneversion
     @old_version = Version.find(params[:version_id])
     authorize @old_version.phase.dmptemplate
-		@version = @old_version.amoeba_dup
-		@phase = @version.phase
+    @version = @old_version.amoeba_dup
+    @phase = @version.phase
     respond_to do |format|
       if @version.save
         format.html { redirect_to admin_phase_dmptemplate_path(@phase, :version_id => @version.id, :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') }
@@ -245,23 +241,23 @@
         format.html { render action: "admin_phase" }
       end
     end
-	end
+  end
 
-	#delete a version, sections and questions
-	def admin_destroyversion
-   	@version = Version.find(params[:version_id])
+  #delete a version, sections and questions
+  def admin_destroyversion
+    @version = Version.find(params[:version_id])
     authorize @version.phase.dmptemplate
-   	@phase = @version.phase
+    @phase = @version.phase
     @version.destroy
     respond_to do |format|
       format.html { redirect_to admin_phase_dmptemplate_path(@phase), notice: I18n.t('org_admin.templates.destroyed_message') }
     end
-	end
+  end
 
 
 # SECTIONS
-	#create a section
-	def admin_createsection
+  #create a section
+  def admin_createsection
     @section = Section.new(params[:section])
     authorize @section.version.phase.dmptemplate
     @section.description = params["section-desc"]
@@ -271,45 +267,45 @@
       else
         format.html { render action: "admin_phase" }
       end
-		end
+    end
   end
 
 
-	#update a section of a template
-	def admin_updatesection
- 		@section = Section.find(params[:id])
+  #update a section of a template
+  def admin_updatesection
+    @section = Section.find(params[:id])
     authorize @section.version.phase.dmptemplate
- 		@section.description = params["section-desc-#{params[:id]}"]
-  	@version = @section.version
-		@phase = @version.phase
-		respond_to do |format|
+    @section.description = params["section-desc-#{params[:id]}"]
+    @version = @section.version
+    @phase = @version.phase
+    respond_to do |format|
       if @section.update_attributes(params[:section])
         format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id , :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') }
       else
         format.html { render action: "admin_phase" }
       end
     end
-	end
+  end
 
 
-	#delete a section and questions
-	def admin_destroysection
-   	@section = Section.find(params[:section_id])
+  #delete a section and questions
+  def admin_destroysection
+    @section = Section.find(params[:section_id])
     authorize @section.version.phase.dmptemplate
-   	@version = @section.version
-   	@phase = @version.phase
+    @version = @section.version
+    @phase = @version.phase
     @section.destroy
     respond_to do |format|
       format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id,  :edit => 'true' ), notice: I18n.t('org_admin.templates.destroyed_message') }
     end
- 	end
+  end
 
 
 #  QUESTIONS
 
-	#create a question
-	def admin_createquestion
-	 	@question = Question.new(params[:question])
+  #create a question
+  def admin_createquestion
+    @question = Question.new(params[:question])
     authorize @question.section.version.phase.dmptemplate
     @question.guidance = params["new-question-guidance"]
     @question.default_value = params["new-question-default-value"]
@@ -319,44 +315,44 @@
       else
         format.html { render action: "admin_phase" }
       end
-		end
-	end
+    end
+  end
 
-	#update a question of a template
-	def admin_updatequestion
- 		@question = Question.find(params[:id])
+  #update a question of a template
+  def admin_updatequestion
+    @question = Question.find(params[:id])
     authorize @question.section.version.phase.dmptemplate
-		@question.guidance = params["question-guidance-#{params[:id]}"]
-		@question.default_value = params["question-default-value-#{params[:id]}"]
-  	@section = @question.section
-		@version = @section.version
-		@phase = @version.phase
-		respond_to do |format|
+    @question.guidance = params["question-guidance-#{params[:id]}"]
+    @question.default_value = params["question-default-value-#{params[:id]}"]
+    @section = @question.section
+    @version = @section.version
+    @phase = @version.phase
+    respond_to do |format|
       if @question.update_attributes(params[:question])
         format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') }
       else
         format.html { render action: "admin_phase" }
       end
     end
-	end
+  end
 
-	#delete a version, sections and questions
-	def admin_destroyquestion
-   	@question = Question.find(params[:question_id])
+  #delete a version, sections and questions
+  def admin_destroyquestion
+    @question = Question.find(params[:question_id])
     authorize @question.section.version.phase.dmptemplate
-   	@section = @question.section
-		@version = @section.version
-   	@phase = @version.phase
+    @section = @question.section
+    @version = @section.version
+    @phase = @version.phase
     @question.destroy
     respond_to do |format|
       format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :edit => 'true'), notice: I18n.t('org_admin.templates.destroyed_message') }
     end
-	end
+  end
 
 
-	#SUGGESTED ANSWERS
-	#create suggested answers
-	def admin_createsuggestedanswer
+  #SUGGESTED ANSWERS
+  #create suggested answers
+  def admin_createsuggestedanswer
     @suggested_answer = SuggestedAnswer.new(params[:suggested_answer])
     authorize @suggested_answer.question.section.version.phase.dmptemplate
     respond_to do |format|
@@ -369,42 +365,42 @@
   end
 
 
-	#update a suggested answer of a template
-	def admin_updatesuggestedanswer
- 		@suggested_answer = SuggestedAnswer.find(params[:id])
+  #update a suggested answer of a template
+  def admin_updatesuggestedanswer
+    @suggested_answer = SuggestedAnswer.find(params[:id])
     authorize @suggested_answer.question.section.version.phase.dmptemplate
     @question = @suggested_answer.question
     @section = @question.section
     @version = @section.version
     @phase = @version.phase
 
-		respond_to do |format|
+    respond_to do |format|
       if @suggested_answer.update_attributes(params[:suggested_answer])
         format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') }
       else
         format.html { render action: "admin_phase" }
       end
     end
-	end
+  end
 
-	#delete a suggested answer
-	def admin_destroysuggestedanswer
-   	@suggested_answer = SuggestedAnswer.find(params[:suggested_answer])
+  #delete a suggested answer
+  def admin_destroysuggestedanswer
+    @suggested_answer = SuggestedAnswer.find(params[:suggested_answer])
     authorize @suggested_answer.question.section.version.phase.dmptemplate
-   	@question = @suggested_answer.question
-   	@section = @question.section
-		@version = @section.version
-   	@phase = @version.phase
+    @question = @suggested_answer.question
+    @section = @question.section
+    @version = @section.version
+    @phase = @version.phase
     @suggested_answer.destroy
     respond_to do |format|
       format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :edit => 'true'), notice: I18n.t('org_admin.templates.destroyed_message') }
     end
- 	end
+  end
 
 #  GUIDANCES
 
-	#create a guidance
-	def admin_createguidance
+  #create a guidance
+  def admin_createguidance
     @question = Question.find(params[:question][:id])
     authorize @question.section.version.phase.dmptemplate
     @guidance = Guidance.new(params[:guidance])
@@ -417,19 +413,19 @@
       else
         format.html { render action: "admin_phase" }
       end
-		end
-	end
+    end
+  end
 
-	#update a guidance of a template
-	def admin_updateguidance
- 		@question = Question.find(params[:id])
+  #update a guidance of a template
+  def admin_updateguidance
+    @question = Question.find(params[:id])
     authorize @question.section.version.phase.dmptemplate
-		@question.guidance = params["question-guidance-#{params[:id]}"]
-		@question.default_value = params["question-default-value-#{params[:id]}"]
-  	@section = @question.section
-		@version = @section.version
-		@phase = @version.phase
-		respond_to do |format|
+    @question.guidance = params["question-guidance-#{params[:id]}"]
+    @question.default_value = params["question-default-value-#{params[:id]}"]
+    @section = @question.section
+    @version = @section.version
+    @phase = @version.phase
+    respond_to do |format|
       if @question.update_attributes(params[:question])
         format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') }
       else
@@ -438,18 +434,18 @@
     end
   end
 
-	#delete a version, sections and guidance
-	def admin_destroyguidance
-   	@question = Question.find(params[:question_id])
+  #delete a version, sections and guidance
+  def admin_destroyguidance
+    @question = Question.find(params[:question_id])
     authorize @question.section.version.phase.dmptemplate
-   	@section = @question.section
-		@version = @section.version
-   	@phase = @version.phase
+    @section = @question.section
+    @version = @section.version
+    @phase = @version.phase
     @question.destroy
     respond_to do |format|
       format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :edit => 'true'), notice: I18n.t('org_admin.templates.destroyed_message') }
     end
- 	end
+  end
 
 
 end
\ No newline at end of file
diff --git a/app/views/templates/_admin_nav_tabs.html.erb b/app/views/templates/_admin_nav_tabs.html.erb
index 49c3c20..a4b8ad8 100644
--- a/app/views/templates/_admin_nav_tabs.html.erb
+++ b/app/views/templates/_admin_nav_tabs.html.erb
@@ -1,34 +1,32 @@
 <!-- templates navigation -->
 <div id="project-tabs" class="nav-project-tabs">
-	<ul class="nav nav-tabs" data-tabs="tabs">
-		<!-- template details (views/dmptemplate/_project_details.html.erb)-->
-		<% if active == "show_template" then %>
-			<li class="active">
-		<% else %>
-			<li>
-		<% end %>
-			<%= link_to t('org_admin.templates.template_details'), admin_template_dmptemplate_path(dmptemplate) %>
-	   	</li>
+  <ul class="nav nav-tabs" data-tabs="tabs">
+    <% if active == "show_template" then %>
+      <li class="active">
+    <% else %>
+      <li>
+    <% end %>
+      <%= link_to t('org_admin.templates.template_details'), admin_template_template_path(template) %>
+      </li>
     <!-- Phases -->
-    <% dmptemplate.phases.each do |phase| %>
-		<% if active == phase.id then %>
-			<li class="active">
-		<% else %>
-			<li>
-		<% end %>
-			<%= link_to phase.title, admin_phase_dmptemplate_path(phase) %>
-		</li>
+    <% template.phases.each do |phase| %>
+    <% if active == phase.id then %>
+      <li class="active">
+    <% else %>
+      <li>
+    <% end %>
+      <%= link_to phase.title, admin_phase_template_path(phase) %>
+    </li>
     <% end %>
     <!-- Add another phase button -->
-    <% if current_user.can_org_admin? && (dmptemplate.org_type != constant("organisation_types.funder")|| current_user.org_type == constant("organisation_types.funder")) then %>
-    	<% if active == 'add_plan' then %>
-			<li class="active">
-		<% else %>
-			<li>
-		<% end %>
-			<%= link_to t('org_admin.templates.add_phase_label'), admin_addphase_dmptemplate_path(dmptemplate) %>
-		</li>
+    <% if current_user.can_org_admin? && (template.org_type != constant("organisation_types.funder")|| current_user.org_type == constant("organisation_types.funder")) then %>
+      <% if active == 'add_plan' then %>
+      <li class="active">
+    <% else %>
+      <li>
+    <% end %>
+      <%= link_to t('org_admin.templates.add_phase_label'), admin_addphase_template_path(template) %>
+    </li>
     <%end%>
-	</ul>
-</div>
-
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
index dbea10a..051d4b4 100644
--- a/app/views/templates/_edit_template.html.erb
+++ b/app/views/templates/_edit_template.html.erb
@@ -1,52 +1,52 @@
 <!-- edit template details A template is passed as an argument-->
 
-<%= form_for(dmptemplate, :url => admin_update_dmptemplate_path(dmptemplate), :html => { :method => :put}) do |f| %>
-	<br/>
-	<table class="dmp_details_table">
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.title_label') %></td>
-			<td><%= f.text_field :title, :as => :string, 
-						:class => 'text_field has-tooltip', 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.title_help_text') %></td>
-		</tr>
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
-			<td><div class="div_left_icon">
-					<%= text_area_tag("template-desc", dmptemplate.description, class: "tinymce") %>
-				</div>
-				<div class="div_right_icon">
-					<%= link_to( image_tag('help_button.png'), '#', :class => 'template_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.desc_help_text_html'))%>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.published_label') %></td>
-			<td><%if dmptemplate.published? || dmptemplate.has_published_versions? then%>
-					<%= f.check_box :published, :as => :check_boxes	%>
-				<%else%>
-					<%= t('org_admin.templates.cannot_publish')%>
-				<%end%>		
-			</td>
-		</tr>
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.created') %></td>
-			<td>
-				<%= l dmptemplate.created_at.to_date, :formats => :short %>
-			</td>
-		</tr>
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.last_updated') %></td>
-			<td>
-				<%= l dmptemplate.updated_at.to_date, :formats => :short %>
-			</td>
-		</tr>
-	</table>
-	<!-- submit buttons -->
-	
-		<div class="move_2_right">
-			<%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
-			<%= link_to t('helpers.submit.cancel'), admin_template_dmptemplate_path(dmptemplate), :class => 'btn cancel' %>
-		</div>
-	
-	<br />
-	
+<%= form_for(template, url: admin_update_template_path(template), html: { method: :put}) do |f| %>
+  <br/>
+  <table class="dmp_details_table">
+    <tr>
+      <td class="first_template"><%= t('org_admin.templates.title_label') %></td>
+      <td><%= f.text_field :title, as: :string,
+            class: 'text_field has-tooltip', 'data-toggle' => "tooltip", title: t('org_admin.templates.title_help_text') %></td>
+    </tr>
+    <tr>
+      <td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
+      <td><div class="div_left_icon">
+          <%= text_area_tag("template-desc", template.description, class: "tinymce") %>
+        </div>
+        <div class="div_right_icon">
+          <%= link_to( image_tag('help_button.png'), '#', class: 'template_desc_popover', rel: "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.desc_help_text_html'))%>
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td class="first_template"><%= t('org_admin.templates.published_label') %></td>
+      <td><%if template.published? || template.has_published_versions? then%>
+          <%= f.check_box :published, as: :check_boxes  %>
+        <%else%>
+          <%= t('org_admin.templates.cannot_publish')%>
+        <%end%>
+      </td>
+    </tr>
+    <tr>
+      <td class="first_template"><%= t('org_admin.templates.created') %></td>
+      <td>
+        <%= l template.created_at.to_date, formats: :short %>
+      </td>
+    </tr>
+    <tr>
+      <td class="first_template"><%= t('org_admin.templates.last_updated') %></td>
+      <td>
+        <%= l template.updated_at.to_date, formats: :short %>
+      </td>
+    </tr>
+  </table>
+  <!-- submit buttons -->
+
+    <div class="move_2_right">
+      <%= f.submit t('helpers.submit.save'), class: 'btn btn-primary' %>
+      <%= link_to t('helpers.submit.cancel'), admin_template_template_path(template), class: 'btn cancel' %>
+    </div>
+
+  <br />
+
 <%end%>
\ No newline at end of file
diff --git a/app/views/templates/_show_phases_sections.html.erb b/app/views/templates/_show_phases_sections.html.erb
index 19c603a..2ef08fd 100644
--- a/app/views/templates/_show_phases_sections.html.erb
+++ b/app/views/templates/_show_phases_sections.html.erb
@@ -3,71 +3,60 @@
 <div class="div_clear"></div>
 
 <div class="div_left admin_left_smaller">
-	<p><%= raw phase.description %></p>
+  <p><%= raw phase.description %></p>
 </div>
 
-<% if phase.versions.any? then %>
-
-    <% version = phase.versions.where("published = ?", true).first %>
-    <% if version.nil? then%>
-        <% version = phase.versions.order("updated_at DESC").first %>
-    <%end%>
 
 
-    <div class="div_right admin_right_bigger">
-        <!--delete a phase button. only displays when template not published-->
+  <div class="div_right admin_right_bigger">
+      <!--delete a phase button. only displays when template not published-->
 
-        <%if phase.has_sections == true then %>
-            <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(version), :class => 'btn btn-primary'%>
-        <%end%>
-        <% if phase.latest_published_version == nil then%>
-            <%= link_to t("helpers.submit.delete"), admin_destroyphase_dmptemplate_path(:phase_id => phase.id),
-            :confirm => t("org_admin.templates.phase_delete_message", :phase_title => phase.title ), :method => :delete, :class => "btn btn-primary"%>
-        <%end%>
-        <%if phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder") then%>
-            <% b_label = t('org_admin.templates.view_phase_label')%>
-        <%else %>
-            <% b_label = t('org_admin.templates.edit_phase_label')%>
-        <%end%>
-        <%= link_to b_label, admin_phase_dmptemplate_path(phase), :class => "btn btn-primary" %>
+      <% if phase.sections.length > 0 then %>
+          <%= link_to t("helpers.preview"), admin_previewphase_template_path(phase), class: 'btn btn-primary'%>
+      <% end %>
+      <% if !phase.template.published?  then%>
+          <%= link_to t("helpers.submit.delete"), admin_destroyphase_template_path(:phase_id => phase.id),
+          confirm: t("org_admin.templates.phase_delete_message", phase_title: phase.title ), method: :delete, class: "btn btn-primary"%>
+      <% end %>
+      <% if phase.template.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder") then%>
+          <% b_label = t('org_admin.templates.view_phase_label')%>
+      <% else %>
+          <% b_label = t('org_admin.templates.edit_phase_label')%>
+      <% end %>
+      <%= link_to b_label, admin_phase_template_path(phase), class: "btn btn-primary" %>
 
-    </div>
-    <% if version.sections.any? then %>
-		<table class="dmp_table">
-			<thead>
-			    <tr>
-			      	<th class="dmp_th_medium"><%= t('helpers.sections_label')%></th>
-			      	<th class="dmp_th_big"><%= t('helpers.questions_label')%></th>
-				</tr>
-			</thead>
-			<tbody>
-				<% version.sections.order("number ASC").each do |section| %>
-					<%if (section.organisation_id == phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%>
-						<tr >
-							<th class="dmp_th_border" >
-								<p><%= section.title %></p>
-							</th>
-							<td class="dmp_td_border" >
-								<% if section.questions.any? %>
-									<% questions = section.questions.order("number ASC") %>
-									<ul class="question_ul">
-										<% questions.each do |ques|%>
-											<li>
-												- <%= raw ques.text %>
-											</li>
-										<%end%>
-									</ul>
-								<%end%>
-							</td>
-						</tr>
-					<%end%>
-				<%end%>
-			</tbody>
-		</table>
-
-	<%end%>
-
-<%end%>
+  </div>
+  <% if phase.sections.any? then %>
+    <table class="dmp_table">
+      <thead>
+          <tr>
+              <th class="dmp_th_medium"><%= t('helpers.sections_label')%></th>
+              <th class="dmp_th_big"><%= t('helpers.questions_label')%></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% phase.sections.order("number ASC").each do |section| %>
+          <tr >
+            <th class="dmp_th_border" >
+              <p><%= section.title %></p>
+            </th>
+            <td class="dmp_td_border" >
+              <% if section.questions.any? %>
+                <% questions = section.questions.order("number ASC") %>
+                <ul class="question_ul">
+                  <% questions.each do |ques|%>
+                    <li>
+                      - <%= raw ques.text %>
+                    </li>
+                  <% end %>
+                </ul>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
 
 
 <div class="div_clear"></div>
diff --git a/app/views/templates/_show_template.html.erb b/app/views/templates/_show_template.html.erb
index 7cfec9d..4165555 100644
--- a/app/views/templates/_show_template.html.erb
+++ b/app/views/templates/_show_template.html.erb
@@ -1,43 +1,43 @@
 <!-- show template details A template is passed as an argument-->
 
-<% if @dmptemplate.org_type != constant("organisation_types.funder")  || current_user.org_type == constant("organisation_types.funder") then %>
-	<h3><!-- edit template button -->
-		<div class="move_2_right">
-			<%= link_to t("org_admin.templates.edit_details"), '# ', :class => "btn btn-primary", :id => "edit_template_button"%>
-		</div>
-	</h3>
-<%end%>	
-<br/>	
+<% if template.org.funder?  || current_user.org.funder? then %>
+  <h3><!-- edit template button -->
+    <div class="move_2_right">
+      <%= link_to t("org_admin.templates.edit_details"), '# ', class: "btn btn-primary", id: "edit_template_button"%>
+    </div>
+  </h3>
+<% end %>
+<br/>
 
 <table class="dmp_details_table">
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.title_label') %></td>
-		<td><%= dmptemplate.title %></td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
-		<td><% if !dmptemplate.description.nil? && dmptemplate.description != "" then %>
-				<%= raw dmptemplate.description %>
-			<%else%>
-				 -
-			<%end%>	
-		</td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.published_label') %></td>
-		<td><%if dmptemplate.published || dmptemplate.has_published_versions? then%>
-				<%= dmptemplate.published %>
-			<%else%>
-				<%= t('org_admin.templates.cannot_publish')%>
-			<%end%>		
-		</td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.created') %></td>
-		<td><%= l dmptemplate.created_at.to_date, :formats => :short %></td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.last_updated') %></td>
-		<td class="phase_table_last_column"><%= l dmptemplate.updated_at.to_date, :formats => :short %></td>
-	</tr>
+  <tr>
+    <td class="first_template"><%= t('org_admin.templates.title_label') %></td>
+    <td><%= template.title %></td>
+  </tr>
+  <tr>
+    <td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
+    <td><% if !template.description.nil? && template.description != "" then %>
+        <%= raw template.description %>
+      <% else %>
+         -
+      <% end %>
+    </td>
+  </tr>
+  <tr>
+    <td class="first_template"><%= t('org_admin.templates.published_label') %></td>
+    <td><% if template.published || template.has_published_versions? then%>
+        <%= template.published %>
+      <% else %>
+        <%= t('org_admin.templates.cannot_publish')%>
+      <% end %>
+    </td>
+  </tr>
+  <tr>
+    <td class="first_template"><%= t('org_admin.templates.created') %></td>
+    <td><%= l template.created_at.to_date, formats: :short %></td>
+  </tr>
+  <tr>
+    <td class="first_template"><%= t('org_admin.templates.last_updated') %></td>
+    <td class="phase_table_last_column"><%= l template.updated_at.to_date, formats: :short %></td>
+  </tr>
 </table>
diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb
index 76edad8..89ef362 100644
--- a/app/views/templates/admin_index.html.erb
+++ b/app/views/templates/admin_index.html.erb
@@ -22,7 +22,7 @@
 <div class="div_clear"></div>
 
 <!-- List of own templates -->
-<% if @dmptemplates_own.length > 0 then %>
+<% if @templates_own.length > 0 then %>
 	<table id="dmp_table" class="dmp_table tablesorter">
 		  <thead>
 		    <tr>
@@ -34,7 +34,7 @@
 		    </tr>
 		  </thead>
 		  <tbody>
-			<% @dmptemplates_own.each do |org_template| %>
+			<% @templates_own.each do |org_template| %>
 
 		  	<tr>
 	  			<td class="dmp_td_small">
@@ -53,7 +53,7 @@
                 <% last_temp_updated = phase.updated_at %>
               <% end %>
             <% end %>
-            <%= l last_temp_updated.to_date, :formats => :short %>
+            <%= l last_temp_updated.to_date, formats: :short %>
 		      </td>
 		        <td class="dmp_td_small">
 		        	<%if current_user.can_org_admin? then%>
@@ -61,7 +61,7 @@
 					<%else%>
 						<% b_label = t('helpers.view')%>
 					<%end%>
-					<%= link_to b_label, admin_template_template_path(org_template), :class => "dmp_table_link"%>
+					<%= link_to b_label, admin_template_template_path(org_template), class: "dmp_table_link"%>
 		       	</td>
 		     </tr>
 	    	<%end%>
@@ -80,7 +80,7 @@
     </h2>
 
     <!-- List of funders templates -->
-    <% if @dmptemplates_funders.length > 0 then %>
+    <% if @templates_funders.length > 0 then %>
 
         <table id="dmp_table_2" class="dmp_table tablesorter">
             <thead>
@@ -94,7 +94,7 @@
             </thead>
             <tbody>
 
-                <% @dmptemplates_funders.each do |org_template| %>
+                <% @templates_funders.each do |org_template| %>
                     <% if org_template.published? ||org_template.has_customisations?(current_user.organisation_id, org_template) then %>
                        <tr>
                             <td class="dmp_td_small">
@@ -112,7 +112,7 @@
                             </td>
                             <td class="dmp_td_small">
                                 <% last_updated = org_template.updated_at %>
-                                <%= l last_updated.to_date, :formats => :short %>
+                                <%= l last_updated.to_date, formats: :short %>
 
                             </td>
                             <td class="dmp_td_small">
@@ -129,7 +129,7 @@
                                 <%else%>
                                     <% b_label = t("helpers.view")%>
                                 <%end%>
-                                <%= link_to b_label, admin_template_template_path(org_template), :class => "dmp_table_link"%>
+                                <%= link_to b_label, admin_template_template_path(org_template), class: "dmp_table_link"%>
                             </td>
                         </tr>
                     <%end%>
diff --git a/app/views/templates/admin_template.html.erb b/app/views/templates/admin_template.html.erb
index 642fb15..b8d0506 100644
--- a/app/views/templates/admin_template.html.erb
+++ b/app/views/templates/admin_template.html.erb
@@ -2,60 +2,60 @@
 <% javascript 'admin.js' %>
 
 <h1>
-	<%= @dmptemplate.title %>
-	<!-- link button to add new guidance -->
-	<div class="move_2_right">
-		<%= link_to t("org_admin.templates.view_all_templates"),
-		            admin_index_dmptemplate_path,
-		            :class => 'btn btn-primary' %>
-	</div>
+  <%= @template.title %>
+  <!-- link button to add new guidance -->
+  <div class="move_2_right">
+    <%= link_to t("org_admin.templates.view_all_templates"),
+                admin_index_template_path,
+                :class => 'btn btn-primary' %>
+  </div>
 </h1>
 
 <div class="div_clear"></div>
 
 <!-- render navigation tabs for the template-->
-<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, active: "show_template"} %>
+<%= render partial: "admin_nav_tabs", locals: {template: @template, active: "show_template"} %>
 
 <!-- body -->
 <div class="dmp_details_body">
-	<div class="dmp_details">
-		<% if @dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
-			<div id="edit_template_div" style="display: none">
-				<%= render :partial => "edit_template", locals: {dmptemplate: @dmptemplate}%>	
-			</div>
-		<%end%>
-		<div id="show_template_div">
-			<%= render :partial => "show_template", locals: {dmptemplate: @dmptemplate}%>	
-		</div>
-	</div>
-	<!-- If template has phases-->
-	<% if !@dmptemplate.phases.nil? then %>
-		<% if @dmptemplate.phases.count == 1 then %>
-			<% @dmptemplate.phases.each do |phase| %>
-				<!--render the display block with the phase, sections and questions information-->
-				<%= render :partial => 'show_phases_sections', locals: {phase: phase}%>
-			<%end%>
-		<%else%>
-			<% @dmptemplate.phases.order(:number).each do |phase| %>
-				<div class="accordion" id="project-accordion">
-					<div class="accordion-group">
-						<div class="accordion-heading">
-							<a class="accordion-toggle" data-toggle="collapse" data-parent="#project-accordion" href="#<%= phase.id %>">
-								<h3><%= phase.title %><span class="plus-laranja"> </span>
-								</h3>
-							</a>
-						</div>
-						<div id="<%= phase.id %>" class="accordion-project collapse">
-							<div class="accordion-inner">
-								<!--render the display block with the phase, sections and questions information-->
-								<%= render :partial => 'show_phases_sections', locals: {phase: phase}%>
-							</div>
-						</div>
-					</div>
-				</div>
-			<%end%>
-		<%end%>
-	<%end%>
+  <div class="dmp_details">
+    <% if @template.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
+      <div id="edit_template_div" style="display: none">
+        <%= render partial: "edit_template", locals: {template: @template}%>
+      </div>
+    <%end%>
+    <div id="show_template_div">
+      <%= render partial: "show_template", locals: {template: @template}%>
+    </div>
+  </div>
+  <!-- If template has phases-->
+  <% if !@template.phases.nil? then %>
+    <% if @template.phases.count == 1 then %>
+      <% @template.phases.each do |phase| %>
+        <!--render the display block with the phase, sections and questions information-->
+        <%= render partial: 'show_phases_sections', locals: {phase: phase}%>
+      <%end%>
+    <%else%>
+      <% @template.phases.order(:number).each do |phase| %>
+        <div class="accordion" id="project-accordion">
+          <div class="accordion-group">
+            <div class="accordion-heading">
+              <a class="accordion-toggle" data-toggle="collapse" data-parent="#project-accordion" href="#<%= phase.id %>">
+                <h3><%= phase.title %><span class="plus-laranja"> </span>
+                </h3>
+              </a>
+            </div>
+            <div id="<%= phase.id %>" class="accordion-project collapse">
+              <div class="accordion-inner">
+                <!--render the display block with the phase, sections and questions information-->
+                <%= render partial: 'show_phases_sections', locals: {phase: phase}%>
+              </div>
+            </div>
+          </div>
+        </div>
+      <%end%>
+    <%end%>
+  <%end%>
 </div>
 
-<%= tinymce :content_css => asset_path('application.css') %>
+<%= tinymce content_css: asset_path('application.css') %>