diff --git a/app/controllers/dmptemplates_controller.rb b/app/controllers/dmptemplates_controller.rb
deleted file mode 100644
index 9c7f757..0000000
--- a/app/controllers/dmptemplates_controller.rb
+++ /dev/null
@@ -1,450 +0,0 @@
-# [+Project:+] DMPRoadmap
-# [+Description:+] This controller is responsible for all the actions in the admin interface under templates (e.g. phases, versions, sections, questions, suggested answer) (index; show; create; edit; delete)
-# [+Copyright:+] Digital Curation Centre and University of California Curation Center
-
-class DmptemplatesController < ApplicationController
-  after_action :verify_authorized
-
-  # GET /dmptemplates
-  def admin_index
-    authorize Dmptemplate
-  	#institutional templates
-    @dmptemplates_own = Dmptemplate.own_institutional_templates(current_user.organisation_id)
-    #funders templates
-    @dmptemplates_funders = Dmptemplate.funders_templates
-   respond_to do |format|
-      format.html # index.html.erb
-   end
-  end
-
-  # GET /dmptemplates/1
-  def admin_template
-    @dmptemplate = Dmptemplate.find(params[:id])
-    authorize @dmptemplate
-    respond_to do |format|
-      format.html # show.html.erb
-    end
-  end
-
-
-
-  # PUT /dmptemplates/1
-  def admin_update
- 		@dmptemplate = Dmptemplate.find(params[:id])
-    authorize @dmptemplate
- 		@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
-
-
-  # GET /dmptemplates/new
-  def admin_new
-    @dmptemplate = Dmptemplate.new
-    authorize @dmptemplate
-    respond_to do |format|
-      format.html # new.html.erb
-    end
-  end
-
-  # POST /dmptemplates
-  def admin_create
-    @dmptemplate = Dmptemplate.new(params[:dmptemplate])
-    @dmptemplate.organisation_id = current_user.organisation.id
-    @dmptemplate.description = params['template-desc']
-    authorize @dmptemplate
-    respond_to do |format|
-      if @dmptemplate.save
-        format.html { redirect_to admin_template_dmptemplate_path(@dmptemplate), notice: I18n.t('org_admin.templates.created_message') }
-      else
-        format.html { render action: "admin_new" }
-      end
-    end
-  end
-
-
-
-  # DELETE /dmptemplates/1
-  def admin_destroy
-   	@dmptemplate = Dmptemplate.find(params[:id])
-    authorize @dmptemplate
-    @dmptemplate.destroy
-    respond_to do |format|
-      format.html { redirect_to admin_index_dmptemplate_path }
-    end
-	end
-
-
-
-	# PHASES
-
-	#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
-              @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|
-      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
-    @version.title = "#{@phase.title} v.1"
-    @version.phase_id = @phase.id
-    @version.number = 1
-    @version.published = false
-    respond_to do |format|
-      if @phase.save
-        format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-		end
-  end
-
-
-	#update a phase of a template
-	def admin_updatephase
- 		@phase = Phase.find(params[:id])
-    authorize @phase.dmptemplate
-		@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') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-    end
-	end
-
-	#delete a version, sections and questions
-	def admin_destroyphase
-   	@phase = Phase.find(params[:phase_id])
-    authorize @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
-
-# VERSIONS
-
-	#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
-    if @version.published && !@phase.dmptemplate.published then
-        @phase.dmptemplate.published = true
-    end
-    if @version.published == true then
-      @all_versions = @phase.versions.where('published = ?', true)
-      @all_versions.each do |v|
-        if v.id != @version.id && v.published == true then
-          v.published = false
-          v.save
-        end
-      end
-    end
-    respond_to do |format|
-      if @version.update_attributes(params[:version])
-        format.html { redirect_to admin_phase_dmptemplate_path(@phase, :version_id =>  @version.id, :edit => 'false'), notice: I18n.t('org_admin.templates.updated_message') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-    end
-	end
-
-	#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
-    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') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-    end
-	end
-
-	#delete a version, sections and questions
-	def admin_destroyversion
-   	@version = Version.find(params[:version_id])
-    authorize @version.phase.dmptemplate
-   	@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
-
-
-# SECTIONS
-	#create a section
-	def admin_createsection
-    @section = Section.new(params[:section])
-    authorize @section.version.phase.dmptemplate
-    @section.description = params["section-desc"]
-    respond_to do |format|
-      if @section.save
-        format.html { redirect_to admin_phase_dmptemplate_path(:id => @section.version.phase_id, :version_id => @section.version_id, :section_id => @section.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-		end
-  end
-
-
-	#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|
-      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
-
-
-	#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
-    @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
-
-
-#  QUESTIONS
-
-	#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"]
-    respond_to do |format|
-      if @question.save
-        format.html { redirect_to admin_phase_dmptemplate_path(:id => @question.section.version.phase_id, :version_id => @question.section.version_id, :section_id => @question.section_id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-		end
-	end
-
-	#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|
-      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
-
-	#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
-    @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
-
-
-	#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|
-      if @suggested_answer.save
-        format.html { redirect_to admin_phase_dmptemplate_path(:id => @suggested_answer.question.section.version.phase_id, :version_id => @suggested_answer.question.section.version_id, :section_id => @suggested_answer.question.section_id, :question_id => @suggested_answer.question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-    end
-  end
-
-
-	#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|
-      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
-
-	#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
-    @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
-
-#  GUIDANCES
-
-	#create a guidance
-	def admin_createguidance
-    @question = Question.find(params[:question][:id])
-    authorize @question.section.version.phase.dmptemplate
-    @guidance = Guidance.new(params[:guidance])
-    @guidance.question_id = @question.id
-    #@question.guidance = params["new-question-guidance"]
-    #@question.default_value = params["new-question-default-value"]
-    respond_to do |format|
-      if @guidance.save
-        format.html { redirect_to admin_phase_dmptemplate_path(:id => @question.section.version.phase_id, :version_id => @question.section.version_id, :section_id => @question.section_id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
-      else
-        format.html { render action: "admin_phase" }
-      end
-		end
-	end
-
-	#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|
-      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
-
-	#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
-    @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
\ No newline at end of file
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
new file mode 100644
index 0000000..9c7f757
--- /dev/null
+++ b/app/controllers/templates_controller.rb
@@ -0,0 +1,450 @@
+# [+Project:+] DMPRoadmap
+# [+Description:+] This controller is responsible for all the actions in the admin interface under templates (e.g. phases, versions, sections, questions, suggested answer) (index; show; create; edit; delete)
+# [+Copyright:+] Digital Curation Centre and University of California Curation Center
+
+class DmptemplatesController < ApplicationController
+  after_action :verify_authorized
+
+  # GET /dmptemplates
+  def admin_index
+    authorize Dmptemplate
+  	#institutional templates
+    @dmptemplates_own = Dmptemplate.own_institutional_templates(current_user.organisation_id)
+    #funders templates
+    @dmptemplates_funders = Dmptemplate.funders_templates
+   respond_to do |format|
+      format.html # index.html.erb
+   end
+  end
+
+  # GET /dmptemplates/1
+  def admin_template
+    @dmptemplate = Dmptemplate.find(params[:id])
+    authorize @dmptemplate
+    respond_to do |format|
+      format.html # show.html.erb
+    end
+  end
+
+
+
+  # PUT /dmptemplates/1
+  def admin_update
+ 		@dmptemplate = Dmptemplate.find(params[:id])
+    authorize @dmptemplate
+ 		@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
+
+
+  # GET /dmptemplates/new
+  def admin_new
+    @dmptemplate = Dmptemplate.new
+    authorize @dmptemplate
+    respond_to do |format|
+      format.html # new.html.erb
+    end
+  end
+
+  # POST /dmptemplates
+  def admin_create
+    @dmptemplate = Dmptemplate.new(params[:dmptemplate])
+    @dmptemplate.organisation_id = current_user.organisation.id
+    @dmptemplate.description = params['template-desc']
+    authorize @dmptemplate
+    respond_to do |format|
+      if @dmptemplate.save
+        format.html { redirect_to admin_template_dmptemplate_path(@dmptemplate), notice: I18n.t('org_admin.templates.created_message') }
+      else
+        format.html { render action: "admin_new" }
+      end
+    end
+  end
+
+
+
+  # DELETE /dmptemplates/1
+  def admin_destroy
+   	@dmptemplate = Dmptemplate.find(params[:id])
+    authorize @dmptemplate
+    @dmptemplate.destroy
+    respond_to do |format|
+      format.html { redirect_to admin_index_dmptemplate_path }
+    end
+	end
+
+
+
+	# PHASES
+
+	#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
+              @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|
+      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
+    @version.title = "#{@phase.title} v.1"
+    @version.phase_id = @phase.id
+    @version.number = 1
+    @version.published = false
+    respond_to do |format|
+      if @phase.save
+        format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+		end
+  end
+
+
+	#update a phase of a template
+	def admin_updatephase
+ 		@phase = Phase.find(params[:id])
+    authorize @phase.dmptemplate
+		@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') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+    end
+	end
+
+	#delete a version, sections and questions
+	def admin_destroyphase
+   	@phase = Phase.find(params[:phase_id])
+    authorize @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
+
+# VERSIONS
+
+	#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
+    if @version.published && !@phase.dmptemplate.published then
+        @phase.dmptemplate.published = true
+    end
+    if @version.published == true then
+      @all_versions = @phase.versions.where('published = ?', true)
+      @all_versions.each do |v|
+        if v.id != @version.id && v.published == true then
+          v.published = false
+          v.save
+        end
+      end
+    end
+    respond_to do |format|
+      if @version.update_attributes(params[:version])
+        format.html { redirect_to admin_phase_dmptemplate_path(@phase, :version_id =>  @version.id, :edit => 'false'), notice: I18n.t('org_admin.templates.updated_message') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+    end
+	end
+
+	#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
+    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') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+    end
+	end
+
+	#delete a version, sections and questions
+	def admin_destroyversion
+   	@version = Version.find(params[:version_id])
+    authorize @version.phase.dmptemplate
+   	@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
+
+
+# SECTIONS
+	#create a section
+	def admin_createsection
+    @section = Section.new(params[:section])
+    authorize @section.version.phase.dmptemplate
+    @section.description = params["section-desc"]
+    respond_to do |format|
+      if @section.save
+        format.html { redirect_to admin_phase_dmptemplate_path(:id => @section.version.phase_id, :version_id => @section.version_id, :section_id => @section.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+		end
+  end
+
+
+	#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|
+      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
+
+
+	#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
+    @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
+
+
+#  QUESTIONS
+
+	#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"]
+    respond_to do |format|
+      if @question.save
+        format.html { redirect_to admin_phase_dmptemplate_path(:id => @question.section.version.phase_id, :version_id => @question.section.version_id, :section_id => @question.section_id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+		end
+	end
+
+	#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|
+      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
+
+	#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
+    @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
+
+
+	#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|
+      if @suggested_answer.save
+        format.html { redirect_to admin_phase_dmptemplate_path(:id => @suggested_answer.question.section.version.phase_id, :version_id => @suggested_answer.question.section.version_id, :section_id => @suggested_answer.question.section_id, :question_id => @suggested_answer.question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+    end
+  end
+
+
+	#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|
+      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
+
+	#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
+    @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
+
+#  GUIDANCES
+
+	#create a guidance
+	def admin_createguidance
+    @question = Question.find(params[:question][:id])
+    authorize @question.section.version.phase.dmptemplate
+    @guidance = Guidance.new(params[:guidance])
+    @guidance.question_id = @question.id
+    #@question.guidance = params["new-question-guidance"]
+    #@question.default_value = params["new-question-default-value"]
+    respond_to do |format|
+      if @guidance.save
+        format.html { redirect_to admin_phase_dmptemplate_path(:id => @question.section.version.phase_id, :version_id => @question.section.version_id, :section_id => @question.section_id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') }
+      else
+        format.html { render action: "admin_phase" }
+      end
+		end
+	end
+
+	#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|
+      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
+
+	#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
+    @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
\ No newline at end of file
diff --git a/app/policies/dmptemplate_policy.rb b/app/policies/dmptemplate_policy.rb
deleted file mode 100644
index 3524c40..0000000
--- a/app/policies/dmptemplate_policy.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-class TemplatePolicy < ApplicationPolicy
-  attr_reader :user, :template
-
-  def initialize(user, template)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-    @user = user
-    @template = template
-  end
-
-  def admin_index?
-    user.can_modify_templates?
-  end
-
-  def admin_template?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_update?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_new?
-    user.can_modify_templates?
-  end
-
-  def admin_create?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_destroy?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_phase?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_previewphase?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_addphase?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_createphase?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_updatephase?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_destroyphase?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_updateversion?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_cloneversion?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_destroyversion?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_createsection?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_updatesection?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_destroysection?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_createquestion?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_updatequestion?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_destroyquestion?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_createsuggestedanswer?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_updatesuggestedanswer?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_destroysuggestedanswer?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_createguidance?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_updateguidance?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  def admin_destroyguidance?
-    user.can_modify_templates?  &&  (template.org_id == user.org_id)
-  end
-
-  class Scope < Scope
-    def resolve
-      scope.where(org_id: user.org_id)
-    end
-  end
-
-end
\ No newline at end of file
diff --git a/app/policies/template_policy.rb b/app/policies/template_policy.rb
new file mode 100644
index 0000000..3524c40
--- /dev/null
+++ b/app/policies/template_policy.rb
@@ -0,0 +1,124 @@
+class TemplatePolicy < ApplicationPolicy
+  attr_reader :user, :template
+
+  def initialize(user, template)
+    raise Pundit::NotAuthorizedError, "must be logged in" unless user
+    @user = user
+    @template = template
+  end
+
+  def admin_index?
+    user.can_modify_templates?
+  end
+
+  def admin_template?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_update?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_new?
+    user.can_modify_templates?
+  end
+
+  def admin_create?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_destroy?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_phase?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_previewphase?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_addphase?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_createphase?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_updatephase?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_destroyphase?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_updateversion?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_cloneversion?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_destroyversion?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_createsection?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_updatesection?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_destroysection?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_createquestion?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_updatequestion?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_destroyquestion?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_createsuggestedanswer?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_updatesuggestedanswer?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_destroysuggestedanswer?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_createguidance?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_updateguidance?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  def admin_destroyguidance?
+    user.can_modify_templates?  &&  (template.org_id == user.org_id)
+  end
+
+  class Scope < Scope
+    def resolve
+      scope.where(org_id: user.org_id)
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/dmptemplates/_add_guidance.html.erb b/app/views/dmptemplates/_add_guidance.html.erb
deleted file mode 100644
index de49775..0000000
--- a/app/views/dmptemplates/_add_guidance.html.erb
+++ /dev/null
@@ -1,93 +0,0 @@
-<!--add guidance. question is passed as an argument-->
-<div class="dmp_details">
-    <%= form_for :guidance, :url => {:action => "admin_create"}, :html => {:id => "new_guidance_form"} do |f| %>
-        <table class="dmp_details_table guidance_table">
-                <tr>
-                    <td class="first"><%= t("org_admin.guidance.text_label") %></td>
-                    <td><div class="div_left_icon_g">
-                            <%= text_area_tag("guidance-text", "", class: "tinymce") %>
-                        </div>
-                        <div class="div_right_icon_g">
-                            <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_text_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.text_help_text_html"))%>
-                        </div>
-                        <div class="clearfix"></div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="first"><%= t("org_admin.guidance.by_theme_or_by_question") %></td>
-                    <td><div class="div_left_icon_g">
-                            <%= select_tag "g_options", options_for_select([[t("org_admin.guidance.by_themes_label"), 1],
-                            [t("org_admin.guidance.by_question_label"), 2]]) %>
-                        </div>
-                        <div class="div_right_icon_g">
-                            <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_apply_to_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.apply_to_help_text_html"))%>
-                        </div>
-                        <div class="clearfix"></div>
-
-                        <div class="guindance_by_theme" style="display:none;">
-                            <div class="div_left_icon_g">
-                                <%= f.collection_select(:theme_ids,
-                                Theme.all.order("title"),
-                                :id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
-                            </div>
-                            <div class="div_right_icon_g">
-                                <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_by_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.by_themes_help_text_html"))%>
-                            </div>
-                            <div class="clearfix"></div>
-
-                        </div>
-                     </td>
-                </tr>
-                <tr>
-                    <td class="first"><%= t("org_admin.guidance.published") %></td>
-                    <td><div class="div_left_icon_g">
-                            <%= f.check_box :published , :as => :check_boxes%>
-                        </div>
-                        <div class="div_right_icon_g">
-                            <!--%= link_to( image_tag("help_button.png"), "#", :class => "guidance_group_subset_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance_group.subset_option_help_text"))%-->
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="first"><%= t("org_admin.guidance.guidance_group_label") %></td>
-                    <td><div class="div_left_icon_g">
-                        <%= f.collection_select(:guidance_group_ids,
-                            GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order("name ASC"),
-                            :id, :name, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => false})%>
-                        </div>
-                        <div class="div_right_icon_g">
-                            <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_group_select_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.guidance_group_select_help_text_html"))%>
-                        </div>
-                        <div class="clearfix"></div>
-
-                    </td>
-                </tr>
-            </table>
-
-        <!-- submit buttons -->
-
-            <div class="move_2_right">
-                <a id="new_guidance_submit" data-toggle="modal" href="#new_guidance_alert_dialog" class="btn btn-primary"><%= t("helpers.submit.save")%></a>
-
-                <%= link_to t("helpers.submit.cancel"), :back, :class => "btn cancel" %>
-            </div>
-
-        <br />
-         <%= tinymce :content_css => asset_path("application.css") %>
-    <%end%>
-    </div>
-
-
-
-<!-- alert for guidance-->
-<div id="new_guidance_alert_dialog" data-container="body" data-backdrop="static" class="modal hide fade">
-	<div class="modal-header">
-		<h3><%= t('helpers.before_submitting_consider') %></h3>
-	</div>
-	<div class="modal-body">
-		<ul id="missing_fields_new_guidance"></ul>
-  	</div>
-	<div class="modal-footer">
-    	<a href="#" id="return_to_new_guidance" class="btn"><%= t('helpers.ok_label') %></a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/views/dmptemplates/_add_question.html.erb b/app/views/dmptemplates/_add_question.html.erb
deleted file mode 100644
index 1caf54c..0000000
--- a/app/views/dmptemplates/_add_question.html.erb
+++ /dev/null
@@ -1,179 +0,0 @@
-<!-- 
-**Project: DMPRoadmap
-**Description: This block displays adding a new question, its guidance, and options when multiple choice is selected
-in the admin interface.
-**Arguments transferred: an instance of 'section'  
-**Copyright: Digital Curation Centre and University of California Curation Center
--->
-
-<% @new_question = Question.new %>
-<% @new_question.number = section.questions.count + 1 %>
-						
-
-<%= form_for @new_question, :url => {:action => "admin_createquestion"}, :html => {:id => "new_question_#{section.id}"} do |f| %>
-<%= f.hidden_field :section_id, :value => section.id %>
-<div class="question-div">
-	<table class="dmp_details_table phase">
-			<!--Question number -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.question_number_label")%></td>
-				<td><%= f.number_field :number, :in => 1..50, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.questions.number_help_text") %>
-				
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-			
-			<!--Question text -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.question_text_label")%></td>
-				<td><%= f.text_area :text, :rows => "5", :id => "new_question_text_#{section.id}" %>
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-			
-			<!-- Question format -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.answer_format_label")%></td>
-				<td><%= f.hidden_field :section_id, :value => section.id, :class => "section_id" %>
-					<div id="new-ques-format" class="ques_format">
-						<div class="div_left_icon">
-							<%= f.select :question_format_id, 
-								options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, QuestionFormat.find_by_title(t("helpers.text_area")).id), 
-								{},	:id => "new-select-format-#{section.id}"%>
-						</div>
-						<div class="div_right_icon">
-							<%= link_to( image_tag("help_button.png"), "#", :class => "question_format_popover", :rel => "popover", "data-html" => "true",  "data-content" => t("org_admin.questions.question_format_help_text_html"))%>
-						</div>
-						
-					</div>	
-					<div class="clearfix"></div>	
-					<!--display form to enter option from checkbox/radio button/ dropdown/ multi select box-->
-					<div id="new-options-<%= section.id%>" style="display:none;" class="ques_format_option">
-						<table class="options_table">
-							<thead>
-								<tr>
-									<th nowrap class="small"><%= t("org_admin.option_order_label")%></th>
-									<th nowrap class="medium"><%= t("org_admin.option_text_label")%></th>
-									<th nowrap class="small"><%= t("org_admin.option_default_label")%></th>
-									<th nowrap class="small"><%= link_to( image_tag("help_button.png"), "#", :class => "question_options_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_options_help_text_html"))%></th>	
-								</tr>
-							</thead>
-							<tbody class="options_tbody">
-								<% i = 0 %>
-								
-								<% 2.times {@new_question.options.build } %>
-                  <% @new_question.options.each do |options_q|%>
-                      <%= f.fields_for :options, options_q do |op|%>
-                          <% i = i + 1%>
-                          <% options_q.number = i %>
-                          <%= render "option_fields", :f => op %>
-											<%end%>
-									
-									<%end%>	
-								
-							</tbody>
-							
-						</table>
-
-						<a href="#" class="add-option"><%= t("org_admin.add_option_label") %></a>
-												
-												
-                        <div class="clearfix"></div>
-                        <!--display for selecting comment box when multiple choice is being used-->
-                        <%= f.check_box :option_comment_display, :as => :check_boxes%><%= f.label t("org_admin.questions.option_comment_display_checkbox"), :class => "checkbox inline"%>
-					</div>
-					<div class="clearfix"></div>	
-					<!--display for default value for text field label-->
-					<div id="new-default-text-field-<%= section.id%>" style="display:none;" class="ques_format">
-						<div>
-							<%= t("org_admin.questions.default_answer_label")%>
-						</div>
-					</div>
-					<div class="clearfix"></div>	
-					<!--display for default value for text area label -->
-					<div id="new-default-text-area-<%= section.id%>" style="display:none;" class="ques_format">
-						<div >
-							<%= t("org_admin.questions.default_answer_label")%>
-						</div>
-					</div>
-					<div class="clearfix"></div>	
-					<div id="new-default-value-field-<%= section.id%>" style="display:none;" class="ques_format">
-						<div class="div_left_icon">
-							<%= text_area_tag("new-question-default-value", "", class: "tinymce") %>
-						</div>
-						<div class="div_right_icon">
-							<%= link_to( image_tag("help_button.png"), "#", :class => "default_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.default_answer_help_text_html"))%>
-						</div>
-						
-					</div>	
-					<div class="add_space"></div>
-					<div class="clearfix"></div>	
-					<div class="border_bottom"></div>
-				</td>	
-			</tr>
-			
-			<!-- Suggested answer or Example-->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
-				<td><div class="div_left_icon">
-						<% suggested_answer = @new_question.suggested_answers.build %>
-						<%= f.fields_for :suggested_answers, suggested_answer do |s|%>
-							<%= s.hidden_field :organisation_id, :value => current_user.organisation.id %>
-							<ul>
-								<li><%= s.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
-								<li><%= s.text_area :text, :rows => 5 %></li>
-							</ul>
-						<%end%>
-					</div>
-					<div class="div_right_icon">
-						<%= link_to( image_tag("help_button.png"), "#", :class => "suggested_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.suggested_answer_help_text_html"))%>
-					</div>
-					<div class="clearfix"></div>			
-					<div class="border_bottom"></div>	
-					
-				</td>
-			</tr>
-			
-			<!-- Guidance for Question -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.guidance_label")%></td>
-				<td><div class="div_left_icon">
-						<%= text_area_tag("new-question-guidance", "", class: "tinymce") %>
-					</div>
-					<div class="div_right_icon">
-						<%= link_to( image_tag("help_button.png"), "#", :class => "question_guidance_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_guidance_help_text_html"))%>
-					</div>
-					<div class="clearfix"></div>			
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-			
-			<!-- Themes -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.themes_label")%></td>
-				<td><div class="div_left_icon">
-						<%= f.collection_select(:theme_ids,
-							Theme.all.order("title"),
-							:id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
-					</div>
-					<div class="div_right_icon">
-						<%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%>
-					</div>
-					
-					
-				</td>
-			</tr>
-		</table>	
-		<br />
-		
-		<!-- submit buttons -->
-		<div class="move_2_right">
-            <%= hidden_field_tag :section_id, section.id, :class => "section_id" %>
-			<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary new_question_save_button" %>
-            <%= hidden_field_tag :section_id, section.id, :class => "section_id_new" %>
-			<%= link_to t("helpers.submit.cancel"), '#', :class => "btn cancel cancel_add_new_question" %>
-		</div>
-	</div>	
-
-<%end%>
-
diff --git a/app/views/dmptemplates/_add_section.html.erb b/app/views/dmptemplates/_add_section.html.erb
deleted file mode 100644
index b445c85..0000000
--- a/app/views/dmptemplates/_add_section.html.erb
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- add a section and one question. Version is passed as an argument-->
-
-<% @new_section = Section.new %>
-<% @new_section.number = version.sections.count + 1 %>
-						
-
-<%= form_for @new_section, :url => {:action => "admin_createsection"} do |f| %>
-	<%= f.hidden_field :version_id, :value => version.id %>
-	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
-						
-	<div class="accordion-group">
-		<div class="accordion-heading">
-			<div class="accordion-toggle">
-				<div class="accordion_heading_text">
-                
-					<%= f.text_field :title, :as => :string, :class => "text_field", :placeholder => t("org_admin.templates.section_title_placeholder")%>
-				</div>	
-				<!-- + or - icon-->
-	            <span class="icon-minus icon-white accordion-icon"> </span>
-	       	</div> 	
-				
-		</div>
-		<div id="collapse-sec" class="accordion-body section-collapse in collapse">
-			<div class="accordion-inner">
-				<table class="dmp_details_table">
-					<tr>
-						<td class="first_template"><%= t("org_admin.templates.phase_order_label") %></td>
-						<td>
-                            <%= f.number_field :number, :in => 1..15, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.section_number_help_text") %></td>
-					</tr>
-					<tr>
-						<td class="first_template"><%= t("org_admin.templates.desc_label") %></td>
-						<td class="phase_table_last_column">
-							<div class="div_left_icon">
-								<%= text_area_tag("section-desc", "" , class: "tinymce") %>
-							</div>
-							<div class="div_right_icon">
-								<%= link_to( image_tag("help_button.png"), "#", :class => "section_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.section_desc_help_text_html"))%>
-							</div>
-						</td>
-					</tr>
-				</table>			
-				<!-- save buttons-->
-				<div class="move_2_right">
-					<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
-					<%= link_to t("helpers.submit.cancel"), "#", :id => "", :class => "btn cancel" %>
-				</div>
-				<div class="two-column-clear"></div>
-			</div>
-		</div>
-	</div>	
-<%end%>	
-
-
diff --git a/app/views/dmptemplates/_add_suggested_answer.html.erb b/app/views/dmptemplates/_add_suggested_answer.html.erb
deleted file mode 100644
index 03e11b7..0000000
--- a/app/views/dmptemplates/_add_suggested_answer.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--add suggested answer. question is passed as an argument-->
-<%= form_for :suggested_answer, :url => {:action => "admin_createsuggestedanswer"} do |f| %>
-	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
-	<%= f.hidden_field :question_id, :value => question.id %>
-	
-	<table class="dmp_details_table phase">
-		<tr>
-			<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
-			<td>
-				<ul>
-					<li><%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
-					<li><%= f.text_area :text, :rows => 5 %>
-					</li>
-				</ul>
-			</td>
-		</tr>
-	</table>	
-	<br/>
-		
-	<!-- submit buttons -->
-	<div class="move_2_right">
-		<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
-		<%= link_to t("helpers.submit.cancel"), "#", :id => "cancel_suugested_answer", :class => "btn cancel" %>
-	</div>
-<%end%>
diff --git a/app/views/dmptemplates/_admin_nav_tabs.html.erb b/app/views/dmptemplates/_admin_nav_tabs.html.erb
deleted file mode 100644
index 49c3c20..0000000
--- a/app/views/dmptemplates/_admin_nav_tabs.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- 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>
-    <!-- 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>
-    <% 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>
-    <%end%>
-	</ul>
-</div>
-
diff --git a/app/views/dmptemplates/_edit_guidance.html.erb b/app/views/dmptemplates/_edit_guidance.html.erb
deleted file mode 100644
index 8debbca..0000000
--- a/app/views/dmptemplates/_edit_guidance.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--edit suggested answer. question is passed as an argument-->
-<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
-	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
-
-	<table class="dmp_details_table phase">
-		<tr>
-			<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
-			<td>
-				<ul>
-					<li><%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
-					<li><%= f.text_area :text, :rows => 5 %></li>
-				</ul>
-			</td>
-		</tr>
-	</table>
-	<br/>
-
-	<!-- submit buttons -->
-	<div class="move_2_right">
-		<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
-		<%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
-			:confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
-		<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
-		<%= link_to t("helpers.submit.cancel"), "#", :class => "btn cancel cancel_edit_suggested_answer" %>
-	</div>
-<%end%>
diff --git a/app/views/dmptemplates/_edit_phase.html.erb b/app/views/dmptemplates/_edit_phase.html.erb
deleted file mode 100644
index 1536a48..0000000
--- a/app/views/dmptemplates/_edit_phase.html.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- edit/add a phase. Phase is passed as an argument-->
-
-<%= form_for(phase, :url => admin_updatephase_dmptemplate_path(phase), :html => { :method => :put}) do |f| %>
-		
-	<h3>
-		<%= t('org_admin.templates.phase_details_label')%>
-	</h3>
-	<div class="div_left">
-		<%= raw t('org_admin.templates.phase_details_text_html')%>
-	</div>
-	<br />
-	<div class="div_clear"></div>
-	
-	<table class="dmp_details_table phase">
-		<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.phase_title_help_text') %></td>
-		</tr>
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.phase_order_label') %></td>
-			<td><%= f.number_field :number, :in => 0..5, :class => "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_number_help_text') %></td>
-		</tr>
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
-			<td class="phase_table_last_column">
-				<div class="div_left_icon">
-					<%= text_area_tag("phase-desc", phase.description, class: "tinymce") %>
-				</div>
-				<div class="div_right_icon">
-					<%= link_to( image_tag('help_button.png'), '#', :class => 'phase_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.phase_desc_help_text_html'))%>
-				</div>
-			</td>
-		</tr>
-	</table>
-	<div class="div_clear"></div>	
-	
-	<!-- submit buttons -->
-	<div class="move_2_right">
-		<%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
-		<%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
-	</div>
-	
-<%end%>	
\ No newline at end of file
diff --git a/app/views/dmptemplates/_edit_question.html.erb b/app/views/dmptemplates/_edit_question.html.erb
deleted file mode 100644
index ab12c02..0000000
--- a/app/views/dmptemplates/_edit_question.html.erb
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--
-**Project: DMPRoadmap
-**Description: This block displays editing a question, its guidance, and options when multiple choice is selected
-in the admin interface.
-**Arguments transferred: an instance of 'question'
-**Copyright: Digital Curation Centre and University of California Curation Center
--->
-
-<%= form_for(question, :url => admin_updatequestion_dmptemplate_path(question), :html => { :method => :put}) do |f| %>
-<div class="question-div">
-	<table class="dmp_details_table phase">
-			<!--Question number -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.question_number_label")%></td>
-				<td><%= f.number_field :number, :in => 1..50, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.questions.number_help_text") %>
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-
-			<!--Question text -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.question_text_label")%></td>
-				<td><%= f.text_area :text, :rows => "5" %>
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-
-			<!-- Question format -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.answer_format_label")%></td>
-				<td><div id="ques-<%= question.id %>-format" class="ques_format">
-						<div class="div_left_icon">
-							<%= f.hidden_field :id,{ :class => "quest_id" } %>
-							<%= f.select :question_format_id, 
-								options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, question.question_format_id), 
-								{},	:id => "#{question.id}-select-format"%>
-						</div>
-						<div class="div_right_icon">
-							<%= link_to( image_tag("help_button.png"), "#", :class => "question_format_popover", :rel => "popover", "data-html" => "true",  "data-content" => t("org_admin.questions.question_format_help_text_html"))%>
-						</div>
-
-					</div>
-
-					<!--display form to enter option from checkbox/radio button/ dropdown/ multi select box-->
-					<div id="options-<%= question.id %>" style="display:none;" class="ques_format_option">
-						<table class="options_table">
-							<thead>
-								<tr>
-									<th nowrap class="small"><%= t("org_admin.option_order_label")%></th>
-									<th nowrap class="medium"><%= t("org_admin.option_text_label")%></th>
-									<th nowrap class="small"><%= t("org_admin.option_default_label")%></th>
-									<th nowrap class="small"><%= link_to( image_tag("help_button.png"), "#", :class => "question_options_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_options_help_text_html"))%></th>	
-								</tr>
-							</thead>
-							<tbody class="options_tbody">
-								<% if question.options.count == 0 then %>
-									<% 2.times {question.options.build } %>
-
-								<%end%>
-                                <% i = 0 %>
-								<% question.options.to_a.sort_by{|op| op["number"]}.each do |options_q|%>
-									<%= f.fields_for :options, options_q do |op|%>
-                                        <% i = i + 1%>
-                                        <% options_q.number = i %>
-										<%= render "option_fields", :f => op %>
-   									<%end%>
-								<%end%>	
-								
-							</tbody>
-						</table>
-
-						<a href="#" class="add-option"><%= t("org_admin.add_option_label") %></a>
-
-                        <div class="clearfix"></div>
-                        <!--display for selecting comment box when multiple choice is being used-->
-                        <%= f.check_box :option_comment_display, :as => :check_boxes%><%= f.label t("org_admin.questions.option_comment_display_checkbox"), :class => "checkbox inline"%>
-					</div>
-					<div class="clearfix"></div>
-					<!--display for default value for text field label-->
-					<div id='default-text-field-<%= question.id %>' style="display:none;" class="ques_format">
-						<div>
-							<%= t("org_admin.questions.default_answer_label")%>
-						</div>
-					</div>
-					<div class="clearfix"></div>
-					<!--display for default value for text area label -->
-					<div id="default-text-area-<%= question.id %>" style="display:none;" class="ques_format">
-						<div >
-							<%= t("org_admin.questions.default_answer_label")%>
-						</div>
-					</div>
-					<div class="clearfix"></div>
-					<div id="default-value-field-<%= question.id %>" style="display:none;" class="ques_format">
-						<div class="div_left_icon">
-							<%= text_area_tag("question-default-value-#{question.id}", question.default_value, class: "tinymce") %>
-						</div>
-						<div class="div_right_icon">
-							<%= link_to( image_tag("help_button.png"), "#", :class => "default_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.default_answer_help_text_html"))%>
-						</div>
-					</div>
-					<div class="add_space"></div>
-					<div class="clearfix"></div>
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-
-			<!-- Suggested answer or Example-->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
-				<td><div class="div_left_icon">
-					<% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation.id) %>
-					<% if suggested_answer.nil? then %>
-						 <% suggested_answer = question.suggested_answers.build %>
-					<%end%>
-					<%= f.fields_for :suggested_answers, suggested_answer do |s|%>
-						<%= s.hidden_field :organisation_id, :value => current_user.organisation.id %>
-						<ul>
-							<li><%= s.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
-							<li><%= s.text_area :text, :rows => 5 %>
-							</li>
-						</ul>
-					<%end%>
-					</div>
-					<div class="div_right_icon">
-						<%= link_to( image_tag("help_button.png"), "#", :class => "suggested_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.suggested_answer_help_text_html"))%>
-					</div>
-					<div class="clearfix"></div>
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-			<!-- Guidance for Question -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.guidance_label")%></td>
-				<td><div class="div_left_icon">
-						<%= text_area_tag("question-guidance-#{question.id}", question.guidance , class: "tinymce") %>
-					</div>
-					<div class="div_right_icon">
-						<%= link_to( image_tag("help_button.png"), "#", :class => "question_guidance_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_guidance_help_text_html"))%>
-					</div>
-					<div class="clearfix"></div>
-					<div class="border_bottom"></div>
-				</td>
-			</tr>
-			<!-- Themes -->
-			<tr>
-				<td class="first_template"><%= t("org_admin.questions.themes_label")%></td>
-				<td><div class="div_left_icon">
-						<%= f.collection_select(:theme_ids,
-							Theme.all.order("title"),
-							:id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%>
-					</div>
-					<div class="div_right_icon">
-						<%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%>
-					</div>
-				</td>
-			</tr>
-		</table>
-		<br />
-		<!-- submit buttons -->
-		<div class="move_2_right">
-			<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
-			<% if !question.section.version.published? then%>
-				<%= link_to t("helpers.submit.delete"), admin_destroyquestion_dmptemplate_path(:question_id => question.id),
-				:confirm => t("org_admin.questions.delete_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
-			<%end%>	
-			<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
-			<%= link_to t("helpers.submit.cancel"), "#", :class => "btn cancel cancel_edit_question" %>
-		</div>
-	</div>	
-
-
-<!--guidance block -->
-<%= render :partial => "guidance_display", locals: {question: question}%>
-<%end%>
diff --git a/app/views/dmptemplates/_edit_section.html.erb b/app/views/dmptemplates/_edit_section.html.erb
deleted file mode 100644
index 8f7f8b4..0000000
--- a/app/views/dmptemplates/_edit_section.html.erb
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- 
-**Project: DMPRoadmap
-**Description: This block edits a section and its questions.
-**Arguments transferred: 'section'  
-**Copyright: Digital Curation Centre and University of California Curation Center
--->
-
-
-<%= form_for(section, :url => admin_updatesection_dmptemplate_path(section, :phase => phase, :edit => edit), :html => { :method => :put}) do |s| %>
-	<%if @open && @section_id == section.id then%>
-			<% toggle = 'accordion-body  section-collapse in collapse'%>
-		<%else%>
-			<% toggle = 'accordion-body collapse section-collapse' %>
-		<%end%>
-
-     <%if @new_sec then%>
-        <% toggle = 'accordion-body  section-collapse in collapse'%>
-     <%end%>
-
-	<div class="accordion-group" >
-		<div class="accordion-heading">
-			<div class="div_left make_div_smaller">
-				<div class="accordion_heading_text">
-					<%= s.text_field :title, :as => :string, :class => 'text_field', :placeholder => t('org_admin.templates.section_title_placeholder') %>
-
-				</div>
-			</div>
-			<div class="div_right make_div_longer">
-				<a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-sec-<%= section.id %>">
-					<!-- + or - icon-->
-		        	<span class="icon-plus icon-white accordion-icon"> </span>
-		        </a>
-			</div>
-		</div>
-
-
-		<div id="collapse-sec-<%= section.id %>" class="<%= toggle %>" >
-			<div class="accordion-inner">
-				<table class="dmp_details_table">
-					<tr>
-						<td class="first_template"><%= t('org_admin.templates.phase_order_label') %></td>
-						<td><%= s.number_field :number, :in => 1..15, :class => "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.section_number_help_text') %></td>
-					</tr>
-					<tr>
-						<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
-						<td class="phase_table_last_column">
-							<div class="div_left_icon">
-								<%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %>
-							</div>
-							<div class="div_right_icon">
-								<%= link_to( image_tag('help_button.png'), '#', :class => 'section_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.section_desc_help_text_html'))%>
-							</div>
-						</td>
-					</tr>
-				</table>
-				<!-- save buttons-->
-				<div class="move_2_right">
-					<%= s.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
-					<% if !section.version.published? || phase.dmptemplate.org_type == constant("organisation_types.funder") then%>
-						<%= link_to t("helpers.submit.delete"), admin_destroysection_dmptemplate_path(:section_id => section.id),
-						:confirm => t("org_admin.templates.section_delete_message", :section_title => section.title ), :method => :delete, :class => "btn btn-primary"%>
-					<%end%>
-					<%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %>
-				</div>
-			<%end%>
-				<div class="two-column-clear question-divider"></div>
-				<% @questions = section.questions.order("number")%>
-				<%if @questions.count > 0 %>
-					<% question_left = @questions.count %>
-					<% @questions.each do |question| %>
-                        <div class="question_guidance_block">
-                            <div id="show_question_div_<%= question.id%>" class="<%= if question.id == @question_id then "current_question" end %>">
-                                <!-- render the show question block-->
-                                <%= render :partial => 'show_question', locals: {question: question} %>
-                            </div>
-
-                            <div id="edit_question_div_<%= question.id%>"  style="display: none">
-                                <!-- render the edit question block-->
-                                <%= render :partial => 'edit_question', locals: {question: question} %>
-                            </div>
-                        </div>
-                        <!--verify how many questions are left -->
-                        <%if question_left.to_i > 1 then %>
-                            <div class="two-column-clear question-divider"></div>
-                        <%else%>
-                            <div class="two-column-clear"></div>
-                        <%end%>
-                        <% question_left = question_left - 1 %>
-
-					<%end%>
-				<%end%>
-
-				<!-- Add a new question if the version is not published-->
-				<% if !section.version.published? || phase.dmptemplate.org_type == constant("organisation_types.funder")  then%>
-
-					<%if @questions.count != 0 %>
-						<div class="two-column-clear question-divider"></div>
-					<%end%>
-					<!-- add question block -->
-					<div id="add_question_block_div_<%= section.id%>" style="display: none">
-						<%= render :partial => 'add_question', locals: {section: section} %>
-					</div>
-
-					<!-- add question button-->
-					<div id="add_question_button_div_<%= section.id%>">
-						<div class="div_left">
-							<%= hidden_field_tag :section_id, section.id, :class => "section_id" %>
-							<%= link_to t("org_admin.add_question_label"), '#', :class => "btn btn-primary add_question_button" %>
-						</div>
-					</div>
-				<%end%>
-
-				<div class="two-column-clear"></div>
-			</div>
-		</div>
-	</div>
diff --git a/app/views/dmptemplates/_edit_suggested_answer.html.erb b/app/views/dmptemplates/_edit_suggested_answer.html.erb
deleted file mode 100644
index 2f78934..0000000
--- a/app/views/dmptemplates/_edit_suggested_answer.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--edit suggested answer. question is passed as an argument-->
-<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
-	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
-
-	<table class="dmp_details_table phase">
-		<tr>
-			<td class="first_template"><%= t('org_admin.questions.suggested_or_example_answer_label')%></td>
-			<td>
-				<ul>
-					<li><%= f.select :is_example, {t('org_admin.questions.example_answer_label') => true, t('org_admin.questions.suggested_answer_label') => false} %></li>
-					<li><%= f.text_area :text, :rows => 5 %></li>
-				</ul>
-			</td>
-		</tr>
-	</table>
-	<br/>
-
-	<!-- submit buttons -->
-	<div class="move_2_right">
-		<%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
-		<%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
-			:confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
-		<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
-		<%= link_to t('helpers.submit.cancel'), '#', :class => 'btn cancel cancel_edit_suggested_answer' %>
-	</div>
-<%end%>
diff --git a/app/views/dmptemplates/_edit_template.html.erb b/app/views/dmptemplates/_edit_template.html.erb
deleted file mode 100644
index dbea10a..0000000
--- a/app/views/dmptemplates/_edit_template.html.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- 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 />
-	
-<%end%>
\ No newline at end of file
diff --git a/app/views/dmptemplates/_edit_version.html.erb b/app/views/dmptemplates/_edit_version.html.erb
deleted file mode 100644
index 416fdb7..0000000
--- a/app/views/dmptemplates/_edit_version.html.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- edit version and its sections,questions and guidance. Version is passed as an argument-->
-
-<!-- version details-->
-<%= form_for(version, :url => admin_updateversion_dmptemplate_path(version, :edit => edit,  :phase => phase), :html => { :method => :put}) do |f| %>
-						
-	<h3>
-		<%= t('org_admin.templates.version_details_label')%>
-	</h3>
-	<div class="div_clear"></div>	
-		
-	<div class="phase_details_body">
-		<table class="dmp_details_table phase">
-			<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.phase_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("version-desc", version.description, class: "tinymce") %>
-					</div>
-					<div class="div_right_icon">
-						<%= link_to( image_tag('help_button.png'), '#', :class => 'version_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.versions.desc_help_text_html'))%>
-					</div>
-				</td>
-			</tr>
-			<tr>
-				<td class="first_template"><%= t('org_admin.templates.published_label') %></td>
-				<td><%= f.check_box :published, :as => :check_boxes %></td>
-
-			</tr>
-		</table>
-		
-		<div class="div_clear"></div>
-		
-		<div class="move_2_right">
-			<%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
-			<%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
-		</div>
-	</div>
-	
-<%end%>		
-
-
-			
\ No newline at end of file
diff --git a/app/views/dmptemplates/_guidance_display.html.erb b/app/views/dmptemplates/_guidance_display.html.erb
deleted file mode 100644
index 4082baf..0000000
--- a/app/views/dmptemplates/_guidance_display.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--this block displays all guidance related with the question. question is passed as an argument-->
-
-<div class="question-guidance">
-	<div class="accordion" id="<%= question.id %>-guidance">
-		<% if !question.guidance.nil? && question.guidance != "" then %>
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<a class="accordion-guidance-link" data-toggle="collapse" data-parent="#<%= question.id %>-guidance" href="#collapse-guidance-<%= question.id%>">
-						<div class="accordion_heading_text">
-						<%= question.section.organisation.abbreviation %> <%= t('helpers.guidance')%> 
-						</div>
-						<span class="plus-laranja"> </span></a>
-				</div>
-				<div id="collapse-guidance-<%= question.id%>" class="guidance-accordion-body collapse">
-					<div class="accordion-inner"><%= raw question.guidance %></div>
-				</div>
-			</div>
-		<% end %>
-		
-		<% question.guidance_for_question(question, current_user.organisation).each_pair do |title,guidance| %>
-			<div class="accordion-group">											
-				<div class="accordion-heading">
-					<a class="accordion-guidance-link" data-toggle="collapse" data-parent="#<%= question.id %>-guidance" href="#collapse-guidance-<%= guidance.id%>-<%= question.id %>">
-						<div class="accordion_heading_text">
-						<%= title%> 
-						</div>
-						<span class="plus-laranja"> </span></a>
-				</div>
-				<div id="collapse-guidance-<%= guidance.id%>-<%= question.id %>" class="guidance-accordion-body collapse">
-					<div class="accordion-inner"><%= raw guidance.text %></div>
-				</div>
-			</div>
-		<% end %>	
-	</div>
-    
-</div>		
\ No newline at end of file
diff --git a/app/views/dmptemplates/_option_fields.html.erb b/app/views/dmptemplates/_option_fields.html.erb
deleted file mode 100644
index 21f3e80..0000000
--- a/app/views/dmptemplates/_option_fields.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--Add options answers to a question-->
-<tr class="options_content">
-	<td class="small"><%= f.number_field :number,:in => 1..20, :class => "number_field option"%></td>
-	<td class="medium"><%= f.text_field :text, :as => :string, :class => "small_text_field" %></td>
-	<td class="small"><%= f.check_box :is_default %></td>	
-	<td class="small"><%= f.hidden_field :_destroy %><span class="remove-option"><%= t('org_admin.remove_option_label') %></span></td>																	
-</tr>
diff --git a/app/views/dmptemplates/_preview_question.html.erb b/app/views/dmptemplates/_preview_question.html.erb
deleted file mode 100644
index fa75e30..0000000
--- a/app/views/dmptemplates/_preview_question.html.erb
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- preview a question and its guidance.  Question is passed as an argument-->
-
-<div class="question-div">
-	
-	<!--question format-->
-	<% q_format = question.question_format%>
-	<form action="">
-		<div class="question-form">
-			<!-- verify if the question has multiple choice -->
-			<% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%>
-				<% options = question.options.order("number") %>
-										
-				<!--checkbox display-->
-				<% if q_format.title == t("helpers.checkbox") then %>
-					<%if !options.nil? then %>
-						<fieldset class="choices">
-							<label class="text_colour"><%= raw question.text %></label>
-							<ol class="choices-group">
-								<% options.each do |op|%>
-									<li class="choice"><label ><input type="checkbox" ><%= raw op.text %></label></li>
-								<%end%>
-							</ol>
-						</fieldset>	
-					<%end%>
-				<!--multi select box display-->
-				<% elsif q_format.title == t("helpers.multi_select_box") then %>
-					<%if !options.nil? then %>
-						<label class="text_colour"><%= raw question.text %></label>
-						<select multiple="multiple">
-							<% options.each do |op|%>
-								<option><%= raw op.text %></option>
-							<%end%>
-						</select>
-					<%end%>
-				<!--Radio buttons display-->
-				<% elsif q_format.title == t("helpers.radio_buttons") then%>
-					<%if !options.nil? then %>
-						<fieldset class="choices">
-							<label class="text_colour"><%= raw question.text %></label>
-							<ol class="choices-group">
-								<% options.each do |op|%>
-									<li class="choice"><label ><input type="radio"><%= raw op.text %></label></li>
-								<%end%>
-							</ol>
-						</fieldset>	
-					<%end%>
-				<!--dropdown display-->
-				<% elsif q_format.title == t("helpers.dropdown") then%>
-					<%if !options.nil? then %>
-						<label class="text_colour" ><%= raw question.text %></label>
-						<select>
-							<% options.each do |op|%>
-								<option><%= raw op.text %></option>
-							<%end%>
-						</select>	
-					<%end%>
-				<% end %>
-				
-				<!--Suggested answer area-->
-				<% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %>
-				<% if !suggested_answer.nil? && suggested_answer.text != "" then %>
-					<div class="suggested-answer-div">
-						<span class="suggested-answer-intro">
-							<% if suggested_answer.is_example? then %>
-								<%= t("org_admin.questions.example_answer_label")%>
-							<%else%>
-								<%= t("org_admin.questions.suggested_answer_label")%>
-							<%end%>
-						</span>
-						<div class="suggested-answer-border">
-							<p class="suggested-answer">
-								<%= raw suggested_answer.text %>
-							</p>
-						</div>
-					</div>
-				<% end %>
-				<label ><%= t("helpers.comment")%></label>
-				<div class="clear"></div>
-				<textarea rows="4" style="width: 97%;"><%= question.default_value %></textarea>
-			<% else %>
-				<label class="text_colour"><%= raw question.text %></label>
-				<!--Suggested answer area-->
-				<% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %>
-				<% if !suggested_answer.nil? && suggested_answer.text != "" then %>
-					<div class="suggested-answer-div">
-						<span class="suggested-answer-intro">
-							<% if suggested_answer.is_example? then %>
-								<%= t("org_admin.questions.example_answer_label")%>
-							<%else%>
-								<%= t("org_admin.questions.suggested_answer_label")%>
-							<%end%>
-						</span>
-						<div class="suggested-answer-border">
-							<p class="suggested-answer">
-								<%= raw suggested_answer.text %>
-							</p>
-						</div>
-					</div>
-				<% end %>
-				
-			<% end %>
-			
-			
-			
-			<!--text field display-->
-			<% if q_format.title == t("helpers.text_field") then %>
-				<input type ="text" style="width: 97%;"/>
-			<!--text area display-->
-			<%elsif q_format.title == t("helpers.text_area") then%>
-				<textarea rows="4" style="width: 97%;" ><%= question.default_value[3..-5] unless question.default_value.nil? %></textarea>
-			<%end%>
-			<br/>
-			<!-- button without action-->
-			<%= link_to t("helpers.save"), "#", :class => "btn btn-primary", :onclick => "event.preventDefault();" %>
-			
-			<span class="label label-warning answer-status"><%= t("helpers.notanswered") %></span>
-	
-		</div>
-	</form>
-</div>	
-
-		
-<!--guidance block -->
-<%= render :partial => "guidance_display", locals: {question: question}%>
diff --git a/app/views/dmptemplates/_show_phase.html.erb b/app/views/dmptemplates/_show_phase.html.erb
deleted file mode 100644
index 01117cf..0000000
--- a/app/views/dmptemplates/_show_phase.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- show phase details -->
-
-<h3>
-	<%= t('org_admin.templates.phase_details_label')%>
-
-	<!-- edit phase details button -->
-	<% if @phase.dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
-		<div class="move_2_right">
-			<%= link_to t("org_admin.templates.edit_phase_details_label"), '#', :class => "btn btn-primary", :id => "edit_phase_button"%>
-		</div>
-	<%end%>
-</h3>
-
-<%if @phase.dmptemplate.org_type != constant("organisation_types.funder") then%>
-	<div class="div_left">
-		<%= raw t('org_admin.templates.phase_details_text_html')%>
-	</div>
-<%end%>
-
-<br />
-<div class="div_clear"></div>
-
-<table class="dmp_details_table phase">
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.title_label') %></td>
-		<td><%= @phase.title %></td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.phase_order_label') %></td>
-		<td><%= @phase.number %></td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
-		<td class="phase_table_last_column"><%= raw @phase.description %></td>
-	</tr>
-</table>
-<div class="div_clear"></div>
diff --git a/app/views/dmptemplates/_show_phases_sections.html.erb b/app/views/dmptemplates/_show_phases_sections.html.erb
deleted file mode 100644
index 19c603a..0000000
--- a/app/views/dmptemplates/_show_phases_sections.html.erb
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- Display of phases, sections and it's questions. A phase is passed as an argument-->
-
-<div class="div_clear"></div>
-
-<div class="div_left admin_left_smaller">
-	<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-->
-
-        <%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" %>
-
-    </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 class="div_clear"></div>
diff --git a/app/views/dmptemplates/_show_question.html.erb b/app/views/dmptemplates/_show_question.html.erb
deleted file mode 100644
index df79c2b..0000000
--- a/app/views/dmptemplates/_show_question.html.erb
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- 
-**Project: DMPRoadmap
-**Description: This block shows a question, its guidance, and options when multiple choice is selected.
-**Arguments transferred: 'question'  
-**Copyright: Digital Curation Centre and University of California Curation Center
--->
-
-<div class="question-div">
-	<table class="dmp_details_table phase">
-		<!--Question number -->
-		<tr>
-			<td class="first_template"><%= t('org_admin.questions.question_number_label')%></td>
-			<td><%= question.number%></td>
-		</tr>
-
-		<!--Question text -->
-		<tr>
-			<td class="first_template"><%= t('org_admin.questions.question_text_label')%></td>
-			<td><%= raw question.text %>
-				</br>
-				<div class="answer-readonly">
-					<% q_format = question.question_format %>
-					<% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%>
-						<ul class='options'>
-						<% if question.options.is_a? Option then %>
-							<li>- <%= question.options.text %></li>
-						<% else %>
-							<% if !question.options.to_a.nil? then %>
-                                <% question.options.to_a.sort_by{|op| op['number']}.each do |o| %>
-                                    <li>- <%= o.text %></li>
-                                <%end%>
-							<% end %>
-						<% end %>
-						</ul>
-                    <% end %>
-				</div>
-			</td>
-		</tr>
-		<!--Default value -->
-		<%if q_format.title  == t("helpers.text_field") || q_format.title == t("helpers.text_area") then %>
-			<%if !question.default_value.nil? then %>
-				<tr>
-					<td class="first_template"><%= t('org_admin.questions.default_value_label')%></td>
-					<td><%= raw question.default_value %></td>
-				</tr>
-			<%end%>
-		<% end %>
-		<!-- Question format -->
-		<tr>
-			<td class="first_template"><%= t('org_admin.questions.answer_format_label')%></td>
-			<td><%= q_format.title %>
-                </br>
-                <% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%>
-                    <% if question.option_comment_display == true then%>
-                        <%= t("org_admin.questions.option_comment_display")%>
-                    <%else%>
-                        <%= t("org_admin.questions.option_comment_hide")%>
-                    <%end%>
-                <%end%> 
-                <div class="add_space"></div>
-            </td>
-		</tr>
-
-		<!-- Suggested answer or Example-->
-		<% if (question.section.version.phase.dmptemplate.org_type != constant("organisation_types.funder") && question.section.organisation_id == current_user.organisation_id ) then%>
-			<% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %>
-			<% if !suggested_answer.nil?  && suggested_answer.text != "" then %>
-				<tr>
-					<td class="first_template">
-						<% if suggested_answer.is_example? then %>
-							<%= t('org_admin.questions.example_answer_label')%>
-						<%else%>
-							<%= t('org_admin.questions.suggested_answer_label')%>
-						<%end%>
-					</td>
-					<td><%= raw suggested_answer.text %></td>
-				</tr>
-			<%end%>
-		<%end%>
-		<!-- Guidance linked to this question -->
-		<%if !question.guidance.nil? then %>
-			<tr>
-				<td class="first_template"><%= t('org_admin.questions.guidance_label')%></td>
-				<td><%= raw question.guidance %></td>
-			</tr>
-		<%end%>
-		<!-- Themes -->
-		<% themes_q = question.themes %>
-		<%if !themes_q.nil? then%>
-			<tr>
-				<td class="first_template"><%= t('org_admin.questions.themes_label')%></td>
-				<td><% i = 1%>
-					<% themes_q.each do |t|%>
-						<%= t.title %>
-						<% if themes_q.count > i then%>
-							,
-							<% i +=1 %>
-						<% end %>
-					<%end%>
-				</td>
-			</tr>
-		<%end%>
-	</table>
-	<br/>
-	<!-- Add suggested or example answers to a funders template-->
-	<% if (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id != current_user.organisation_id ) then%>
-		<% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %>
-		<% if !suggested_answer.nil?  && suggested_answer.text != "" then %>
-			<div id="show_suggested_answer_div_<%= question.id%>">
-				<%= render :partial => 'show_suggested_answer', locals: {suggested_answer: suggested_answer, question: question} %>
-			</div>
-			<div id="edit_suggested_answer_div_<%= question.id%>" style="display: none">
-				<%= render :partial => 'edit_suggested_answer', locals: {suggested_answer: suggested_answer, question: question} %>
-			</div>
-
-		<%end%>
-
-
-		<div id="add_suggested_answer_block_<%= question.id%>" style="display: none">
-			<%= render :partial => 'add_suggested_answer', locals: {question: question} %>
-		</div>
-
-
-	<%end%>
-
-	<br/>
-	<!-- edit question button-->
-	<%if (@edit == 'true'&& question.section.organisation_id == current_user.organisation_id) || (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id == current_user.organisation_id && current_user.org_type != constant("organisation_types.funder")) then%>
-		<div class="move_2_right">
-			<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
-			<%= link_to t("org_admin.questions.question_edit_button"), '# ', :class => "btn btn-primary edit_question_button"%>
-            <% if !question.section.version.published? then%>
-				<%= link_to t("org_admin.questions.question_delete_button"), admin_destroyquestion_dmptemplate_path(:question_id => question.id),
-				:confirm => t("org_admin.questions.delete_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
-			<%end%>	
-		</div>
-	<%elsif  (@edit == 'false' && question.section.organisation_id != current_user.organisation_id )|| (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id != current_user.organisation_id ) then%>
-		<% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %>
-		<% if suggested_answer.nil? then %>
-			<div id="add_suggested_answer_button_<%= question.id%>">
-				<div class="move_2_right">
-					<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
-					<%= link_to t("org_admin.questions.suggested_or_example_answer_button"), '# ', :class => "btn btn-primary add_suggested_answer_button"%>
-				</div>
-			</div>
-		<%end%>
-	<%end%>
-	<div class="div_clear"></div>
-</div>
-
-
-<!--guidance block -->
-<%= render :partial => 'guidance_display', locals: {question: question}%>
diff --git a/app/views/dmptemplates/_show_section.html.erb b/app/views/dmptemplates/_show_section.html.erb
deleted file mode 100644
index 1dbf719..0000000
--- a/app/views/dmptemplates/_show_section.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- show a section and its questions and guidance. Section is passed as an argument-->
-<%if @open && @section_id == section.id then%>
-	<% toggle = 'accordion-body  section-collapse in collapse'%>
-<%else%>
-	<% toggle = 'accordion-body collapse section-collapse' %>
-<%end%>
-<div class="accordion-group">
-	<div class="accordion-heading">
-		<a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-<%= section.id%>">
-			<div class="accordion_heading_text">
-				<% if section.title == '' then%>
-					<%= t('org_admin.templates.new_section')%>
-				<%else%>
-					<%= section.title %>
-				<%end%>
-			</div>
-			<!-- + or - icon-->
-        	<span class="icon-plus icon-white accordion-icon"> </span>
-       	</a>
-    </div>
-	<div id="collapse-<%= section.id%>" class="<%= toggle %>">
-		<div class="section_desc">
-			<%= raw section.description %>
-		</div>
-		<div class="accordion-inner">
-			<% section.questions.order("number").each do |question| %>
-				<% last_question_id = section.questions.order("number DESC").first.id %>
-                
-                <div class="question_guidance_block">    
-                    <!--question block-->
-                    <%= render :partial => 'show_question', locals: {question: question}%>
-                </div>    
-
-				<% if last_question_id == question.id then %>
-					<div class="two-column-clear"></div>
-				<% else %>
-					<div class="two-column-clear question-divider"></div>
-				<% end %>
-
-			<%end%>
-		</div>
-	</div>
-</div>
diff --git a/app/views/dmptemplates/_show_suggested_answer.html.erb b/app/views/dmptemplates/_show_suggested_answer.html.erb
deleted file mode 100644
index 888dd45..0000000
--- a/app/views/dmptemplates/_show_suggested_answer.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--show suggested answer. suggested answer is passed as an argument-->
-<table class="dmp_details_table phase">
-	<tr>
-		<td class="first_template">
-			<% if suggested_answer.is_example? then %>
-				<%= t('org_admin.questions.example_answer_label')%>
-			<%else%>
-				<%= t('org_admin.questions.suggested_answer_label')%>
-			<%end%>
-		</td>
-		<td><%= raw suggested_answer.text %></td>
-	</tr>
-</table>
-<br/>
-
-<div class="move_2_right">
-	<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
-	<%= link_to t("org_admin.questions.edit_suggested_answer_button"), '# ', :class => "btn btn-primary edit_form_for_suggested_answer"%>
-</div>
diff --git a/app/views/dmptemplates/_show_template.html.erb b/app/views/dmptemplates/_show_template.html.erb
deleted file mode 100644
index 7cfec9d..0000000
--- a/app/views/dmptemplates/_show_template.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- 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/>	
-
-<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>
-</table>
diff --git a/app/views/dmptemplates/_show_version.html.erb b/app/views/dmptemplates/_show_version.html.erb
deleted file mode 100644
index 3e1456e..0000000
--- a/app/views/dmptemplates/_show_version.html.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- show version and its sections,questions and guidance-->
-
-<!-- version details-->
-<h3>
-	<%= t('org_admin.templates.version_details_label')%>
-</h3>
-<div class="div_clear"></div>		
-
-<table class="dmp_details_table phase">
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.title_label') %></td>
-		<td><%= version.title %></td>
-	</tr>
-	<% if version.description != "" then%>
-		<tr>
-			<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
-			<td><%= raw version.description %></td>
-		</tr>
-	<%end%>	
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.published_label') %></td>
-		<td><%= version.published %></td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.created') %></td>
-		<td>
-			<%= l version.created_at.to_date, :formats => :short %>
-		</td>
-	</tr>
-	<tr>
-		<td class="first_template"><%= t('org_admin.templates.last_updated') %></td>
-		<td>
-			<%= l version.updated_at.to_date, :formats => :short %>
-		</td>
-	</tr>
-</table>
-<div class="div_clear"></div>
-
-
-
-
-
diff --git a/app/views/dmptemplates/_versions_table.html.erb b/app/views/dmptemplates/_versions_table.html.erb
deleted file mode 100644
index e51dbfe..0000000
--- a/app/views/dmptemplates/_versions_table.html.erb
+++ /dev/null
@@ -1,73 +0,0 @@
-<%if !phase.versions.nil? then %>
-	<div class="versions_display_table">	
-		<h3><%= t('org_admin.templates.versions_label')%></h3>
-		<p>
-			<%= t('org_admin.versions.versions_text_html')%>
-		</p>
-		
-		<!--table displaying versions for this phase-->
-		<table class="dmp_table" id="dmp_table">
-			<thead>
-				<tr>
-					<th><%= t('org_admin.templates.title_label')%></th>
-					<th><%= t('org_admin.templates.published_label')%></th>
-					<th><%= t('org_admin.templates.created')%></th>
-					<th><%= t('org_admin.templates.last_updated') %></th>
-					<th><%= t('org_admin.templates.actions') %></th>
-				</tr>
-			</thead>
-			<tbody>
-				<% phase.versions.each do |v|%>
-					<!--Alert pop up block for version editing-->
-					<div id='version_edit_alert_<%= v.id%>' data-container="body" data-id="<%= v.id%>" data-backdrop='static' class='modal hide fade'>
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
-							<h3><%= t('org_admin.versions.edit_alert_label')%></h3>
-						</div>
-						<div class="modal-body">
-							<div><p><%= t('org_admin.versions.edit_alert_text')%></p></div>
-						</div>
-						<div class="modal-footer">
-						  	<%= link_to t('org_admin.versions.edit_versions_label'), admin_phase_dmptemplate_path( :version_id => v.id, :id => phase.id , :edit => 'true') , :id => "edit-version-confirmed", :class => "btn cancel" %>
-							<%= link_to t('org_admin.versions.clone_versions_label'), admin_cloneversion_dmptemplate_path( :version_id => v.id, :phase => phase ) , :id => "clone-version-confirmed", :class => "btn btn-primary" %>
-					  </div>
-					</div>
-					<tr>
-						<td class="dmp_td_no_border">
-							<%= v.title %>
-						</td>
-						<td class="dmp_td_border">
-							<%= v.published %>
-						</td>
-						<td class="dmp_td_border">
-							<%= l v.created_at.to_date, :formats => :short %>
-						</td>
-						<td class="dmp_td_border">
-							<%= l v.updated_at.to_date, :formats => :short %>
-						</td>  
-						<td class="dmp_td_border">
-							<%= link_to t("helpers.view"), admin_phase_dmptemplate_path( :version_id => v.id, :id => phase.id , :edit => 'false'), :class => "dmp_table_link"%>
-							<% if v.published? then%>
-								<a id="edit-version-button" data-toggle="modal" href="#version_edit_alert_<%= v.id%>" class="dmp_table_link " >
-									<%= t('org_admin.versions.edit_label')%>
-								</a>
-                                <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %>
-							<%else%>
-								<%= link_to t("org_admin.versions.edit_label"), admin_phase_dmptemplate_path(phase, :version_id => v.id, :edit => 'true'), :class => "dmp_table_link" %>
-                                <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %>
-								<%#= link_to t("helpers.submit.delete"), admin_destroyversion_dmptemplate_path(:version_id => v.id, :phase => phase , :edit => 'false'),
-								:confirm => t("org_admin.versions.delete_message", :version_title => v.title ), :method => :delete, :class => "dmp_table_link"%>
-							<%end%>		
-						</td>	
-					</tr>
-					
-					
-									
-				<%end%>
-			</tbody>
-		</table>
-	</div>
-
-
-
-<%end%>
diff --git a/app/views/dmptemplates/admin_addphase.html.erb b/app/views/dmptemplates/admin_addphase.html.erb
deleted file mode 100644
index 6e8a336..0000000
--- a/app/views/dmptemplates/admin_addphase.html.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-<%- model_class = Phase -%>
-<%= stylesheet_link_tag "admin" %>
-<% 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>            
-</h1>
-
-<div class="div_clear"></div>
-
-<!-- render navigation tabs for the template-->
-<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, active: "add_plan"} %>
-
-<!-- phase main container -->
-<div class="project-tabs-body">
-    <div class="accordion" id="sections-accordion">
-    	
-    	<!--phase details -->
-    	<div class="phase_details">
-    		<div class="phase_details_body">
-    			
-    			<!-- add phase details -->
-    			<%= form_for :phase, :url => { :action => "admin_createphase"} do |f| %>
-					<h3>
-						<%= t("org_admin.templates.phase_details_label")%>
-					</h3>
-					<%= raw t("org_admin.templates.phase_new_text_html")%>
-					<br/>
-					<div class="div_clear"></div>
-					<%= f.hidden_field :dmptemplate_id, :value => @dmptemplate.id%>
-					<table class="dmp_details_table phase">
-						<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.phase_title_help_text") %></td>
-						</tr>
-						<tr>
-							<td class="first_template"><%= t("org_admin.templates.phase_order_label") %></td>
-							<td><%= f.number_field :number, :in => 1..5, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.phase_number_help_text") %></td>
-						</tr>
-						<tr>
-							<td class="first_template"><%= t("org_admin.templates.desc_label") %></td>
-							<td class="phase_table_last_column">
-								<div class="div_left_icon">
-									<%= text_area_tag("phase-desc","" , class: "tinymce") %>
-								</div>
-								<div class="div_right_icon">
-									<%= link_to( image_tag("help_button.png"), "#", :class => "phase_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.phase_desc_help_text_html"))%>
-								</div>
-								<div class="clearfix"></div>
-							</td>
-						</tr>
-					</table>
-					<div class="div_clear"></div>	
-					
-					<!-- submit buttons -->
-					<div class="move_2_right">
-						<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
-						<%= link_to t("helpers.submit.cancel"), admin_dmptemplate_path(@dmptemplate), :class => "btn cancel" %>
-					</div>
-	
-				<%end%>	
-   			</div>
-		</div>  				
-	</div>	
-</div>
-		    	    
-<%= tinymce :content_css => asset_path("application.css") %>
\ No newline at end of file
diff --git a/app/views/dmptemplates/admin_index.html.erb b/app/views/dmptemplates/admin_index.html.erb
deleted file mode 100644
index b22018c..0000000
--- a/app/views/dmptemplates/admin_index.html.erb
+++ /dev/null
@@ -1,153 +0,0 @@
-<%= stylesheet_link_tag "admin" %>
-
-<h1>
-	<%= t('org_admin.templates_label') %>
-</h1>
-<div class="div_clear"></div>
-<h2>
-	<%= t('org_admin.templates.own_temp') %>
-</h2>
-
-<div class="div_left">
-	<%= raw t('org_admin.templates.create_own_template_text_html')%>
-</div>
-<div class="div_right">
-	<!-- link button to add new guidance -->
-	<div class="move_2_right">
-		<%= link_to t("org_admin.templates.create_template"),
-		            admin_new_dmptemplate_path,
-		            :class => 'btn btn-primary' %>
-	</div>
-</div>
-<div class="div_clear"></div>
-
-<!-- List of own templates -->
-<% if @dmptemplates_own.count > 0 then %>
-	<table id="dmp_table" class="dmp_table tablesorter">
-		  <thead>
-		    <tr>
-		      	<th class="dmp_th_small"><%= t('org_admin.templates.title_label') %></th>
-		      	<th class="dmp_th_medium"><%= t('org_admin.templates.desc_label') %></th>
-		      	<th class="dmp_th_small"><%= t('org_admin.templates.published_label') %></th>
-		      	<th class="dmp_th_small"><%= t('org_admin.templates.last_updated') %></th>
-		      	<td class="dmp_th_small"><%= t('org_admin.templates.actions') %></td>
-		    </tr>
-		  </thead>
-		  <tbody>
-			<% @dmptemplates_own.each do |org_template| %>
-
-		  	<tr>
-	  			<td class="dmp_td_small">
-	  				<%= org_template.title%>
-	  			</td>
-		        <td class="dmp_td_medium">
-		        	<%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %>
-		        </td>
-		        <td class="dmp_td_small">
-			       	<%= org_template.published %>
-			    </td>
-			    <td class="dmp_td_small">
-		        	<% last_temp_updated = org_template.updated_at %>
-                                <% org_template.phases.each do |phase|%>
-                                    <% if phase.versions.any? then%>
-                                        <% phase.versions.each do |version| %>
-                                            <% if org_template.updated_at.to_date < version.updated_at.to_date then %>
-                                                 <% last_temp_updated = version.updated_at %>
-                                            <%end%>
-                                       <%end%>
-                                    <%end%>
-                                <%end%>
-                                <%= l last_temp_updated.to_date, :formats => :short %>
-		        </td>
-		        <td class="dmp_td_small">
-		        	<%if current_user.can_org_admin? then%>
-						<% b_label = t('helpers.submit.edit')%>
-					<%else%>
-						<% b_label = t('helpers.view')%>
-					<%end%>
-					<%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%>
-		       	</td>
-		     </tr>
-	    	<%end%>
-		  </tbody>
-		</table>
-
-<%end%>
-
-<br/>
-<div class="div_clear"></div>
-
-<!-- display this only if the organisation is not a funder-->
-<% if current_user.org_type != constant("organisation_types.funder") then %>
-    <h2 class="float-left">
-        <%= t("org_admin.templates.funders_temp") %>
-    </h2>
-
-    <!-- List of funders templates -->
-    <% if @dmptemplates_funders.count > 0 then %>
-
-        <table id="dmp_table_2" class="dmp_table tablesorter">
-            <thead>
-                <tr>
-                    <th class="dmp_th_small"><%= t('org_admin.templates.title_label') %></th>
-                    <th class="dmp_th_medium"><%= t('org_admin.templates.desc_label') %></th>
-                    <th class="dmp_th_small"><%= t('org_admin.templates.published_label') %></th>
-                    <th class="dmp_th_small"><%= t('org_admin.templates.last_updated') %></th>
-                    <td class="dmp_th_small"><%= t('org_admin.templates.actions') %></td>
-                </tr>
-            </thead>
-            <tbody>
-
-                <% @dmptemplates_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">
-                                <%= org_template.title%>
-                            </td>
-                            <td class="dmp_td_medium">
-                                <%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %>
-                            </td>
-                            <td class="dmp_td_small">
-                                <%if org_template.published? then %>
-                                    <%= org_template.published%>
-                                <%else%>
-                                    <%= t("helpers.false_lowercase")%>
-                                <%end%>
-                            </td>
-                            <td class="dmp_td_small">
-                                <% last_updated = org_template.updated_at %>
-                                <% org_template.phases.each do |phase|%>
-                                    <% if phase.versions.any? then%>
-                                        <% phase.versions.each do |version| %>
-                                            <% if org_template.updated_at.to_date < version.updated_at.to_date then %>
-                                                 <% last_updated = version.updated_at %>
-                                            <%end%>
-                                       <%end%>
-                                    <%end%>
-                                <%end%>
-                                <%= l last_updated.to_date, :formats => :short %>
-
-                            </td>
-                            <td class="dmp_td_small">
-                                <%if current_user.can_org_admin? then%>
-                                    <% if org_template.org_type == constant("organisation_types.funder") then %>
-                                        <%if org_template.has_customisations?(current_user.organisation_id, org_template) then%>
-                                            <% b_label = t("org_admin.templates.edit_customisation")%>
-                                        <%else%>
-                                            <% b_label = t("org_admin.templates.customise")%>
-                                        <%end%>
-                                    <%else%>
-                                        <% b_label = t("helpers.submit.edit")%>
-                                    <%end%>
-                                <%else%>
-                                    <% b_label = t("helpers.view")%>
-                                <%end%>
-                                <%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%>
-                            </td>
-                        </tr>
-                    <%end%>
-                <%end%>
-            </tbody>
-        </table>
-	<%end%>
-<%end%>
diff --git a/app/views/dmptemplates/admin_new.html.erb b/app/views/dmptemplates/admin_new.html.erb
deleted file mode 100644
index 798f855..0000000
--- a/app/views/dmptemplates/admin_new.html.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-<%= stylesheet_link_tag "admin" %>
-<% javascript "admin.js" %>
-
-<h1>
-	<%= t("org_admin.templates.new_label") %>
-	<!-- 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>            
-</h1>
-
-<div class="div_clear"></div>
-<div class="white_background blue_border">
-	<!-- body -->
-	<div class="dmp_details">
-		<%= raw t("org_admin.templates.create_new_template_text_html")%>
-		<br/>
-		<%= form_for :dmptemplate, :url => {:action => "admin_create"} do |f| %>
-			<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", "", 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.template_desc_help_text_html"))%>
-						</div>
-					</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_index_dmptemplate_path, :class => "btn cancel" %>
-			</div>
-			<br />
-		<%end%>
-	</div>
-</div>
-<%= tinymce :content_css => asset_path("application.css") %>							
\ No newline at end of file
diff --git a/app/views/dmptemplates/admin_phase.html.erb b/app/views/dmptemplates/admin_phase.html.erb
deleted file mode 100644
index b85927b..0000000
--- a/app/views/dmptemplates/admin_phase.html.erb
+++ /dev/null
@@ -1,82 +0,0 @@
-<%- model_class = Phase -%>
-<%= stylesheet_link_tag "admin" %>
-<% javascript 'admin.js' %>
-
-<%= tinymce :content_css => asset_path('application.css') %>
-
-<h1>
-	<%= @phase.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>
-</h1>
-
-<div class="div_clear"></div>
-
-<!-- render navigation tabs for the template-->
-<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @phase.dmptemplate, active: @phase.id} %>
-
-<!-- phase main container -->
-<div class="project-tabs-body">
-    <div class="accordion" id="sections-accordion">
-
-       	<!--phase details -->
-    	<div class="phase_details">
-    		<div class="phase_details_body">
-
-                <!-- display phase details-->
-    			<div id="show_phase_div">
-    				<%= render :partial => "show_phase", locals: {phase: @phase}%>
-    			</div>
-    			<% if @phase.dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
-	    			<div id="edit_phase_div" style="display: none">
-	    				<%= render :partial => "edit_phase", locals: {phase: @phase}%>
-	    			</div>
-
-	  				<!--display all versions and their status for that phase-->
-	    			<%= render :partial => "versions_table", locals: {phase: @phase}%>
-	    		<%end%>
-
-    			<!--display the more recent published version.  -->
-	    		<% if @edit == "false" || (@phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder")) then%>
-					<%= render :partial => 'show_version', locals: {version: @version}%>
-				<%elsif @edit == "true" || current_user.org_type ==  constant("organisation_types.funder") then %>
-					<%= render :partial => 'edit_version', locals: {version: @version, edit: @edit, phase: @phase} %>
-				<%end%>
-			</div>
-		</div>
-
-		<!-- sections, questions and guidance details-->
-		<% @sections.order("number ASC").each do |section| %>
-			<%if (@edit == "true" && section.organisation_id == current_user.organisation_id) ||
-            (@phase.dmptemplate.org_type == constant("organisation_types.funder") && section.organisation_id == current_user.organisation_id && current_user.org_type != constant("organisation_types.funder"))then%>
-				<%= render :partial => 'edit_section', locals: {section: section, edit: @edit, phase: @phase, version: @version} %>
-			<%elsif (section.organisation_id == @phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%>
-				<%= render :partial => 'show_section', locals: {section: section}%>
-			<%end%>
-		 <% end %>
-
-	</div>
-</div>
-
-
-	<!-- Add a new section if the version is not published-->
-	<% if !@version.published? || (@phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder"))then %>
-
-		<!-- add section block -->
-		<div id="add_section_block_div" style="display: none">
-			<%= render :partial => 'add_section', locals: {version: @version} %>
-		</div>
-
-		<!-- add section button-->
-		<div id="add_section_button_div">
-			<div class="div_right">
-				<%= link_to t('org_admin.add_section_label'),'#', :id => 'add_section_button', :class =>'btn btn-primary' %>
-			</div>
-		</div>
-	<%end%>
-
-
diff --git a/app/views/dmptemplates/admin_previewphase.html.erb b/app/views/dmptemplates/admin_previewphase.html.erb
deleted file mode 100644
index 12c2507..0000000
--- a/app/views/dmptemplates/admin_previewphase.html.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-<%- model_class = Phase -%>
-<%= stylesheet_link_tag "admin" %>
-
-<h1>
-	<%= @version.phase.dmptemplate.title %>
-	<!-- link button to add new guidance -->
-	<div class="move_2_right">
-        <%= link_to t("org_admin.templates.back_to_edit_phase_label"),
-		           admin_phase_dmptemplate_path(:id => @version.phase_id, :version_id => @version.id, :edit => "true"),
-		            :class => 'btn btn-primary' %>
-		<%= link_to t("org_admin.templates.view_all_templates"),
-		            admin_index_dmptemplate_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: @version.phase.dmptemplate, active: @version.phase_id} %>
-
-<!-- phase main container -->
-<div class="project-tabs-body">
-    <div class="accordion" id="sections-accordion">
-    	<% sections = @version.sections %>
-    	<% sections.order(:number).each do |section| %>
-            <%if (section.organisation_id == @version.phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%>
-						
-                <div class="accordion-group">
-                    <div class="accordion-heading">
-                        <a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-<%= section.id%>">
-                            <div class="accordion_heading_text">
-                                <%= section.title %>
-                            </div>	
-                            <!-- + or - icon-->
-                            <span class="icon-plus icon-white accordion-icon"> </span>
-                            
-                        </a>
-                    </div>
-                    <div id="collapse-<%= section.id%>" class="accordion-body collapse section-collapse">
-                        <div class="section_desc">
-                            <%= raw section.description %>
-                        </div>
-                        <div class="accordion-inner">	
-                            <% section.questions.order("number").each do |question| %>
-                                <% last_question_id = section.questions.order("number DESC").first.id%>
-                
-                                <!--question block-->
-                                <%= render :partial => 'preview_question', locals: {question: question}%>
-                
-                                <% if last_question_id == question.id then %>
-                                    <div class="two-column-clear"></div>
-                                <% else %>
-                                    <div class="two-column-clear question-divider"></div>
-                                <% end %>
-                
-                            <%end%>
-                        </div>
-                    </div>
-                </div>		
-            <%end%>
-    	<%end%>
-	</div>
-</div>	
\ No newline at end of file
diff --git a/app/views/dmptemplates/admin_template.html.erb b/app/views/dmptemplates/admin_template.html.erb
deleted file mode 100644
index 642fb15..0000000
--- a/app/views/dmptemplates/admin_template.html.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-<%= stylesheet_link_tag "admin" %>
-<% 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>
-</h1>
-
-<div class="div_clear"></div>
-
-<!-- render navigation tabs for the template-->
-<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, 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>
-
-<%= tinymce :content_css => asset_path('application.css') %>
diff --git a/app/views/dmptemplates/export.pdf.erb b/app/views/dmptemplates/export.pdf.erb
deleted file mode 100644
index 3726b39..0000000
--- a/app/views/dmptemplates/export.pdf.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>
-      <%= @template.title %>
-    </title>
-    <style>
-      html { font-family: <%= @formatting[:font_face].tr('"', '') -%>; font-size: <%= @formatting[:font_size] -%>pt; }
-        h1 { font-size: <%= @formatting[:font_size] + 2 -%>pt; font-face:bold; padding: 0;}
-        h2 { font-size: <%= @formatting[:font_size] + 1 -%>pt; font-face:bold; padding: 0; margin: 1em 0 0 0;}
-        h3 { font-size: <%= @formatting[:font_size] + 0 -%>pt; font-face:bold; padding: 0; margin: 1em 0 0 0;}
-        h2 + div.question > h3 { margin: 0; }
-        table, tr, td, th, tbody, thead, tfoot { page-break-inside: avoid !important; }
-        table { border-collapse: collapse; }
-        th, td { border: 1px solid black !important; padding: 2px; }
-        p { margin: 0.25em 0; }
-    </style>
-  </head>
-  <body>
-    <h1><%= @template.title %></h1>
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/views/templates/_add_guidance.html.erb b/app/views/templates/_add_guidance.html.erb
new file mode 100644
index 0000000..de49775
--- /dev/null
+++ b/app/views/templates/_add_guidance.html.erb
@@ -0,0 +1,93 @@
+<!--add guidance. question is passed as an argument-->
+<div class="dmp_details">
+    <%= form_for :guidance, :url => {:action => "admin_create"}, :html => {:id => "new_guidance_form"} do |f| %>
+        <table class="dmp_details_table guidance_table">
+                <tr>
+                    <td class="first"><%= t("org_admin.guidance.text_label") %></td>
+                    <td><div class="div_left_icon_g">
+                            <%= text_area_tag("guidance-text", "", class: "tinymce") %>
+                        </div>
+                        <div class="div_right_icon_g">
+                            <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_text_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.text_help_text_html"))%>
+                        </div>
+                        <div class="clearfix"></div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="first"><%= t("org_admin.guidance.by_theme_or_by_question") %></td>
+                    <td><div class="div_left_icon_g">
+                            <%= select_tag "g_options", options_for_select([[t("org_admin.guidance.by_themes_label"), 1],
+                            [t("org_admin.guidance.by_question_label"), 2]]) %>
+                        </div>
+                        <div class="div_right_icon_g">
+                            <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_apply_to_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.apply_to_help_text_html"))%>
+                        </div>
+                        <div class="clearfix"></div>
+
+                        <div class="guindance_by_theme" style="display:none;">
+                            <div class="div_left_icon_g">
+                                <%= f.collection_select(:theme_ids,
+                                Theme.all.order("title"),
+                                :id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
+                            </div>
+                            <div class="div_right_icon_g">
+                                <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_by_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.by_themes_help_text_html"))%>
+                            </div>
+                            <div class="clearfix"></div>
+
+                        </div>
+                     </td>
+                </tr>
+                <tr>
+                    <td class="first"><%= t("org_admin.guidance.published") %></td>
+                    <td><div class="div_left_icon_g">
+                            <%= f.check_box :published , :as => :check_boxes%>
+                        </div>
+                        <div class="div_right_icon_g">
+                            <!--%= link_to( image_tag("help_button.png"), "#", :class => "guidance_group_subset_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance_group.subset_option_help_text"))%-->
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="first"><%= t("org_admin.guidance.guidance_group_label") %></td>
+                    <td><div class="div_left_icon_g">
+                        <%= f.collection_select(:guidance_group_ids,
+                            GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order("name ASC"),
+                            :id, :name, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => false})%>
+                        </div>
+                        <div class="div_right_icon_g">
+                            <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_group_select_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.guidance_group_select_help_text_html"))%>
+                        </div>
+                        <div class="clearfix"></div>
+
+                    </td>
+                </tr>
+            </table>
+
+        <!-- submit buttons -->
+
+            <div class="move_2_right">
+                <a id="new_guidance_submit" data-toggle="modal" href="#new_guidance_alert_dialog" class="btn btn-primary"><%= t("helpers.submit.save")%></a>
+
+                <%= link_to t("helpers.submit.cancel"), :back, :class => "btn cancel" %>
+            </div>
+
+        <br />
+         <%= tinymce :content_css => asset_path("application.css") %>
+    <%end%>
+    </div>
+
+
+
+<!-- alert for guidance-->
+<div id="new_guidance_alert_dialog" data-container="body" data-backdrop="static" class="modal hide fade">
+	<div class="modal-header">
+		<h3><%= t('helpers.before_submitting_consider') %></h3>
+	</div>
+	<div class="modal-body">
+		<ul id="missing_fields_new_guidance"></ul>
+  	</div>
+	<div class="modal-footer">
+    	<a href="#" id="return_to_new_guidance" class="btn"><%= t('helpers.ok_label') %></a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/views/templates/_add_question.html.erb b/app/views/templates/_add_question.html.erb
new file mode 100644
index 0000000..1caf54c
--- /dev/null
+++ b/app/views/templates/_add_question.html.erb
@@ -0,0 +1,179 @@
+<!-- 
+**Project: DMPRoadmap
+**Description: This block displays adding a new question, its guidance, and options when multiple choice is selected
+in the admin interface.
+**Arguments transferred: an instance of 'section'  
+**Copyright: Digital Curation Centre and University of California Curation Center
+-->
+
+<% @new_question = Question.new %>
+<% @new_question.number = section.questions.count + 1 %>
+						
+
+<%= form_for @new_question, :url => {:action => "admin_createquestion"}, :html => {:id => "new_question_#{section.id}"} do |f| %>
+<%= f.hidden_field :section_id, :value => section.id %>
+<div class="question-div">
+	<table class="dmp_details_table phase">
+			<!--Question number -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.question_number_label")%></td>
+				<td><%= f.number_field :number, :in => 1..50, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.questions.number_help_text") %>
+				
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+			
+			<!--Question text -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.question_text_label")%></td>
+				<td><%= f.text_area :text, :rows => "5", :id => "new_question_text_#{section.id}" %>
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+			
+			<!-- Question format -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.answer_format_label")%></td>
+				<td><%= f.hidden_field :section_id, :value => section.id, :class => "section_id" %>
+					<div id="new-ques-format" class="ques_format">
+						<div class="div_left_icon">
+							<%= f.select :question_format_id, 
+								options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, QuestionFormat.find_by_title(t("helpers.text_area")).id), 
+								{},	:id => "new-select-format-#{section.id}"%>
+						</div>
+						<div class="div_right_icon">
+							<%= link_to( image_tag("help_button.png"), "#", :class => "question_format_popover", :rel => "popover", "data-html" => "true",  "data-content" => t("org_admin.questions.question_format_help_text_html"))%>
+						</div>
+						
+					</div>	
+					<div class="clearfix"></div>	
+					<!--display form to enter option from checkbox/radio button/ dropdown/ multi select box-->
+					<div id="new-options-<%= section.id%>" style="display:none;" class="ques_format_option">
+						<table class="options_table">
+							<thead>
+								<tr>
+									<th nowrap class="small"><%= t("org_admin.option_order_label")%></th>
+									<th nowrap class="medium"><%= t("org_admin.option_text_label")%></th>
+									<th nowrap class="small"><%= t("org_admin.option_default_label")%></th>
+									<th nowrap class="small"><%= link_to( image_tag("help_button.png"), "#", :class => "question_options_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_options_help_text_html"))%></th>	
+								</tr>
+							</thead>
+							<tbody class="options_tbody">
+								<% i = 0 %>
+								
+								<% 2.times {@new_question.options.build } %>
+                  <% @new_question.options.each do |options_q|%>
+                      <%= f.fields_for :options, options_q do |op|%>
+                          <% i = i + 1%>
+                          <% options_q.number = i %>
+                          <%= render "option_fields", :f => op %>
+											<%end%>
+									
+									<%end%>	
+								
+							</tbody>
+							
+						</table>
+
+						<a href="#" class="add-option"><%= t("org_admin.add_option_label") %></a>
+												
+												
+                        <div class="clearfix"></div>
+                        <!--display for selecting comment box when multiple choice is being used-->
+                        <%= f.check_box :option_comment_display, :as => :check_boxes%><%= f.label t("org_admin.questions.option_comment_display_checkbox"), :class => "checkbox inline"%>
+					</div>
+					<div class="clearfix"></div>	
+					<!--display for default value for text field label-->
+					<div id="new-default-text-field-<%= section.id%>" style="display:none;" class="ques_format">
+						<div>
+							<%= t("org_admin.questions.default_answer_label")%>
+						</div>
+					</div>
+					<div class="clearfix"></div>	
+					<!--display for default value for text area label -->
+					<div id="new-default-text-area-<%= section.id%>" style="display:none;" class="ques_format">
+						<div >
+							<%= t("org_admin.questions.default_answer_label")%>
+						</div>
+					</div>
+					<div class="clearfix"></div>	
+					<div id="new-default-value-field-<%= section.id%>" style="display:none;" class="ques_format">
+						<div class="div_left_icon">
+							<%= text_area_tag("new-question-default-value", "", class: "tinymce") %>
+						</div>
+						<div class="div_right_icon">
+							<%= link_to( image_tag("help_button.png"), "#", :class => "default_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.default_answer_help_text_html"))%>
+						</div>
+						
+					</div>	
+					<div class="add_space"></div>
+					<div class="clearfix"></div>	
+					<div class="border_bottom"></div>
+				</td>	
+			</tr>
+			
+			<!-- Suggested answer or Example-->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
+				<td><div class="div_left_icon">
+						<% suggested_answer = @new_question.suggested_answers.build %>
+						<%= f.fields_for :suggested_answers, suggested_answer do |s|%>
+							<%= s.hidden_field :organisation_id, :value => current_user.organisation.id %>
+							<ul>
+								<li><%= s.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
+								<li><%= s.text_area :text, :rows => 5 %></li>
+							</ul>
+						<%end%>
+					</div>
+					<div class="div_right_icon">
+						<%= link_to( image_tag("help_button.png"), "#", :class => "suggested_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.suggested_answer_help_text_html"))%>
+					</div>
+					<div class="clearfix"></div>			
+					<div class="border_bottom"></div>	
+					
+				</td>
+			</tr>
+			
+			<!-- Guidance for Question -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.guidance_label")%></td>
+				<td><div class="div_left_icon">
+						<%= text_area_tag("new-question-guidance", "", class: "tinymce") %>
+					</div>
+					<div class="div_right_icon">
+						<%= link_to( image_tag("help_button.png"), "#", :class => "question_guidance_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_guidance_help_text_html"))%>
+					</div>
+					<div class="clearfix"></div>			
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+			
+			<!-- Themes -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.themes_label")%></td>
+				<td><div class="div_left_icon">
+						<%= f.collection_select(:theme_ids,
+							Theme.all.order("title"),
+							:id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
+					</div>
+					<div class="div_right_icon">
+						<%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%>
+					</div>
+					
+					
+				</td>
+			</tr>
+		</table>	
+		<br />
+		
+		<!-- submit buttons -->
+		<div class="move_2_right">
+            <%= hidden_field_tag :section_id, section.id, :class => "section_id" %>
+			<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary new_question_save_button" %>
+            <%= hidden_field_tag :section_id, section.id, :class => "section_id_new" %>
+			<%= link_to t("helpers.submit.cancel"), '#', :class => "btn cancel cancel_add_new_question" %>
+		</div>
+	</div>	
+
+<%end%>
+
diff --git a/app/views/templates/_add_section.html.erb b/app/views/templates/_add_section.html.erb
new file mode 100644
index 0000000..b445c85
--- /dev/null
+++ b/app/views/templates/_add_section.html.erb
@@ -0,0 +1,54 @@
+<!-- add a section and one question. Version is passed as an argument-->
+
+<% @new_section = Section.new %>
+<% @new_section.number = version.sections.count + 1 %>
+						
+
+<%= form_for @new_section, :url => {:action => "admin_createsection"} do |f| %>
+	<%= f.hidden_field :version_id, :value => version.id %>
+	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+						
+	<div class="accordion-group">
+		<div class="accordion-heading">
+			<div class="accordion-toggle">
+				<div class="accordion_heading_text">
+                
+					<%= f.text_field :title, :as => :string, :class => "text_field", :placeholder => t("org_admin.templates.section_title_placeholder")%>
+				</div>	
+				<!-- + or - icon-->
+	            <span class="icon-minus icon-white accordion-icon"> </span>
+	       	</div> 	
+				
+		</div>
+		<div id="collapse-sec" class="accordion-body section-collapse in collapse">
+			<div class="accordion-inner">
+				<table class="dmp_details_table">
+					<tr>
+						<td class="first_template"><%= t("org_admin.templates.phase_order_label") %></td>
+						<td>
+                            <%= f.number_field :number, :in => 1..15, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.section_number_help_text") %></td>
+					</tr>
+					<tr>
+						<td class="first_template"><%= t("org_admin.templates.desc_label") %></td>
+						<td class="phase_table_last_column">
+							<div class="div_left_icon">
+								<%= text_area_tag("section-desc", "" , class: "tinymce") %>
+							</div>
+							<div class="div_right_icon">
+								<%= link_to( image_tag("help_button.png"), "#", :class => "section_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.section_desc_help_text_html"))%>
+							</div>
+						</td>
+					</tr>
+				</table>			
+				<!-- save buttons-->
+				<div class="move_2_right">
+					<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+					<%= link_to t("helpers.submit.cancel"), "#", :id => "", :class => "btn cancel" %>
+				</div>
+				<div class="two-column-clear"></div>
+			</div>
+		</div>
+	</div>	
+<%end%>	
+
+
diff --git a/app/views/templates/_add_suggested_answer.html.erb b/app/views/templates/_add_suggested_answer.html.erb
new file mode 100644
index 0000000..03e11b7
--- /dev/null
+++ b/app/views/templates/_add_suggested_answer.html.erb
@@ -0,0 +1,25 @@
+<!--add suggested answer. question is passed as an argument-->
+<%= form_for :suggested_answer, :url => {:action => "admin_createsuggestedanswer"} do |f| %>
+	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+	<%= f.hidden_field :question_id, :value => question.id %>
+	
+	<table class="dmp_details_table phase">
+		<tr>
+			<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
+			<td>
+				<ul>
+					<li><%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
+					<li><%= f.text_area :text, :rows => 5 %>
+					</li>
+				</ul>
+			</td>
+		</tr>
+	</table>	
+	<br/>
+		
+	<!-- submit buttons -->
+	<div class="move_2_right">
+		<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+		<%= link_to t("helpers.submit.cancel"), "#", :id => "cancel_suugested_answer", :class => "btn cancel" %>
+	</div>
+<%end%>
diff --git a/app/views/templates/_admin_nav_tabs.html.erb b/app/views/templates/_admin_nav_tabs.html.erb
new file mode 100644
index 0000000..49c3c20
--- /dev/null
+++ b/app/views/templates/_admin_nav_tabs.html.erb
@@ -0,0 +1,34 @@
+<!-- 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>
+    <!-- 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>
+    <% 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>
+    <%end%>
+	</ul>
+</div>
+
diff --git a/app/views/templates/_edit_guidance.html.erb b/app/views/templates/_edit_guidance.html.erb
new file mode 100644
index 0000000..8debbca
--- /dev/null
+++ b/app/views/templates/_edit_guidance.html.erb
@@ -0,0 +1,26 @@
+<!--edit suggested answer. question is passed as an argument-->
+<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
+	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+
+	<table class="dmp_details_table phase">
+		<tr>
+			<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
+			<td>
+				<ul>
+					<li><%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
+					<li><%= f.text_area :text, :rows => 5 %></li>
+				</ul>
+			</td>
+		</tr>
+	</table>
+	<br/>
+
+	<!-- submit buttons -->
+	<div class="move_2_right">
+		<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+		<%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
+			:confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
+		<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+		<%= link_to t("helpers.submit.cancel"), "#", :class => "btn cancel cancel_edit_suggested_answer" %>
+	</div>
+<%end%>
diff --git a/app/views/templates/_edit_phase.html.erb b/app/views/templates/_edit_phase.html.erb
new file mode 100644
index 0000000..1536a48
--- /dev/null
+++ b/app/views/templates/_edit_phase.html.erb
@@ -0,0 +1,45 @@
+<!-- edit/add a phase. Phase is passed as an argument-->
+
+<%= form_for(phase, :url => admin_updatephase_dmptemplate_path(phase), :html => { :method => :put}) do |f| %>
+		
+	<h3>
+		<%= t('org_admin.templates.phase_details_label')%>
+	</h3>
+	<div class="div_left">
+		<%= raw t('org_admin.templates.phase_details_text_html')%>
+	</div>
+	<br />
+	<div class="div_clear"></div>
+	
+	<table class="dmp_details_table phase">
+		<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.phase_title_help_text') %></td>
+		</tr>
+		<tr>
+			<td class="first_template"><%= t('org_admin.templates.phase_order_label') %></td>
+			<td><%= f.number_field :number, :in => 0..5, :class => "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.phase_number_help_text') %></td>
+		</tr>
+		<tr>
+			<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
+			<td class="phase_table_last_column">
+				<div class="div_left_icon">
+					<%= text_area_tag("phase-desc", phase.description, class: "tinymce") %>
+				</div>
+				<div class="div_right_icon">
+					<%= link_to( image_tag('help_button.png'), '#', :class => 'phase_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.phase_desc_help_text_html'))%>
+				</div>
+			</td>
+		</tr>
+	</table>
+	<div class="div_clear"></div>	
+	
+	<!-- submit buttons -->
+	<div class="move_2_right">
+		<%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+		<%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
+	</div>
+	
+<%end%>	
\ No newline at end of file
diff --git a/app/views/templates/_edit_question.html.erb b/app/views/templates/_edit_question.html.erb
new file mode 100644
index 0000000..ab12c02
--- /dev/null
+++ b/app/views/templates/_edit_question.html.erb
@@ -0,0 +1,174 @@
+<!--
+**Project: DMPRoadmap
+**Description: This block displays editing a question, its guidance, and options when multiple choice is selected
+in the admin interface.
+**Arguments transferred: an instance of 'question'
+**Copyright: Digital Curation Centre and University of California Curation Center
+-->
+
+<%= form_for(question, :url => admin_updatequestion_dmptemplate_path(question), :html => { :method => :put}) do |f| %>
+<div class="question-div">
+	<table class="dmp_details_table phase">
+			<!--Question number -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.question_number_label")%></td>
+				<td><%= f.number_field :number, :in => 1..50, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.questions.number_help_text") %>
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+
+			<!--Question text -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.question_text_label")%></td>
+				<td><%= f.text_area :text, :rows => "5" %>
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+
+			<!-- Question format -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.answer_format_label")%></td>
+				<td><div id="ques-<%= question.id %>-format" class="ques_format">
+						<div class="div_left_icon">
+							<%= f.hidden_field :id,{ :class => "quest_id" } %>
+							<%= f.select :question_format_id, 
+								options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, question.question_format_id), 
+								{},	:id => "#{question.id}-select-format"%>
+						</div>
+						<div class="div_right_icon">
+							<%= link_to( image_tag("help_button.png"), "#", :class => "question_format_popover", :rel => "popover", "data-html" => "true",  "data-content" => t("org_admin.questions.question_format_help_text_html"))%>
+						</div>
+
+					</div>
+
+					<!--display form to enter option from checkbox/radio button/ dropdown/ multi select box-->
+					<div id="options-<%= question.id %>" style="display:none;" class="ques_format_option">
+						<table class="options_table">
+							<thead>
+								<tr>
+									<th nowrap class="small"><%= t("org_admin.option_order_label")%></th>
+									<th nowrap class="medium"><%= t("org_admin.option_text_label")%></th>
+									<th nowrap class="small"><%= t("org_admin.option_default_label")%></th>
+									<th nowrap class="small"><%= link_to( image_tag("help_button.png"), "#", :class => "question_options_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_options_help_text_html"))%></th>	
+								</tr>
+							</thead>
+							<tbody class="options_tbody">
+								<% if question.options.count == 0 then %>
+									<% 2.times {question.options.build } %>
+
+								<%end%>
+                                <% i = 0 %>
+								<% question.options.to_a.sort_by{|op| op["number"]}.each do |options_q|%>
+									<%= f.fields_for :options, options_q do |op|%>
+                                        <% i = i + 1%>
+                                        <% options_q.number = i %>
+										<%= render "option_fields", :f => op %>
+   									<%end%>
+								<%end%>	
+								
+							</tbody>
+						</table>
+
+						<a href="#" class="add-option"><%= t("org_admin.add_option_label") %></a>
+
+                        <div class="clearfix"></div>
+                        <!--display for selecting comment box when multiple choice is being used-->
+                        <%= f.check_box :option_comment_display, :as => :check_boxes%><%= f.label t("org_admin.questions.option_comment_display_checkbox"), :class => "checkbox inline"%>
+					</div>
+					<div class="clearfix"></div>
+					<!--display for default value for text field label-->
+					<div id='default-text-field-<%= question.id %>' style="display:none;" class="ques_format">
+						<div>
+							<%= t("org_admin.questions.default_answer_label")%>
+						</div>
+					</div>
+					<div class="clearfix"></div>
+					<!--display for default value for text area label -->
+					<div id="default-text-area-<%= question.id %>" style="display:none;" class="ques_format">
+						<div >
+							<%= t("org_admin.questions.default_answer_label")%>
+						</div>
+					</div>
+					<div class="clearfix"></div>
+					<div id="default-value-field-<%= question.id %>" style="display:none;" class="ques_format">
+						<div class="div_left_icon">
+							<%= text_area_tag("question-default-value-#{question.id}", question.default_value, class: "tinymce") %>
+						</div>
+						<div class="div_right_icon">
+							<%= link_to( image_tag("help_button.png"), "#", :class => "default_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.default_answer_help_text_html"))%>
+						</div>
+					</div>
+					<div class="add_space"></div>
+					<div class="clearfix"></div>
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+
+			<!-- Suggested answer or Example-->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.suggested_or_example_answer_label")%></td>
+				<td><div class="div_left_icon">
+					<% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation.id) %>
+					<% if suggested_answer.nil? then %>
+						 <% suggested_answer = question.suggested_answers.build %>
+					<%end%>
+					<%= f.fields_for :suggested_answers, suggested_answer do |s|%>
+						<%= s.hidden_field :organisation_id, :value => current_user.organisation.id %>
+						<ul>
+							<li><%= s.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %></li>
+							<li><%= s.text_area :text, :rows => 5 %>
+							</li>
+						</ul>
+					<%end%>
+					</div>
+					<div class="div_right_icon">
+						<%= link_to( image_tag("help_button.png"), "#", :class => "suggested_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.suggested_answer_help_text_html"))%>
+					</div>
+					<div class="clearfix"></div>
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+			<!-- Guidance for Question -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.guidance_label")%></td>
+				<td><div class="div_left_icon">
+						<%= text_area_tag("question-guidance-#{question.id}", question.guidance , class: "tinymce") %>
+					</div>
+					<div class="div_right_icon">
+						<%= link_to( image_tag("help_button.png"), "#", :class => "question_guidance_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_guidance_help_text_html"))%>
+					</div>
+					<div class="clearfix"></div>
+					<div class="border_bottom"></div>
+				</td>
+			</tr>
+			<!-- Themes -->
+			<tr>
+				<td class="first_template"><%= t("org_admin.questions.themes_label")%></td>
+				<td><div class="div_left_icon">
+						<%= f.collection_select(:theme_ids,
+							Theme.all.order("title"),
+							:id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%>
+					</div>
+					<div class="div_right_icon">
+						<%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%>
+					</div>
+				</td>
+			</tr>
+		</table>
+		<br />
+		<!-- submit buttons -->
+		<div class="move_2_right">
+			<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+			<% if !question.section.version.published? then%>
+				<%= link_to t("helpers.submit.delete"), admin_destroyquestion_dmptemplate_path(:question_id => question.id),
+				:confirm => t("org_admin.questions.delete_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
+			<%end%>	
+			<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+			<%= link_to t("helpers.submit.cancel"), "#", :class => "btn cancel cancel_edit_question" %>
+		</div>
+	</div>	
+
+
+<!--guidance block -->
+<%= render :partial => "guidance_display", locals: {question: question}%>
+<%end%>
diff --git a/app/views/templates/_edit_section.html.erb b/app/views/templates/_edit_section.html.erb
new file mode 100644
index 0000000..8f7f8b4
--- /dev/null
+++ b/app/views/templates/_edit_section.html.erb
@@ -0,0 +1,116 @@
+<!-- 
+**Project: DMPRoadmap
+**Description: This block edits a section and its questions.
+**Arguments transferred: 'section'  
+**Copyright: Digital Curation Centre and University of California Curation Center
+-->
+
+
+<%= form_for(section, :url => admin_updatesection_dmptemplate_path(section, :phase => phase, :edit => edit), :html => { :method => :put}) do |s| %>
+	<%if @open && @section_id == section.id then%>
+			<% toggle = 'accordion-body  section-collapse in collapse'%>
+		<%else%>
+			<% toggle = 'accordion-body collapse section-collapse' %>
+		<%end%>
+
+     <%if @new_sec then%>
+        <% toggle = 'accordion-body  section-collapse in collapse'%>
+     <%end%>
+
+	<div class="accordion-group" >
+		<div class="accordion-heading">
+			<div class="div_left make_div_smaller">
+				<div class="accordion_heading_text">
+					<%= s.text_field :title, :as => :string, :class => 'text_field', :placeholder => t('org_admin.templates.section_title_placeholder') %>
+
+				</div>
+			</div>
+			<div class="div_right make_div_longer">
+				<a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-sec-<%= section.id %>">
+					<!-- + or - icon-->
+		        	<span class="icon-plus icon-white accordion-icon"> </span>
+		        </a>
+			</div>
+		</div>
+
+
+		<div id="collapse-sec-<%= section.id %>" class="<%= toggle %>" >
+			<div class="accordion-inner">
+				<table class="dmp_details_table">
+					<tr>
+						<td class="first_template"><%= t('org_admin.templates.phase_order_label') %></td>
+						<td><%= s.number_field :number, :in => 1..15, :class => "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.section_number_help_text') %></td>
+					</tr>
+					<tr>
+						<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
+						<td class="phase_table_last_column">
+							<div class="div_left_icon">
+								<%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %>
+							</div>
+							<div class="div_right_icon">
+								<%= link_to( image_tag('help_button.png'), '#', :class => 'section_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.section_desc_help_text_html'))%>
+							</div>
+						</td>
+					</tr>
+				</table>
+				<!-- save buttons-->
+				<div class="move_2_right">
+					<%= s.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+					<% if !section.version.published? || phase.dmptemplate.org_type == constant("organisation_types.funder") then%>
+						<%= link_to t("helpers.submit.delete"), admin_destroysection_dmptemplate_path(:section_id => section.id),
+						:confirm => t("org_admin.templates.section_delete_message", :section_title => section.title ), :method => :delete, :class => "btn btn-primary"%>
+					<%end%>
+					<%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %>
+				</div>
+			<%end%>
+				<div class="two-column-clear question-divider"></div>
+				<% @questions = section.questions.order("number")%>
+				<%if @questions.count > 0 %>
+					<% question_left = @questions.count %>
+					<% @questions.each do |question| %>
+                        <div class="question_guidance_block">
+                            <div id="show_question_div_<%= question.id%>" class="<%= if question.id == @question_id then "current_question" end %>">
+                                <!-- render the show question block-->
+                                <%= render :partial => 'show_question', locals: {question: question} %>
+                            </div>
+
+                            <div id="edit_question_div_<%= question.id%>"  style="display: none">
+                                <!-- render the edit question block-->
+                                <%= render :partial => 'edit_question', locals: {question: question} %>
+                            </div>
+                        </div>
+                        <!--verify how many questions are left -->
+                        <%if question_left.to_i > 1 then %>
+                            <div class="two-column-clear question-divider"></div>
+                        <%else%>
+                            <div class="two-column-clear"></div>
+                        <%end%>
+                        <% question_left = question_left - 1 %>
+
+					<%end%>
+				<%end%>
+
+				<!-- Add a new question if the version is not published-->
+				<% if !section.version.published? || phase.dmptemplate.org_type == constant("organisation_types.funder")  then%>
+
+					<%if @questions.count != 0 %>
+						<div class="two-column-clear question-divider"></div>
+					<%end%>
+					<!-- add question block -->
+					<div id="add_question_block_div_<%= section.id%>" style="display: none">
+						<%= render :partial => 'add_question', locals: {section: section} %>
+					</div>
+
+					<!-- add question button-->
+					<div id="add_question_button_div_<%= section.id%>">
+						<div class="div_left">
+							<%= hidden_field_tag :section_id, section.id, :class => "section_id" %>
+							<%= link_to t("org_admin.add_question_label"), '#', :class => "btn btn-primary add_question_button" %>
+						</div>
+					</div>
+				<%end%>
+
+				<div class="two-column-clear"></div>
+			</div>
+		</div>
+	</div>
diff --git a/app/views/templates/_edit_suggested_answer.html.erb b/app/views/templates/_edit_suggested_answer.html.erb
new file mode 100644
index 0000000..2f78934
--- /dev/null
+++ b/app/views/templates/_edit_suggested_answer.html.erb
@@ -0,0 +1,26 @@
+<!--edit suggested answer. question is passed as an argument-->
+<%= form_for(suggested_answer, :url => admin_updatesuggestedanswer_dmptemplate_path(suggested_answer), :html => { :method => :put}) do |f| %>
+	<%= f.hidden_field :organisation_id, :value => current_user.organisation.id %>
+
+	<table class="dmp_details_table phase">
+		<tr>
+			<td class="first_template"><%= t('org_admin.questions.suggested_or_example_answer_label')%></td>
+			<td>
+				<ul>
+					<li><%= f.select :is_example, {t('org_admin.questions.example_answer_label') => true, t('org_admin.questions.suggested_answer_label') => false} %></li>
+					<li><%= f.text_area :text, :rows => 5 %></li>
+				</ul>
+			</td>
+		</tr>
+	</table>
+	<br/>
+
+	<!-- submit buttons -->
+	<div class="move_2_right">
+		<%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+		<%= link_to t("helpers.submit.delete"), admin_destroysuggestedanswer_dmptemplate_path(:suggested_answer => suggested_answer.id),
+			:confirm => t("org_admin.questions.delete_suggested_answer_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
+		<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+		<%= link_to t('helpers.submit.cancel'), '#', :class => 'btn cancel cancel_edit_suggested_answer' %>
+	</div>
+<%end%>
diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
new file mode 100644
index 0000000..dbea10a
--- /dev/null
+++ b/app/views/templates/_edit_template.html.erb
@@ -0,0 +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 />
+	
+<%end%>
\ No newline at end of file
diff --git a/app/views/templates/_edit_version.html.erb b/app/views/templates/_edit_version.html.erb
new file mode 100644
index 0000000..416fdb7
--- /dev/null
+++ b/app/views/templates/_edit_version.html.erb
@@ -0,0 +1,47 @@
+<!-- edit version and its sections,questions and guidance. Version is passed as an argument-->
+
+<!-- version details-->
+<%= form_for(version, :url => admin_updateversion_dmptemplate_path(version, :edit => edit,  :phase => phase), :html => { :method => :put}) do |f| %>
+						
+	<h3>
+		<%= t('org_admin.templates.version_details_label')%>
+	</h3>
+	<div class="div_clear"></div>	
+		
+	<div class="phase_details_body">
+		<table class="dmp_details_table phase">
+			<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.phase_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("version-desc", version.description, class: "tinymce") %>
+					</div>
+					<div class="div_right_icon">
+						<%= link_to( image_tag('help_button.png'), '#', :class => 'version_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.versions.desc_help_text_html'))%>
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td class="first_template"><%= t('org_admin.templates.published_label') %></td>
+				<td><%= f.check_box :published, :as => :check_boxes %></td>
+
+			</tr>
+		</table>
+		
+		<div class="div_clear"></div>
+		
+		<div class="move_2_right">
+			<%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %>
+			<%= link_to t('helpers.submit.cancel'), admin_phase_dmptemplate_path(phase), :class => 'btn cancel' %>
+		</div>
+	</div>
+	
+<%end%>		
+
+
+			
\ No newline at end of file
diff --git a/app/views/templates/_guidance_display.html.erb b/app/views/templates/_guidance_display.html.erb
new file mode 100644
index 0000000..4082baf
--- /dev/null
+++ b/app/views/templates/_guidance_display.html.erb
@@ -0,0 +1,36 @@
+<!--this block displays all guidance related with the question. question is passed as an argument-->
+
+<div class="question-guidance">
+	<div class="accordion" id="<%= question.id %>-guidance">
+		<% if !question.guidance.nil? && question.guidance != "" then %>
+			<div class="accordion-group">
+				<div class="accordion-heading">
+					<a class="accordion-guidance-link" data-toggle="collapse" data-parent="#<%= question.id %>-guidance" href="#collapse-guidance-<%= question.id%>">
+						<div class="accordion_heading_text">
+						<%= question.section.organisation.abbreviation %> <%= t('helpers.guidance')%> 
+						</div>
+						<span class="plus-laranja"> </span></a>
+				</div>
+				<div id="collapse-guidance-<%= question.id%>" class="guidance-accordion-body collapse">
+					<div class="accordion-inner"><%= raw question.guidance %></div>
+				</div>
+			</div>
+		<% end %>
+		
+		<% question.guidance_for_question(question, current_user.organisation).each_pair do |title,guidance| %>
+			<div class="accordion-group">											
+				<div class="accordion-heading">
+					<a class="accordion-guidance-link" data-toggle="collapse" data-parent="#<%= question.id %>-guidance" href="#collapse-guidance-<%= guidance.id%>-<%= question.id %>">
+						<div class="accordion_heading_text">
+						<%= title%> 
+						</div>
+						<span class="plus-laranja"> </span></a>
+				</div>
+				<div id="collapse-guidance-<%= guidance.id%>-<%= question.id %>" class="guidance-accordion-body collapse">
+					<div class="accordion-inner"><%= raw guidance.text %></div>
+				</div>
+			</div>
+		<% end %>	
+	</div>
+    
+</div>		
\ No newline at end of file
diff --git a/app/views/templates/_option_fields.html.erb b/app/views/templates/_option_fields.html.erb
new file mode 100644
index 0000000..21f3e80
--- /dev/null
+++ b/app/views/templates/_option_fields.html.erb
@@ -0,0 +1,7 @@
+<!--Add options answers to a question-->
+<tr class="options_content">
+	<td class="small"><%= f.number_field :number,:in => 1..20, :class => "number_field option"%></td>
+	<td class="medium"><%= f.text_field :text, :as => :string, :class => "small_text_field" %></td>
+	<td class="small"><%= f.check_box :is_default %></td>	
+	<td class="small"><%= f.hidden_field :_destroy %><span class="remove-option"><%= t('org_admin.remove_option_label') %></span></td>																	
+</tr>
diff --git a/app/views/templates/_preview_question.html.erb b/app/views/templates/_preview_question.html.erb
new file mode 100644
index 0000000..fa75e30
--- /dev/null
+++ b/app/views/templates/_preview_question.html.erb
@@ -0,0 +1,124 @@
+<!-- preview a question and its guidance.  Question is passed as an argument-->
+
+<div class="question-div">
+	
+	<!--question format-->
+	<% q_format = question.question_format%>
+	<form action="">
+		<div class="question-form">
+			<!-- verify if the question has multiple choice -->
+			<% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%>
+				<% options = question.options.order("number") %>
+										
+				<!--checkbox display-->
+				<% if q_format.title == t("helpers.checkbox") then %>
+					<%if !options.nil? then %>
+						<fieldset class="choices">
+							<label class="text_colour"><%= raw question.text %></label>
+							<ol class="choices-group">
+								<% options.each do |op|%>
+									<li class="choice"><label ><input type="checkbox" ><%= raw op.text %></label></li>
+								<%end%>
+							</ol>
+						</fieldset>	
+					<%end%>
+				<!--multi select box display-->
+				<% elsif q_format.title == t("helpers.multi_select_box") then %>
+					<%if !options.nil? then %>
+						<label class="text_colour"><%= raw question.text %></label>
+						<select multiple="multiple">
+							<% options.each do |op|%>
+								<option><%= raw op.text %></option>
+							<%end%>
+						</select>
+					<%end%>
+				<!--Radio buttons display-->
+				<% elsif q_format.title == t("helpers.radio_buttons") then%>
+					<%if !options.nil? then %>
+						<fieldset class="choices">
+							<label class="text_colour"><%= raw question.text %></label>
+							<ol class="choices-group">
+								<% options.each do |op|%>
+									<li class="choice"><label ><input type="radio"><%= raw op.text %></label></li>
+								<%end%>
+							</ol>
+						</fieldset>	
+					<%end%>
+				<!--dropdown display-->
+				<% elsif q_format.title == t("helpers.dropdown") then%>
+					<%if !options.nil? then %>
+						<label class="text_colour" ><%= raw question.text %></label>
+						<select>
+							<% options.each do |op|%>
+								<option><%= raw op.text %></option>
+							<%end%>
+						</select>	
+					<%end%>
+				<% end %>
+				
+				<!--Suggested answer area-->
+				<% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %>
+				<% if !suggested_answer.nil? && suggested_answer.text != "" then %>
+					<div class="suggested-answer-div">
+						<span class="suggested-answer-intro">
+							<% if suggested_answer.is_example? then %>
+								<%= t("org_admin.questions.example_answer_label")%>
+							<%else%>
+								<%= t("org_admin.questions.suggested_answer_label")%>
+							<%end%>
+						</span>
+						<div class="suggested-answer-border">
+							<p class="suggested-answer">
+								<%= raw suggested_answer.text %>
+							</p>
+						</div>
+					</div>
+				<% end %>
+				<label ><%= t("helpers.comment")%></label>
+				<div class="clear"></div>
+				<textarea rows="4" style="width: 97%;"><%= question.default_value %></textarea>
+			<% else %>
+				<label class="text_colour"><%= raw question.text %></label>
+				<!--Suggested answer area-->
+				<% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %>
+				<% if !suggested_answer.nil? && suggested_answer.text != "" then %>
+					<div class="suggested-answer-div">
+						<span class="suggested-answer-intro">
+							<% if suggested_answer.is_example? then %>
+								<%= t("org_admin.questions.example_answer_label")%>
+							<%else%>
+								<%= t("org_admin.questions.suggested_answer_label")%>
+							<%end%>
+						</span>
+						<div class="suggested-answer-border">
+							<p class="suggested-answer">
+								<%= raw suggested_answer.text %>
+							</p>
+						</div>
+					</div>
+				<% end %>
+				
+			<% end %>
+			
+			
+			
+			<!--text field display-->
+			<% if q_format.title == t("helpers.text_field") then %>
+				<input type ="text" style="width: 97%;"/>
+			<!--text area display-->
+			<%elsif q_format.title == t("helpers.text_area") then%>
+				<textarea rows="4" style="width: 97%;" ><%= question.default_value[3..-5] unless question.default_value.nil? %></textarea>
+			<%end%>
+			<br/>
+			<!-- button without action-->
+			<%= link_to t("helpers.save"), "#", :class => "btn btn-primary", :onclick => "event.preventDefault();" %>
+			
+			<span class="label label-warning answer-status"><%= t("helpers.notanswered") %></span>
+	
+		</div>
+	</form>
+</div>	
+
+		
+<!--guidance block -->
+<%= render :partial => "guidance_display", locals: {question: question}%>
diff --git a/app/views/templates/_show_phase.html.erb b/app/views/templates/_show_phase.html.erb
new file mode 100644
index 0000000..01117cf
--- /dev/null
+++ b/app/views/templates/_show_phase.html.erb
@@ -0,0 +1,37 @@
+<!-- show phase details -->
+
+<h3>
+	<%= t('org_admin.templates.phase_details_label')%>
+
+	<!-- edit phase details button -->
+	<% if @phase.dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
+		<div class="move_2_right">
+			<%= link_to t("org_admin.templates.edit_phase_details_label"), '#', :class => "btn btn-primary", :id => "edit_phase_button"%>
+		</div>
+	<%end%>
+</h3>
+
+<%if @phase.dmptemplate.org_type != constant("organisation_types.funder") then%>
+	<div class="div_left">
+		<%= raw t('org_admin.templates.phase_details_text_html')%>
+	</div>
+<%end%>
+
+<br />
+<div class="div_clear"></div>
+
+<table class="dmp_details_table phase">
+	<tr>
+		<td class="first_template"><%= t('org_admin.templates.title_label') %></td>
+		<td><%= @phase.title %></td>
+	</tr>
+	<tr>
+		<td class="first_template"><%= t('org_admin.templates.phase_order_label') %></td>
+		<td><%= @phase.number %></td>
+	</tr>
+	<tr>
+		<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
+		<td class="phase_table_last_column"><%= raw @phase.description %></td>
+	</tr>
+</table>
+<div class="div_clear"></div>
diff --git a/app/views/templates/_show_phases_sections.html.erb b/app/views/templates/_show_phases_sections.html.erb
new file mode 100644
index 0000000..19c603a
--- /dev/null
+++ b/app/views/templates/_show_phases_sections.html.erb
@@ -0,0 +1,73 @@
+<!-- Display of phases, sections and it's questions. A phase is passed as an argument-->
+
+<div class="div_clear"></div>
+
+<div class="div_left admin_left_smaller">
+	<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-->
+
+        <%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" %>
+
+    </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 class="div_clear"></div>
diff --git a/app/views/templates/_show_question.html.erb b/app/views/templates/_show_question.html.erb
new file mode 100644
index 0000000..df79c2b
--- /dev/null
+++ b/app/views/templates/_show_question.html.erb
@@ -0,0 +1,153 @@
+<!-- 
+**Project: DMPRoadmap
+**Description: This block shows a question, its guidance, and options when multiple choice is selected.
+**Arguments transferred: 'question'  
+**Copyright: Digital Curation Centre and University of California Curation Center
+-->
+
+<div class="question-div">
+	<table class="dmp_details_table phase">
+		<!--Question number -->
+		<tr>
+			<td class="first_template"><%= t('org_admin.questions.question_number_label')%></td>
+			<td><%= question.number%></td>
+		</tr>
+
+		<!--Question text -->
+		<tr>
+			<td class="first_template"><%= t('org_admin.questions.question_text_label')%></td>
+			<td><%= raw question.text %>
+				</br>
+				<div class="answer-readonly">
+					<% q_format = question.question_format %>
+					<% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%>
+						<ul class='options'>
+						<% if question.options.is_a? Option then %>
+							<li>- <%= question.options.text %></li>
+						<% else %>
+							<% if !question.options.to_a.nil? then %>
+                                <% question.options.to_a.sort_by{|op| op['number']}.each do |o| %>
+                                    <li>- <%= o.text %></li>
+                                <%end%>
+							<% end %>
+						<% end %>
+						</ul>
+                    <% end %>
+				</div>
+			</td>
+		</tr>
+		<!--Default value -->
+		<%if q_format.title  == t("helpers.text_field") || q_format.title == t("helpers.text_area") then %>
+			<%if !question.default_value.nil? then %>
+				<tr>
+					<td class="first_template"><%= t('org_admin.questions.default_value_label')%></td>
+					<td><%= raw question.default_value %></td>
+				</tr>
+			<%end%>
+		<% end %>
+		<!-- Question format -->
+		<tr>
+			<td class="first_template"><%= t('org_admin.questions.answer_format_label')%></td>
+			<td><%= q_format.title %>
+                </br>
+                <% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%>
+                    <% if question.option_comment_display == true then%>
+                        <%= t("org_admin.questions.option_comment_display")%>
+                    <%else%>
+                        <%= t("org_admin.questions.option_comment_hide")%>
+                    <%end%>
+                <%end%> 
+                <div class="add_space"></div>
+            </td>
+		</tr>
+
+		<!-- Suggested answer or Example-->
+		<% if (question.section.version.phase.dmptemplate.org_type != constant("organisation_types.funder") && question.section.organisation_id == current_user.organisation_id ) then%>
+			<% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %>
+			<% if !suggested_answer.nil?  && suggested_answer.text != "" then %>
+				<tr>
+					<td class="first_template">
+						<% if suggested_answer.is_example? then %>
+							<%= t('org_admin.questions.example_answer_label')%>
+						<%else%>
+							<%= t('org_admin.questions.suggested_answer_label')%>
+						<%end%>
+					</td>
+					<td><%= raw suggested_answer.text %></td>
+				</tr>
+			<%end%>
+		<%end%>
+		<!-- Guidance linked to this question -->
+		<%if !question.guidance.nil? then %>
+			<tr>
+				<td class="first_template"><%= t('org_admin.questions.guidance_label')%></td>
+				<td><%= raw question.guidance %></td>
+			</tr>
+		<%end%>
+		<!-- Themes -->
+		<% themes_q = question.themes %>
+		<%if !themes_q.nil? then%>
+			<tr>
+				<td class="first_template"><%= t('org_admin.questions.themes_label')%></td>
+				<td><% i = 1%>
+					<% themes_q.each do |t|%>
+						<%= t.title %>
+						<% if themes_q.count > i then%>
+							,
+							<% i +=1 %>
+						<% end %>
+					<%end%>
+				</td>
+			</tr>
+		<%end%>
+	</table>
+	<br/>
+	<!-- Add suggested or example answers to a funders template-->
+	<% if (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id != current_user.organisation_id ) then%>
+		<% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %>
+		<% if !suggested_answer.nil?  && suggested_answer.text != "" then %>
+			<div id="show_suggested_answer_div_<%= question.id%>">
+				<%= render :partial => 'show_suggested_answer', locals: {suggested_answer: suggested_answer, question: question} %>
+			</div>
+			<div id="edit_suggested_answer_div_<%= question.id%>" style="display: none">
+				<%= render :partial => 'edit_suggested_answer', locals: {suggested_answer: suggested_answer, question: question} %>
+			</div>
+
+		<%end%>
+
+
+		<div id="add_suggested_answer_block_<%= question.id%>" style="display: none">
+			<%= render :partial => 'add_suggested_answer', locals: {question: question} %>
+		</div>
+
+
+	<%end%>
+
+	<br/>
+	<!-- edit question button-->
+	<%if (@edit == 'true'&& question.section.organisation_id == current_user.organisation_id) || (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id == current_user.organisation_id && current_user.org_type != constant("organisation_types.funder")) then%>
+		<div class="move_2_right">
+			<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+			<%= link_to t("org_admin.questions.question_edit_button"), '# ', :class => "btn btn-primary edit_question_button"%>
+            <% if !question.section.version.published? then%>
+				<%= link_to t("org_admin.questions.question_delete_button"), admin_destroyquestion_dmptemplate_path(:question_id => question.id),
+				:confirm => t("org_admin.questions.delete_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%>
+			<%end%>	
+		</div>
+	<%elsif  (@edit == 'false' && question.section.organisation_id != current_user.organisation_id )|| (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id != current_user.organisation_id ) then%>
+		<% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %>
+		<% if suggested_answer.nil? then %>
+			<div id="add_suggested_answer_button_<%= question.id%>">
+				<div class="move_2_right">
+					<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+					<%= link_to t("org_admin.questions.suggested_or_example_answer_button"), '# ', :class => "btn btn-primary add_suggested_answer_button"%>
+				</div>
+			</div>
+		<%end%>
+	<%end%>
+	<div class="div_clear"></div>
+</div>
+
+
+<!--guidance block -->
+<%= render :partial => 'guidance_display', locals: {question: question}%>
diff --git a/app/views/templates/_show_section.html.erb b/app/views/templates/_show_section.html.erb
new file mode 100644
index 0000000..1dbf719
--- /dev/null
+++ b/app/views/templates/_show_section.html.erb
@@ -0,0 +1,43 @@
+<!-- show a section and its questions and guidance. Section is passed as an argument-->
+<%if @open && @section_id == section.id then%>
+	<% toggle = 'accordion-body  section-collapse in collapse'%>
+<%else%>
+	<% toggle = 'accordion-body collapse section-collapse' %>
+<%end%>
+<div class="accordion-group">
+	<div class="accordion-heading">
+		<a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-<%= section.id%>">
+			<div class="accordion_heading_text">
+				<% if section.title == '' then%>
+					<%= t('org_admin.templates.new_section')%>
+				<%else%>
+					<%= section.title %>
+				<%end%>
+			</div>
+			<!-- + or - icon-->
+        	<span class="icon-plus icon-white accordion-icon"> </span>
+       	</a>
+    </div>
+	<div id="collapse-<%= section.id%>" class="<%= toggle %>">
+		<div class="section_desc">
+			<%= raw section.description %>
+		</div>
+		<div class="accordion-inner">
+			<% section.questions.order("number").each do |question| %>
+				<% last_question_id = section.questions.order("number DESC").first.id %>
+                
+                <div class="question_guidance_block">    
+                    <!--question block-->
+                    <%= render :partial => 'show_question', locals: {question: question}%>
+                </div>    
+
+				<% if last_question_id == question.id then %>
+					<div class="two-column-clear"></div>
+				<% else %>
+					<div class="two-column-clear question-divider"></div>
+				<% end %>
+
+			<%end%>
+		</div>
+	</div>
+</div>
diff --git a/app/views/templates/_show_suggested_answer.html.erb b/app/views/templates/_show_suggested_answer.html.erb
new file mode 100644
index 0000000..888dd45
--- /dev/null
+++ b/app/views/templates/_show_suggested_answer.html.erb
@@ -0,0 +1,19 @@
+<!--show suggested answer. suggested answer is passed as an argument-->
+<table class="dmp_details_table phase">
+	<tr>
+		<td class="first_template">
+			<% if suggested_answer.is_example? then %>
+				<%= t('org_admin.questions.example_answer_label')%>
+			<%else%>
+				<%= t('org_admin.questions.suggested_answer_label')%>
+			<%end%>
+		</td>
+		<td><%= raw suggested_answer.text %></td>
+	</tr>
+</table>
+<br/>
+
+<div class="move_2_right">
+	<%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
+	<%= link_to t("org_admin.questions.edit_suggested_answer_button"), '# ', :class => "btn btn-primary edit_form_for_suggested_answer"%>
+</div>
diff --git a/app/views/templates/_show_template.html.erb b/app/views/templates/_show_template.html.erb
new file mode 100644
index 0000000..7cfec9d
--- /dev/null
+++ b/app/views/templates/_show_template.html.erb
@@ -0,0 +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/>	
+
+<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>
+</table>
diff --git a/app/views/templates/_show_version.html.erb b/app/views/templates/_show_version.html.erb
new file mode 100644
index 0000000..3e1456e
--- /dev/null
+++ b/app/views/templates/_show_version.html.erb
@@ -0,0 +1,42 @@
+<!-- show version and its sections,questions and guidance-->
+
+<!-- version details-->
+<h3>
+	<%= t('org_admin.templates.version_details_label')%>
+</h3>
+<div class="div_clear"></div>		
+
+<table class="dmp_details_table phase">
+	<tr>
+		<td class="first_template"><%= t('org_admin.templates.title_label') %></td>
+		<td><%= version.title %></td>
+	</tr>
+	<% if version.description != "" then%>
+		<tr>
+			<td class="first_template"><%= t('org_admin.templates.desc_label') %></td>
+			<td><%= raw version.description %></td>
+		</tr>
+	<%end%>	
+	<tr>
+		<td class="first_template"><%= t('org_admin.templates.published_label') %></td>
+		<td><%= version.published %></td>
+	</tr>
+	<tr>
+		<td class="first_template"><%= t('org_admin.templates.created') %></td>
+		<td>
+			<%= l version.created_at.to_date, :formats => :short %>
+		</td>
+	</tr>
+	<tr>
+		<td class="first_template"><%= t('org_admin.templates.last_updated') %></td>
+		<td>
+			<%= l version.updated_at.to_date, :formats => :short %>
+		</td>
+	</tr>
+</table>
+<div class="div_clear"></div>
+
+
+
+
+
diff --git a/app/views/templates/_versions_table.html.erb b/app/views/templates/_versions_table.html.erb
new file mode 100644
index 0000000..e51dbfe
--- /dev/null
+++ b/app/views/templates/_versions_table.html.erb
@@ -0,0 +1,73 @@
+<%if !phase.versions.nil? then %>
+	<div class="versions_display_table">	
+		<h3><%= t('org_admin.templates.versions_label')%></h3>
+		<p>
+			<%= t('org_admin.versions.versions_text_html')%>
+		</p>
+		
+		<!--table displaying versions for this phase-->
+		<table class="dmp_table" id="dmp_table">
+			<thead>
+				<tr>
+					<th><%= t('org_admin.templates.title_label')%></th>
+					<th><%= t('org_admin.templates.published_label')%></th>
+					<th><%= t('org_admin.templates.created')%></th>
+					<th><%= t('org_admin.templates.last_updated') %></th>
+					<th><%= t('org_admin.templates.actions') %></th>
+				</tr>
+			</thead>
+			<tbody>
+				<% phase.versions.each do |v|%>
+					<!--Alert pop up block for version editing-->
+					<div id='version_edit_alert_<%= v.id%>' data-container="body" data-id="<%= v.id%>" data-backdrop='static' class='modal hide fade'>
+						<div class="modal-header">
+							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
+							<h3><%= t('org_admin.versions.edit_alert_label')%></h3>
+						</div>
+						<div class="modal-body">
+							<div><p><%= t('org_admin.versions.edit_alert_text')%></p></div>
+						</div>
+						<div class="modal-footer">
+						  	<%= link_to t('org_admin.versions.edit_versions_label'), admin_phase_dmptemplate_path( :version_id => v.id, :id => phase.id , :edit => 'true') , :id => "edit-version-confirmed", :class => "btn cancel" %>
+							<%= link_to t('org_admin.versions.clone_versions_label'), admin_cloneversion_dmptemplate_path( :version_id => v.id, :phase => phase ) , :id => "clone-version-confirmed", :class => "btn btn-primary" %>
+					  </div>
+					</div>
+					<tr>
+						<td class="dmp_td_no_border">
+							<%= v.title %>
+						</td>
+						<td class="dmp_td_border">
+							<%= v.published %>
+						</td>
+						<td class="dmp_td_border">
+							<%= l v.created_at.to_date, :formats => :short %>
+						</td>
+						<td class="dmp_td_border">
+							<%= l v.updated_at.to_date, :formats => :short %>
+						</td>  
+						<td class="dmp_td_border">
+							<%= link_to t("helpers.view"), admin_phase_dmptemplate_path( :version_id => v.id, :id => phase.id , :edit => 'false'), :class => "dmp_table_link"%>
+							<% if v.published? then%>
+								<a id="edit-version-button" data-toggle="modal" href="#version_edit_alert_<%= v.id%>" class="dmp_table_link " >
+									<%= t('org_admin.versions.edit_label')%>
+								</a>
+                                <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %>
+							<%else%>
+								<%= link_to t("org_admin.versions.edit_label"), admin_phase_dmptemplate_path(phase, :version_id => v.id, :edit => 'true'), :class => "dmp_table_link" %>
+                                <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %>
+								<%#= link_to t("helpers.submit.delete"), admin_destroyversion_dmptemplate_path(:version_id => v.id, :phase => phase , :edit => 'false'),
+								:confirm => t("org_admin.versions.delete_message", :version_title => v.title ), :method => :delete, :class => "dmp_table_link"%>
+							<%end%>		
+						</td>	
+					</tr>
+					
+					
+									
+				<%end%>
+			</tbody>
+		</table>
+	</div>
+
+
+
+<%end%>
diff --git a/app/views/templates/admin_addphase.html.erb b/app/views/templates/admin_addphase.html.erb
new file mode 100644
index 0000000..6e8a336
--- /dev/null
+++ b/app/views/templates/admin_addphase.html.erb
@@ -0,0 +1,75 @@
+<%- model_class = Phase -%>
+<%= stylesheet_link_tag "admin" %>
+<% 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>            
+</h1>
+
+<div class="div_clear"></div>
+
+<!-- render navigation tabs for the template-->
+<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, active: "add_plan"} %>
+
+<!-- phase main container -->
+<div class="project-tabs-body">
+    <div class="accordion" id="sections-accordion">
+    	
+    	<!--phase details -->
+    	<div class="phase_details">
+    		<div class="phase_details_body">
+    			
+    			<!-- add phase details -->
+    			<%= form_for :phase, :url => { :action => "admin_createphase"} do |f| %>
+					<h3>
+						<%= t("org_admin.templates.phase_details_label")%>
+					</h3>
+					<%= raw t("org_admin.templates.phase_new_text_html")%>
+					<br/>
+					<div class="div_clear"></div>
+					<%= f.hidden_field :dmptemplate_id, :value => @dmptemplate.id%>
+					<table class="dmp_details_table phase">
+						<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.phase_title_help_text") %></td>
+						</tr>
+						<tr>
+							<td class="first_template"><%= t("org_admin.templates.phase_order_label") %></td>
+							<td><%= f.number_field :number, :in => 1..5, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.phase_number_help_text") %></td>
+						</tr>
+						<tr>
+							<td class="first_template"><%= t("org_admin.templates.desc_label") %></td>
+							<td class="phase_table_last_column">
+								<div class="div_left_icon">
+									<%= text_area_tag("phase-desc","" , class: "tinymce") %>
+								</div>
+								<div class="div_right_icon">
+									<%= link_to( image_tag("help_button.png"), "#", :class => "phase_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.phase_desc_help_text_html"))%>
+								</div>
+								<div class="clearfix"></div>
+							</td>
+						</tr>
+					</table>
+					<div class="div_clear"></div>	
+					
+					<!-- submit buttons -->
+					<div class="move_2_right">
+						<%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %>
+						<%= link_to t("helpers.submit.cancel"), admin_dmptemplate_path(@dmptemplate), :class => "btn cancel" %>
+					</div>
+	
+				<%end%>	
+   			</div>
+		</div>  				
+	</div>	
+</div>
+		    	    
+<%= tinymce :content_css => asset_path("application.css") %>
\ No newline at end of file
diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb
new file mode 100644
index 0000000..b22018c
--- /dev/null
+++ b/app/views/templates/admin_index.html.erb
@@ -0,0 +1,153 @@
+<%= stylesheet_link_tag "admin" %>
+
+<h1>
+	<%= t('org_admin.templates_label') %>
+</h1>
+<div class="div_clear"></div>
+<h2>
+	<%= t('org_admin.templates.own_temp') %>
+</h2>
+
+<div class="div_left">
+	<%= raw t('org_admin.templates.create_own_template_text_html')%>
+</div>
+<div class="div_right">
+	<!-- link button to add new guidance -->
+	<div class="move_2_right">
+		<%= link_to t("org_admin.templates.create_template"),
+		            admin_new_dmptemplate_path,
+		            :class => 'btn btn-primary' %>
+	</div>
+</div>
+<div class="div_clear"></div>
+
+<!-- List of own templates -->
+<% if @dmptemplates_own.count > 0 then %>
+	<table id="dmp_table" class="dmp_table tablesorter">
+		  <thead>
+		    <tr>
+		      	<th class="dmp_th_small"><%= t('org_admin.templates.title_label') %></th>
+		      	<th class="dmp_th_medium"><%= t('org_admin.templates.desc_label') %></th>
+		      	<th class="dmp_th_small"><%= t('org_admin.templates.published_label') %></th>
+		      	<th class="dmp_th_small"><%= t('org_admin.templates.last_updated') %></th>
+		      	<td class="dmp_th_small"><%= t('org_admin.templates.actions') %></td>
+		    </tr>
+		  </thead>
+		  <tbody>
+			<% @dmptemplates_own.each do |org_template| %>
+
+		  	<tr>
+	  			<td class="dmp_td_small">
+	  				<%= org_template.title%>
+	  			</td>
+		        <td class="dmp_td_medium">
+		        	<%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %>
+		        </td>
+		        <td class="dmp_td_small">
+			       	<%= org_template.published %>
+			    </td>
+			    <td class="dmp_td_small">
+		        	<% last_temp_updated = org_template.updated_at %>
+                                <% org_template.phases.each do |phase|%>
+                                    <% if phase.versions.any? then%>
+                                        <% phase.versions.each do |version| %>
+                                            <% if org_template.updated_at.to_date < version.updated_at.to_date then %>
+                                                 <% last_temp_updated = version.updated_at %>
+                                            <%end%>
+                                       <%end%>
+                                    <%end%>
+                                <%end%>
+                                <%= l last_temp_updated.to_date, :formats => :short %>
+		        </td>
+		        <td class="dmp_td_small">
+		        	<%if current_user.can_org_admin? then%>
+						<% b_label = t('helpers.submit.edit')%>
+					<%else%>
+						<% b_label = t('helpers.view')%>
+					<%end%>
+					<%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%>
+		       	</td>
+		     </tr>
+	    	<%end%>
+		  </tbody>
+		</table>
+
+<%end%>
+
+<br/>
+<div class="div_clear"></div>
+
+<!-- display this only if the organisation is not a funder-->
+<% if current_user.org_type != constant("organisation_types.funder") then %>
+    <h2 class="float-left">
+        <%= t("org_admin.templates.funders_temp") %>
+    </h2>
+
+    <!-- List of funders templates -->
+    <% if @dmptemplates_funders.count > 0 then %>
+
+        <table id="dmp_table_2" class="dmp_table tablesorter">
+            <thead>
+                <tr>
+                    <th class="dmp_th_small"><%= t('org_admin.templates.title_label') %></th>
+                    <th class="dmp_th_medium"><%= t('org_admin.templates.desc_label') %></th>
+                    <th class="dmp_th_small"><%= t('org_admin.templates.published_label') %></th>
+                    <th class="dmp_th_small"><%= t('org_admin.templates.last_updated') %></th>
+                    <td class="dmp_th_small"><%= t('org_admin.templates.actions') %></td>
+                </tr>
+            </thead>
+            <tbody>
+
+                <% @dmptemplates_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">
+                                <%= org_template.title%>
+                            </td>
+                            <td class="dmp_td_medium">
+                                <%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %>
+                            </td>
+                            <td class="dmp_td_small">
+                                <%if org_template.published? then %>
+                                    <%= org_template.published%>
+                                <%else%>
+                                    <%= t("helpers.false_lowercase")%>
+                                <%end%>
+                            </td>
+                            <td class="dmp_td_small">
+                                <% last_updated = org_template.updated_at %>
+                                <% org_template.phases.each do |phase|%>
+                                    <% if phase.versions.any? then%>
+                                        <% phase.versions.each do |version| %>
+                                            <% if org_template.updated_at.to_date < version.updated_at.to_date then %>
+                                                 <% last_updated = version.updated_at %>
+                                            <%end%>
+                                       <%end%>
+                                    <%end%>
+                                <%end%>
+                                <%= l last_updated.to_date, :formats => :short %>
+
+                            </td>
+                            <td class="dmp_td_small">
+                                <%if current_user.can_org_admin? then%>
+                                    <% if org_template.org_type == constant("organisation_types.funder") then %>
+                                        <%if org_template.has_customisations?(current_user.organisation_id, org_template) then%>
+                                            <% b_label = t("org_admin.templates.edit_customisation")%>
+                                        <%else%>
+                                            <% b_label = t("org_admin.templates.customise")%>
+                                        <%end%>
+                                    <%else%>
+                                        <% b_label = t("helpers.submit.edit")%>
+                                    <%end%>
+                                <%else%>
+                                    <% b_label = t("helpers.view")%>
+                                <%end%>
+                                <%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%>
+                            </td>
+                        </tr>
+                    <%end%>
+                <%end%>
+            </tbody>
+        </table>
+	<%end%>
+<%end%>
diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb
new file mode 100644
index 0000000..798f855
--- /dev/null
+++ b/app/views/templates/admin_new.html.erb
@@ -0,0 +1,48 @@
+<%= stylesheet_link_tag "admin" %>
+<% javascript "admin.js" %>
+
+<h1>
+	<%= t("org_admin.templates.new_label") %>
+	<!-- 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>            
+</h1>
+
+<div class="div_clear"></div>
+<div class="white_background blue_border">
+	<!-- body -->
+	<div class="dmp_details">
+		<%= raw t("org_admin.templates.create_new_template_text_html")%>
+		<br/>
+		<%= form_for :dmptemplate, :url => {:action => "admin_create"} do |f| %>
+			<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", "", 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.template_desc_help_text_html"))%>
+						</div>
+					</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_index_dmptemplate_path, :class => "btn cancel" %>
+			</div>
+			<br />
+		<%end%>
+	</div>
+</div>
+<%= tinymce :content_css => asset_path("application.css") %>							
\ No newline at end of file
diff --git a/app/views/templates/admin_phase.html.erb b/app/views/templates/admin_phase.html.erb
new file mode 100644
index 0000000..b85927b
--- /dev/null
+++ b/app/views/templates/admin_phase.html.erb
@@ -0,0 +1,82 @@
+<%- model_class = Phase -%>
+<%= stylesheet_link_tag "admin" %>
+<% javascript 'admin.js' %>
+
+<%= tinymce :content_css => asset_path('application.css') %>
+
+<h1>
+	<%= @phase.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>
+</h1>
+
+<div class="div_clear"></div>
+
+<!-- render navigation tabs for the template-->
+<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @phase.dmptemplate, active: @phase.id} %>
+
+<!-- phase main container -->
+<div class="project-tabs-body">
+    <div class="accordion" id="sections-accordion">
+
+       	<!--phase details -->
+    	<div class="phase_details">
+    		<div class="phase_details_body">
+
+                <!-- display phase details-->
+    			<div id="show_phase_div">
+    				<%= render :partial => "show_phase", locals: {phase: @phase}%>
+    			</div>
+    			<% if @phase.dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
+	    			<div id="edit_phase_div" style="display: none">
+	    				<%= render :partial => "edit_phase", locals: {phase: @phase}%>
+	    			</div>
+
+	  				<!--display all versions and their status for that phase-->
+	    			<%= render :partial => "versions_table", locals: {phase: @phase}%>
+	    		<%end%>
+
+    			<!--display the more recent published version.  -->
+	    		<% if @edit == "false" || (@phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder")) then%>
+					<%= render :partial => 'show_version', locals: {version: @version}%>
+				<%elsif @edit == "true" || current_user.org_type ==  constant("organisation_types.funder") then %>
+					<%= render :partial => 'edit_version', locals: {version: @version, edit: @edit, phase: @phase} %>
+				<%end%>
+			</div>
+		</div>
+
+		<!-- sections, questions and guidance details-->
+		<% @sections.order("number ASC").each do |section| %>
+			<%if (@edit == "true" && section.organisation_id == current_user.organisation_id) ||
+            (@phase.dmptemplate.org_type == constant("organisation_types.funder") && section.organisation_id == current_user.organisation_id && current_user.org_type != constant("organisation_types.funder"))then%>
+				<%= render :partial => 'edit_section', locals: {section: section, edit: @edit, phase: @phase, version: @version} %>
+			<%elsif (section.organisation_id == @phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%>
+				<%= render :partial => 'show_section', locals: {section: section}%>
+			<%end%>
+		 <% end %>
+
+	</div>
+</div>
+
+
+	<!-- Add a new section if the version is not published-->
+	<% if !@version.published? || (@phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder"))then %>
+
+		<!-- add section block -->
+		<div id="add_section_block_div" style="display: none">
+			<%= render :partial => 'add_section', locals: {version: @version} %>
+		</div>
+
+		<!-- add section button-->
+		<div id="add_section_button_div">
+			<div class="div_right">
+				<%= link_to t('org_admin.add_section_label'),'#', :id => 'add_section_button', :class =>'btn btn-primary' %>
+			</div>
+		</div>
+	<%end%>
+
+
diff --git a/app/views/templates/admin_previewphase.html.erb b/app/views/templates/admin_previewphase.html.erb
new file mode 100644
index 0000000..12c2507
--- /dev/null
+++ b/app/views/templates/admin_previewphase.html.erb
@@ -0,0 +1,64 @@
+<%- model_class = Phase -%>
+<%= stylesheet_link_tag "admin" %>
+
+<h1>
+	<%= @version.phase.dmptemplate.title %>
+	<!-- link button to add new guidance -->
+	<div class="move_2_right">
+        <%= link_to t("org_admin.templates.back_to_edit_phase_label"),
+		           admin_phase_dmptemplate_path(:id => @version.phase_id, :version_id => @version.id, :edit => "true"),
+		            :class => 'btn btn-primary' %>
+		<%= link_to t("org_admin.templates.view_all_templates"),
+		            admin_index_dmptemplate_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: @version.phase.dmptemplate, active: @version.phase_id} %>
+
+<!-- phase main container -->
+<div class="project-tabs-body">
+    <div class="accordion" id="sections-accordion">
+    	<% sections = @version.sections %>
+    	<% sections.order(:number).each do |section| %>
+            <%if (section.organisation_id == @version.phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%>
+						
+                <div class="accordion-group">
+                    <div class="accordion-heading">
+                        <a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-<%= section.id%>">
+                            <div class="accordion_heading_text">
+                                <%= section.title %>
+                            </div>	
+                            <!-- + or - icon-->
+                            <span class="icon-plus icon-white accordion-icon"> </span>
+                            
+                        </a>
+                    </div>
+                    <div id="collapse-<%= section.id%>" class="accordion-body collapse section-collapse">
+                        <div class="section_desc">
+                            <%= raw section.description %>
+                        </div>
+                        <div class="accordion-inner">	
+                            <% section.questions.order("number").each do |question| %>
+                                <% last_question_id = section.questions.order("number DESC").first.id%>
+                
+                                <!--question block-->
+                                <%= render :partial => 'preview_question', locals: {question: question}%>
+                
+                                <% if last_question_id == question.id then %>
+                                    <div class="two-column-clear"></div>
+                                <% else %>
+                                    <div class="two-column-clear question-divider"></div>
+                                <% end %>
+                
+                            <%end%>
+                        </div>
+                    </div>
+                </div>		
+            <%end%>
+    	<%end%>
+	</div>
+</div>	
\ No newline at end of file
diff --git a/app/views/templates/admin_template.html.erb b/app/views/templates/admin_template.html.erb
new file mode 100644
index 0000000..642fb15
--- /dev/null
+++ b/app/views/templates/admin_template.html.erb
@@ -0,0 +1,61 @@
+<%= stylesheet_link_tag "admin" %>
+<% 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>
+</h1>
+
+<div class="div_clear"></div>
+
+<!-- render navigation tabs for the template-->
+<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, 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>
+
+<%= tinymce :content_css => asset_path('application.css') %>
diff --git a/app/views/templates/export.pdf.erb b/app/views/templates/export.pdf.erb
new file mode 100644
index 0000000..3726b39
--- /dev/null
+++ b/app/views/templates/export.pdf.erb
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <title>
+      <%= @template.title %>
+    </title>
+    <style>
+      html { font-family: <%= @formatting[:font_face].tr('"', '') -%>; font-size: <%= @formatting[:font_size] -%>pt; }
+        h1 { font-size: <%= @formatting[:font_size] + 2 -%>pt; font-face:bold; padding: 0;}
+        h2 { font-size: <%= @formatting[:font_size] + 1 -%>pt; font-face:bold; padding: 0; margin: 1em 0 0 0;}
+        h3 { font-size: <%= @formatting[:font_size] + 0 -%>pt; font-face:bold; padding: 0; margin: 1em 0 0 0;}
+        h2 + div.question > h3 { margin: 0; }
+        table, tr, td, th, tbody, thead, tfoot { page-break-inside: avoid !important; }
+        table { border-collapse: collapse; }
+        th, td { border: 1px solid black !important; padding: 2px; }
+        p { margin: 0.25em 0; }
+    </style>
+  </head>
+  <body>
+    <h1><%= @template.title %></h1>
+  </body>
+</html>
\ No newline at end of file