diff --git a/app/controllers/phases_controller.rb b/app/controllers/phases_controller.rb
index b65f33f..fa8aa75 100644
--- a/app/controllers/phases_controller.rb
+++ b/app/controllers/phases_controller.rb
@@ -9,10 +9,10 @@
   CHECKBOX = QuestionFormat.where(title: "Check box").first.id
   DROPDOWN = QuestionFormat.where(title: "Dropdown").first.id
   MULTI = QuestionFormat.where(title: "Multi select box").first.id
-  
+
 	# GET /plans/PLANID/phases/PHASEID/edit
 	def edit
-    
+
     @textarea = TEXTAREA
     @textfield = TEXTFIELD
     @radio = RADIO
@@ -36,8 +36,8 @@
 		end
 
 	end
-  
-  
+
+
 	# GET /plans/PLANID/phases/PHASEID/status.json
   def status
     @plan = Plan.find(params[:plan_id])
@@ -52,4 +52,88 @@
   end
 
 
+
+  #show and edit a phase of the template
+  def admin_show
+    @phase = Phase.find(params[:id])
+    authorize @phase
+    @edit = params[:edit] == "true" ? true : false
+        #verify if there are any sections if not create one
+    @sections = @phase.sections
+    if !@sections.any?() || @sections.count == 0
+      @section = @phase.sections.build
+      @section.phase = @phase
+      @section.title = ''
+      @section.number = 1
+      @section.published = true
+      @section.modifiable = 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)
+      @open = true
+      @section_id = params[:section_id].to_i
+    end
+    if params.has_key?(:question_id)
+      @question_id = params[:question_id].to_i
+    end
+  end
+
+
+  #preview a phase
+  def admin_preview
+    @phase = Phase.find(params[:id])
+    authorize @phase
+    @template = @phase.template
+  end
+
+
+  #add a new phase to a passed template
+  def admin_add
+    @template = Template.find(params[:id])
+    @phase = Phase.new
+    phase.template = @template
+    authorize @phase
+    @phase.number = @template.phases.count + 1
+  end
+
+
+  #create a phase
+  def admin_create
+    @phase = Phase.new(params[:phase])
+    authorize @phase
+    @phase.description = params["phase-desc"]
+    @phase.modifiable = true
+    if @phase.save
+      redirect_to admin_show_phase_path(id: @phase.id, edit: 'true'), notice: I18n.t('org_admin.templates.created_message')
+    else
+      render action: "admin_show"
+    end
+  end
+
+
+  #update a phase of a template
+  def admin_update
+    @phase = Phase.find(params[:id])
+    authorize @phase
+    @phase.description = params["phase-desc"]
+    if @phase.update_attributes(params[:phase])
+      redirect_to admin_show_phase_path(@phase), notice: I18n.t('org_admin.templates.updated_message')
+    else
+      render action: "admin_show"
+    end
+  end
+
+  #delete a phase
+  def admin_destroy
+    @phase = Phase.find(params[:phase_id])
+    authorize @phase
+    @template = @phase.template
+    @phase.destroy
+    redirect_to admin_template_template_path(@template), notice: I18n.t('org_admin.templates.destroyed_message')
+  end
+
+
+
 end
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
new file mode 100644
index 0000000..d150bff
--- /dev/null
+++ b/app/controllers/questions_controller.rb
@@ -0,0 +1,43 @@
+class QuestionsController < ApplicationController
+  respond_to :html
+  after_action :verify_authorized
+
+  #create a question
+  def admin_create
+    @question = Question.new(params[:question])
+    authorize @question
+    @question.guidance = params["new-question-guidance"]
+    @question.default_value = params["new-question-default-value"]
+    if @question.save!
+      redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: I18n.t('org_admin.templates.created_message')
+    else
+      render action: "phases/admin_show"
+    end
+  end
+
+  #update a question of a template
+  def admin_update
+    @question = Question.find(params[:id])
+    authorize @question
+    @question.guidance = params["question-guidance-#{params[:id]}"]
+    @question.default_value = params["question-default-value-#{params[:id]}"]
+    @section = @question.section
+    @phase = @section.phase
+    if @question.update_attributes(params[:question])
+      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: I18n.t('org_admin.templates.updated_message')
+    else
+      render action: "phases/admin_show"
+    end
+  end
+
+  #delete question
+  def admin_destroy
+    @question = Question.find(params[:question_id])
+    authorize @question
+    @section = @question.section
+    @phase = @section.phase
+    @question.destroy
+    redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: I18n.t('org_admin.templates.destroyed_message')
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/sections_controller.rb b/app/controllers/sections_controller.rb
new file mode 100644
index 0000000..42a65a4
--- /dev/null
+++ b/app/controllers/sections_controller.rb
@@ -0,0 +1,46 @@
+class SectionsController < ApplicationController
+  respond_to :html
+  after_action :verify_authorized
+
+  #create a section
+  def admin_create
+    @section = Section.new(params[:section])
+    authorize @section
+    @section.description = params["section-desc"]
+    @section.modifiable = true
+    @phase = section.phase
+    if @section.save
+      redirect_to admin_show_phase_template_path(id: @section.phase_id,
+        :section_id => @section.id, edit: 'true'), notice: I18n.t('org_admin.templates.created_message')
+    else
+      render action: "phases/admin_show"
+    end
+  end
+
+
+  #update a section of a template
+  def admin_update
+    @section = Section.includes(phase: :template).find(params[:id])
+    authorize @section
+    @section.description = params["section-desc-#{params[:id]}"]
+    @phase = @section.phase
+    if @section.update_attributes(params[:section])
+      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id , edit: 'true'), notice: I18n.t('org_admin.templates.updated_message')
+    else
+      render action: "phases/admin_show"
+    end
+  end
+
+
+  #delete a section and questions
+  def admin_destroy
+    @section = Section.includes(phase: :template).find(params[:section_id])
+    authorize @section
+    @phase = @section.phase
+    @section.destroy
+    redirect_to admin_show_phase_path(id: @phase.id, edit: 'true' ), notice: I18n.t('org_admin.templates.destroyed_message')
+  end
+
+
+
+end
\ No newline at end of file
diff --git a/app/controllers/suggested_answers_controller.rb b/app/controllers/suggested_answers_controller.rb
new file mode 100644
index 0000000..a42e289
--- /dev/null
+++ b/app/controllers/suggested_answers_controller.rb
@@ -0,0 +1,42 @@
+class SuggestedAnswersController < ApplicationController
+  respond_to :html
+  after_action :verify_authorized
+
+  #create suggested answers
+  def admin_create
+    @suggested_answer = SuggestedAnswer.new(params[:suggested_answer])
+    authorize @suggested_answer
+    if @suggested_answer.save
+      redirect_to admin_show_phase_path(id: @suggested_answer.question.section.phase_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
+      render action: "phases/admin_show"
+    end
+  end
+
+
+  #update a suggested answer of a template
+  def admin_update
+    @suggested_answer = SuggestedAnswer.includes(question: { section: {phase: :template}}).find(params[:id])
+    authorize @suggested_answer.question.section.phase.template
+    @question = @suggested_answer
+    @section = @question.section
+    @phase = @section.phase
+    if @suggested_answer.update_attributes(params[:suggested_answer])
+      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: I18n.t('org_admin.templates.updated_message')
+    else
+      render action: "phases/admin_show"
+    end
+  end
+
+  #delete a suggested answer
+  def admin_destroy
+    @suggested_answer = SuggestedAnswer.includes(question: { section: {phase: :template}}).find(params[:id])
+    authorize @suggested_answer
+    @question = @suggested_answer.question
+    @section = @question.section
+    @phase = @section.phase
+    @suggested_answer.destroy
+    redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: I18n.t('org_admin.templates.destroyed_message')
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index 50f3c60..8f2d4df 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -192,7 +192,7 @@
       break random unless Template.exists?(dmptemplate_id: random)
     end
     authorize @template
-    if @template.save
+    if @template.save!
       redirect_to admin_template_template_path(@template), notice: I18n.t('org_admin.templates.created_message')
     else
       render action: "admin_new"
@@ -215,207 +215,4 @@
     @templates = Template.where(dmptemplate_id: @template.dmptemplate_id).order(:version)
   end
 
-
-
-  # PHASES
-
-  #show and edit a phase of the template
-  def admin_phase
-    @phase = Phase.find(params[:id])
-    authorize @phase.template
-    @edit = params[:edit] == "true" ? true : false
-        #verify if there are any sections if not create one
-    @sections = @phase.sections
-    if !@sections.any?() || @sections.count == 0
-      @section = @phase.sections.build
-      @section.phase = @phase
-      @section.title = ''
-      @section.number = 1
-      @section.published = true
-      @section.modifiable = 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)
-      @open = true
-      @section_id = params[:section_id].to_i
-    end
-    if params.has_key?(:question_id)
-      @question_id = params[:question_id].to_i
-    end
-  end
-
-
-  #preview a phase
-  def admin_previewphase
-    @phase = Phase.find(params[:id])
-    authorize @phase.template
-    @template = @phase.template
-  end
-
-
-  #add a new phase to a template
-  def admin_addphase
-    @template = Template.find(params[:id])
-    @phase = Phase.new
-    authorize @template
-    @phase.number = @template.phases.count + 1
-  end
-
-
-  #create a phase
-  def admin_createphase
-    @phase = Phase.new(params[:phase])
-    authorize @phase.template
-    @phase.description = params["phase-desc"]
-    @phase.modifiable = true
-    if @phase.save
-      redirect_to admin_phase_template_path(id: @phase.id, edit: 'true'), notice: I18n.t('org_admin.templates.created_message')
-    else
-      render action: "admin_phase"
-    end
-  end
-
-
-  #update a phase of a template
-  def admin_updatephase
-    @phase = Phase.find(params[:id])
-    authorize @phase.template
-    @phase.description = params["phase-desc"]
-    if @phase.update_attributes(params[:phase])
-      redirect_to admin_phase_template_path(@phase), notice: I18n.t('org_admin.templates.updated_message')
-    else
-      render action: "admin_phase"
-    end
-  end
-
-  #delete a phase
-  def admin_destroyphase
-    @phase = Phase.find(params[:phase_id])
-    authorize @phase.template
-    @template = @phase.template
-    @phase.destroy
-    redirect_to admin_template_template_path(@template), notice: I18n.t('org_admin.templates.destroyed_message')
-  end
-
-# SECTIONS
-  #create a section
-  def admin_createsection
-    @section = Section.new(params[:section])
-    authorize @section.phase.template
-    @section.description = params["section-desc"]
-    @section.modifiable = true
-    if @section.save
-      redirect_to admin_phase_template_path(id: @section.phase_id,
-        :section_id => @section.id, edit: 'true'), notice: I18n.t('org_admin.templates.created_message')
-    else
-      render action: "admin_phase"
-    end
-  end
-
-
-  #update a section of a template
-  def admin_updatesection
-    @section = Section.find(params[:id])
-    authorize @section.phase.template
-    @section.description = params["section-desc-#{params[:id]}"]
-    @phase = @section.phase
-    if @section.update_attributes(params[:section])
-      redirect_to admin_phase_template_path(id: @phase.id, section_id: @section.id , edit: 'true'), notice: I18n.t('org_admin.templates.updated_message')
-    else
-      render action: "admin_phase"
-    end
-  end
-
-
-  #delete a section and questions
-  def admin_destroysection
-    @section = Section.find(params[:section_id])
-    authorize @section.phase.template
-    @phase = @section.phase
-    @section.destroy
-    redirect_to admin_phase_template_path(id: @phase.id, edit: 'true' ), notice: I18n.t('org_admin.templates.destroyed_message')
-  end
-
-
-#  QUESTIONS
-
-  #create a question
-  def admin_createquestion
-    @question = Question.new(params[:question])
-    authorize @question.section.phase.template
-    @question.guidance = params["new-question-guidance"]
-    @question.default_value = params["new-question-default-value"]
-    if @question.save!
-      redirect_to admin_phase_template_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: I18n.t('org_admin.templates.created_message')
-    else
-      render action: "admin_phase"
-    end
-  end
-
-  #update a question of a template
-  def admin_updatequestion
-    @question = Question.find(params[:id])
-    authorize @question.section.phase.template
-    @question.guidance = params["question-guidance-#{params[:id]}"]
-    @question.default_value = params["question-default-value-#{params[:id]}"]
-    @section = @question.section
-    @phase = @section.phase
-    if @question.update_attributes(params[:question])
-      redirect_to admin_phase_template_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: I18n.t('org_admin.templates.updated_message')
-    else
-      render action: "admin_phase"
-    end
-  end
-
-  #delete question
-  def admin_destroyquestion
-    @question = Question.find(params[:question_id])
-    authorize @question.section.phase.template
-    @section = @question.section
-    @phase = @section.phase
-    @question.destroy
-    redirect_to admin_phase_template_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: I18n.t('org_admin.templates.destroyed_message')
-  end
-
-
-  #SUGGESTED ANSWERS
-  #create suggested answers
-  def admin_createsuggestedanswer
-    @suggested_answer = SuggestedAnswer.new(params[:suggested_answer])
-    authorize @suggested_answer.question.section.phase.template
-    if @suggested_answer.save
-      redirect_to admin_phase_template_path(id: @suggested_answer.question.section.phase_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
-      render action: "admin_phase"
-    end
-  end
-
-
-  #update a suggested answer of a template
-  def admin_updatesuggestedanswer
-    @suggested_answer = SuggestedAnswer.find(params[:id])
-    authorize @suggested_answer.question.section.phase.template
-    @question = @suggested_answer.question
-    @section = @question.section
-    @phase = @section.phase
-    if @suggested_answer.update_attributes(params[:suggested_answer])
-      redirect_to admin_phase_template_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: I18n.t('org_admin.templates.updated_message')
-    else
-      render action: "admin_phase"
-    end
-  end
-
-  #delete a suggested answer
-  def admin_destroysuggestedanswer
-    @suggested_answer = SuggestedAnswer.find(params[:suggested_answer])
-    authorize @suggested_answer.question.section.phase.template
-    @question = @suggested_answer.question
-    @section = @question.section
-    @phase = @section.phase
-    @suggested_answer.destroy
-    redirect_to admin_phase_template_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: I18n.t('org_admin.templates.destroyed_message')
-  end
-
 end
\ No newline at end of file
diff --git a/app/policies/phase_policy.rb b/app/policies/phase_policy.rb
new file mode 100644
index 0000000..5d43a7e
--- /dev/null
+++ b/app/policies/phase_policy.rb
@@ -0,0 +1,40 @@
+class PhasePolicy < ApplicationPolicy
+  attr_reader :user, :phase
+
+  def initialize(user, phase)
+    raise Pundit::NotAuthorizedError, "must be logged in" unless user
+    @user = user
+    @phase = phase
+  end
+
+  ##
+  # Users can modify phases if:
+  #  - They can modify templates
+  #  - The template which they are modifying belongs to their org
+  ##
+
+  def admin_show?
+    user.can_modify_templates?  && (phase.template.org_id == user.org_id)
+  end
+
+  def admin_preview?
+    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+  end
+
+  def admin_update?
+    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+  end
+
+  def admin_add?
+    user.can_modify_templates?  && (phase.template.org_id == user.org_id)
+  end
+
+  def admin_create?
+    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+  end
+
+  def admin_destroy?
+    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+  end
+
+end
\ No newline at end of file
diff --git a/app/policies/question_policy.rb b/app/policies/question_policy.rb
new file mode 100644
index 0000000..5ea487c
--- /dev/null
+++ b/app/policies/question_policy.rb
@@ -0,0 +1,28 @@
+class QuestionPolicy < ApplicationPolicy
+  attr_reader :user, :question
+
+  def initialize(user, question)
+    raise Pundit::NotAuthorizedError, "must be logged in" unless user
+    @user = user
+    @question = question
+  end
+
+  ##
+  # Users can modify questions if:
+  #  - They can modify templates
+  #  - The template which they are modifying belongs to their org
+  ##
+
+  def admin_create?
+    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+  end
+
+  def admin_update?
+    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+  end
+
+  def admin_destroy?
+    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+  end
+
+end
\ No newline at end of file
diff --git a/app/policies/section_policy.rb b/app/policies/section_policy.rb
new file mode 100644
index 0000000..6effdbe
--- /dev/null
+++ b/app/policies/section_policy.rb
@@ -0,0 +1,28 @@
+class SectionPolicy < ApplicationPolicy
+  attr_reader :user, :section
+
+  def initialize(user, section)
+    raise Pundit::NotAuthorizedError, "must be logged in" unless user
+    @user = user
+    @section = section
+  end
+
+  ##
+  # Users can modify sections if:
+  #  - They can modify templates
+  #  - The template which they are modifying belongs to their org
+  ##
+
+  def admin_create?
+    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+  end
+
+  def admin_update?
+    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+  end
+
+  def admin_destroy?
+    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+  end
+
+end
\ No newline at end of file
diff --git a/app/policies/suggested_answer_policy.rb b/app/policies/suggested_answer_policy.rb
new file mode 100644
index 0000000..e6cd49c
--- /dev/null
+++ b/app/policies/suggested_answer_policy.rb
@@ -0,0 +1,28 @@
+class SuggestedAnswerPolicy < ApplicationPolicy
+  attr_reader :user, :suggested_answer
+
+  def initialize(user, suggested_answer)
+    raise Pundit::NotAuthorizedError, "must be logged in" unless user
+    @user = user
+    @suggested_answer = suggested_answer
+  end
+
+  ##
+  # Users can modify suggested answers if:
+  #  - They can modify templates
+  #  - The template which they are modifying belongs to their org
+  ##
+
+  def admin_create?
+    user.can_modify_templates?  &&  (suggested_answer.question.section.phase.template.org_id == user.org_id)
+  end
+
+  def admin_update?
+    user.can_modify_templates?  &&  (suggested_answer.question.section.phase.template.org_id == user.org_id)
+  end
+
+  def admin_destroy?
+    user.can_modify_templates?  &&  (suggested_answer.question.section.phase.template.org_id == user.org_id)
+  end
+
+end
\ No newline at end of file
diff --git a/app/policies/template_policy.rb b/app/policies/template_policy.rb
index 1fd64f5..41e1f7c 100644
--- a/app/policies/template_policy.rb
+++ b/app/policies/template_policy.rb
@@ -7,6 +7,12 @@
     @template = template
   end
 
+  ##
+  # Users can modify templates if:
+  #  - They can modify templates
+  #  - The template which they are modifying belongs to their org
+  ##
+
   def admin_index?
     user.can_modify_templates?
   end
@@ -35,89 +41,6 @@
     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
diff --git a/app/views/guidances/_add_guidance.html.erb b/app/views/guidances/_add_guidance.html.erb
new file mode 100644
index 0000000..af080d0
--- /dev/null
+++ b/app/views/guidances/_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>
+        </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(org_id: current_user.org_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/guidances/_edit_guidance.html.erb b/app/views/guidances/_edit_guidance.html.erb
new file mode 100644
index 0000000..d784e1f
--- /dev/null
+++ b/app/views/guidances/_edit_guidance.html.erb
@@ -0,0 +1,26 @@
+<!--edit suggested answer. question is passed as an argument-->
+<%= form_for(suggested_answer, url: admin_update_suggested_answer_path(suggested_answer), html: { method: :put}) do |f| %>
+  <%= f.hidden_field :org_id, value: current_user.org_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_destroy_suggested_answer_path(id: 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/guidances/_guidance_display.html.erb b/app/views/guidances/_guidance_display.html.erb
new file mode 100644
index 0000000..9a0755a
--- /dev/null
+++ b/app/views/guidances/_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 != "" %>
+      <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.phase.template.org.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_org(current_user.org).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/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb
new file mode 100644
index 0000000..e8debf7
--- /dev/null
+++ b/app/views/phases/_edit_phase.html.erb
@@ -0,0 +1,45 @@
+<!-- edit/add a phase. Phase is passed as an argument-->
+
+<%= form_for(phase, url: admin_update_phase_path(phase.id), 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_show_phase_path(phase), class: 'btn cancel' %>
+  </div>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/phases/_show_phase.html.erb b/app/views/phases/_show_phase.html.erb
new file mode 100644
index 0000000..f110902
--- /dev/null
+++ b/app/views/phases/_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.modifiable %>
+    <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.template.org.not_funder %>
+  <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/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb
new file mode 100644
index 0000000..489eb4d
--- /dev/null
+++ b/app/views/phases/admin_add.html.erb
@@ -0,0 +1,75 @@
+<%- model_class = Phase -%>
+<%= stylesheet_link_tag "admin" %>
+<% javascript "admin.js" %>
+
+<h1>
+  <%= @template.title %>
+  <!-- link button to add new guidance -->
+  <div class="move_2_right">
+    <%= link_to t("org_admin.templates.view_all_templates"),
+                admin_index_template_path,
+                class: "btn btn-primary" %>
+  </div>
+</h1>
+
+<div class="div_clear"></div>
+
+<!-- render navigation tabs for the template-->
+<%= render partial: "templates/admin_nav_tabs", locals: {template: @template, 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: { admin_create_phase_path} 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 :template_id, value: @template.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_template_template_path(@template), 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/phases/admin_preview.html.erb b/app/views/phases/admin_preview.html.erb
new file mode 100644
index 0000000..63b0f9a
--- /dev/null
+++ b/app/views/phases/admin_preview.html.erb
@@ -0,0 +1,59 @@
+<%- model_class = Phase -%>
+<%= stylesheet_link_tag "admin" %>
+
+<h1>
+  <%= @template.title %>
+  <!-- link button to add new guidance -->
+  <div class="move_2_right">
+    <%= link_to t("org_admin.templates.back_to_edit_phase_label"),
+        admin_show_phase_path(id: @phase.id, edit: "true"),
+        class: 'btn btn-primary' %>
+    <%= link_to t("org_admin.templates.view_all_templates"),
+        admin_index_template_path,
+        class: 'btn btn-primary' %>
+  </div>
+</h1>
+
+<div class="div_clear"></div>
+
+<!-- render navigation tabs for the template-->
+<%= render partial: "templates/admin_nav_tabs", locals: {template: @template, active: @phase.id} %>
+
+<!-- phase main container -->
+<div class="project-tabs-body">
+  <div class="accordion" id="sections-accordion">
+    <% sections = @phase.sections %>
+    <% sections.order(:number).each do |section| %>
+      <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">
+            <% last_question_id = section.questions.order("number DESC").first.id%>
+
+            <% section.questions.order("number").each do |question| %>
+              <!--question block-->
+              <%= render partial: 'question/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 %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/phases/admin_show.html.erb b/app/views/phases/admin_show.html.erb
new file mode 100644
index 0000000..f00abdb
--- /dev/null
+++ b/app/views/phases/admin_show.html.erb
@@ -0,0 +1,69 @@
+<%- model_class = Phase -%>
+<%= stylesheet_link_tag "admin" %>
+<% javascript 'admin.js' %>
+
+<%= tinymce content_css: asset_path('application.css') %>
+
+<h1>
+  <%= @phase.template.title %>
+  <!-- link button to add new guidance -->
+  <div class="move_2_right">
+    <%= link_to t("org_admin.templates.view_all_templates"),
+      admin_index_template_path,
+      class: 'btn btn-primary' %>
+  </div>
+</h1>
+
+<div class="div_clear"></div>
+
+<!-- render navigation tabs for the template-->
+<%= render partial: "templates/admin_nav_tabs", locals: {template: @phase.template, 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.modifiable && @edit %>
+          <div id="edit_phase_div" style="display: none">
+            <%= render partial: "edit_phase", locals: {phase: @phase}%>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <!-- sections, questions and guidance details-->
+    <% @sections.order("number ASC").each do |section| %>
+      <% if @edit && section.modifiable %>
+        <%= render partial: 'sections/edit_section', locals: {section: section, edit: @edit, phase: @phase} %>
+      <% else %>
+        <%= render partial: 'sections/show_section', locals: {section: section}%>
+      <% end %>
+     <% end %>
+
+  </div>
+</div>
+
+
+<% if @edit || @phase.template.customization_of.present? %>
+  <!-- add section block -->
+  <div id="add_section_block_div" style="display: none">
+    <%= render partial: 'sections/add_section', locals: {phase: @phase} %>
+  </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/question_options/_option_fields.html.erb b/app/views/question_options/_option_fields.html.erb
new file mode 100644
index 0000000..5182510
--- /dev/null
+++ b/app/views/question_options/_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/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb
new file mode 100644
index 0000000..b47c5d8
--- /dev/null
+++ b/app/views/questions/_add_question.html.erb
@@ -0,0 +1,182 @@
+<!--
+**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:  admin_create_question_path , 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.question_options.build } %>
+                  <% @new_question.question_options.each do |options_q|%>
+                    <%= f.fields_for :question_options, options_q do |op|%>
+                      <% i = i + 1%>
+                      <% options_q.number = i %>
+                      <%= render "/question_options/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 :org_id, value: current_user.org_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/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb
new file mode 100644
index 0000000..890d774
--- /dev/null
+++ b/app/views/questions/_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_update_question_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.question_options.count == 0 %>
+                  <% 2.times {question.question_options.build } %>
+
+                <% end %>
+                                <% i = 0 %>
+                <% question.question_options.to_a.sort_by{|op| op["number"]}.each do |options_q|%>
+                  <%= f.fields_for :question_options, options_q do |op|%>
+                                        <% i = i + 1%>
+                                        <% options_q.number = i %>
+                    <%= render "question_options/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_org_id(current_user.org.id) %>
+          <% if suggested_answer.nil? %>
+             <% suggested_answer = question.suggested_answers.build %>
+          <% end %>
+          <%= f.fields_for :suggested_answers, suggested_answer do |s|%>
+            <%= s.hidden_field :org_id, value: current_user.org.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.phase.template.published? %>
+        <%= link_to t("helpers.submit.delete"), admin_destroy_question_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: "guidances/guidance_display", locals: {question: question} %>
+<% end %>
diff --git a/app/views/questions/_preview_question.html.erb b/app/views/questions/_preview_question.html.erb
new file mode 100644
index 0000000..a7424e4
--- /dev/null
+++ b/app/views/questions/_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") %>
+        <% options = question.question_options.order("number") %>
+
+        <!--checkbox display-->
+        <% if q_format.title == t("helpers.checkbox") %>
+          <%if !options.nil? %>
+            <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") %>
+          <% if !options.nil? %>
+            <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") %>
+          <% if !options.nil?  %>
+            <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") %>
+          <% if !options.nil? %>
+            <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(org_id: current_user.org_id) %>
+        <% if !suggested_answer.blank? %>
+          <div class="suggested-answer-div">
+            <span class="suggested-answer-intro">
+              <% if suggested_answer.is_example? %>
+                <%= 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(org_id: current_user.org_id) %>
+        <% if !suggested_answer.blank? %>
+          <div class="suggested-answer-div">
+            <span class="suggested-answer-intro">
+              <% if suggested_answer.is_example? %>
+                <%= 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") %>
+        <input type ="text" style="width: 97%;"/>
+      <!--text area display-->
+      <%elsif q_format.title == t("helpers.text_area") %>
+        <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: "guidances/guidance_display", locals: {question: question}%>
diff --git a/app/views/questions/_show_question.html.erb b/app/views/questions/_show_question.html.erb
new file mode 100644
index 0000000..c35b492
--- /dev/null
+++ b/app/views/questions/_show_question.html.erb
@@ -0,0 +1,148 @@
+<!--
+**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") %>
+            <ul class='options'>
+            <% if question.question_options.is_a? QuestionOption  %>
+              <li>- <%= question.question_options.text %></li>
+            <% else %>
+              <% if !question.question_options.to_a.nil? %>
+                <% question.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") %>
+      <% if !question.default_value.nil? %>
+        <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") %>
+          <% if question.option_comment_display == true %>
+            <%= 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.phase.template.org.org_type != constant("organisation_types.funder")  %>
+      <% suggested_answer = question.get_suggested_answer(current_user.org_id) %>
+      <% if !suggested_answer.nil?  && suggested_answer.text != ""  %>
+        <tr>
+          <td class="first_template">
+            <% if suggested_answer.is_example? %>
+              <%= 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?  %>
+      <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? %>
+      <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 %>
+              ,
+              <% i +=1 %>
+            <% end %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+  <br/>
+  <!-- Add suggested or example answers to a funders template-->
+  <% if !question.modifiable %>
+    <% suggested_answer = question.get_suggested_answer(current_user.org_id) %>
+    <% if !suggested_answer.nil?  && suggested_answer.text != "" %>
+      <div id="show_suggested_answer_div_<%= question.id%>">
+        <%= render partial: 'suggested_answers/show_suggested_answer', locals: {suggested_answer: suggested_answer, question: question} %>
+      </div>
+      <div id="edit_suggested_answer_div_<%= question.id%>" style="display: none">
+        <%= render partial: 'suggested_answers/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: 'suggested_answers/add_suggested_answer', locals: {question: question} %>
+    </div>
+  <% end %>
+
+  <br/>
+  <!-- edit question button-->
+  <% if (@edit && question.section.modifiable) || question.section.phase.template.customization_of.present? %>
+    <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.published? %>
+        <%= link_to t("org_admin.questions.question_delete_button"), admin_destroy_question_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 && question.modifiable %>
+    <% suggested_answer = question.get_suggested_answer(current_user.org_id) %>
+    <% if suggested_answer.nil? %>
+      <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: 'guidances/guidance_display', locals: {question: question}%>
diff --git a/app/views/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb
new file mode 100644
index 0000000..ba916ec
--- /dev/null
+++ b/app/views/sections/_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 = phase.sections.count + 1 %>
+
+
+<%= form_for @new_section, url: admin_create_section_path do |f| %>
+  <%= f.hidden_field :phase_id, value: phase.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/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
new file mode 100644
index 0000000..3e9e0ab
--- /dev/null
+++ b/app/views/sections/_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_update_section_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 %>
+    <% 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.modifiable %>
+            <%= link_to t("helpers.submit.delete"), admin_destroy_section_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.length > 0 %>
+          <% question_left = @questions.length %>
+          <% @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: 'questions/show_question', locals: {question: question} %>
+              </div>
+
+              <div id="edit_question_div_<%= question.id%>"  style="display: none">
+                <!-- render the edit question block-->
+                <%= render partial: 'questions/edit_question', locals: {question: question} %>
+              </div>
+            </div>
+            <!--verify how many questions are left -->
+            <% if question_left.to_i > 1  %>
+                <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.modifiable %>
+
+          <% if @questions.length != 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: 'questions/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/sections/_show_section.html.erb b/app/views/sections/_show_section.html.erb
new file mode 100644
index 0000000..179aede
--- /dev/null
+++ b/app/views/sections/_show_section.html.erb
@@ -0,0 +1,53 @@
+<!-- show a section and its questions and guidance. Section is passed as an argument-->
+<% if @open && @section_id == section.id %>
+  <% 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 = section.questions.order("number") %>
+      <% if section_questions.present? %>
+        <% last_question_id = section_questions.last.id %>
+        <% section_questions.each do |question| %>
+          <div class="question_guidance_block">
+            <!--question 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: 'questions/show_question', locals: {question: question} %>
+            </div>
+            <% if section.phase.template.customization_of.present? %>
+              <div id="edit_question_div_<%= question.id%>"  style="display: none">
+                  <!-- render the edit question block-->
+                  <%= render partial: 'questions/edit_annotations', locals: {question: question} %>
+              </div>
+              <% end %>
+          </div>
+
+          <% if last_question_id == question.id %>
+            <div class="two-column-clear"></div>
+          <% else %>
+            <div class="two-column-clear question-divider"></div>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/suggested_answers/_add_suggested_answer.html.erb b/app/views/suggested_answers/_add_suggested_answer.html.erb
new file mode 100644
index 0000000..80a3067
--- /dev/null
+++ b/app/views/suggested_answers/_add_suggested_answer.html.erb
@@ -0,0 +1,25 @@
+<!--add suggested answer. question is passed as an argument-->
+<%= form_for :suggested_answer, url: admin_create_suggested_answer_path do |f| %>
+  <%= f.hidden_field :org_id, value: current_user.org_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/suggested_answers/_edit_suggested_answer.html.erb b/app/views/suggested_answers/_edit_suggested_answer.html.erb
new file mode 100644
index 0000000..d6685ed
--- /dev/null
+++ b/app/views/suggested_answers/_edit_suggested_answer.html.erb
@@ -0,0 +1,26 @@
+<!--edit suggested answer. question is passed as an argument-->
+<%= form_for(suggested_answer, url: admin_update_suggested_answer_path(suggested_answer), html: { method: :put}) do |f| %>
+  <%= f.hidden_field :org_id, value: current_user.org_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_destroy_suggested_answer_path(id: 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/suggested_answers/_show_suggested_answer.html.erb b/app/views/suggested_answers/_show_suggested_answer.html.erb
new file mode 100644
index 0000000..c760bc9
--- /dev/null
+++ b/app/views/suggested_answers/_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/_add_guidance.html.erb b/app/views/templates/_add_guidance.html.erb
deleted file mode 100644
index af080d0..0000000
--- a/app/views/templates/_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>
-        </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(org_id: current_user.org_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
deleted file mode 100644
index 62232bd..0000000
--- a/app/views/templates/_add_question.html.erb
+++ /dev/null
@@ -1,182 +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.question_options.build } %>
-                  <% @new_question.question_options.each do |options_q|%>
-                    <%= f.fields_for :question_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 :org_id, value: current_user.org_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
deleted file mode 100644
index 94343b1..0000000
--- a/app/views/templates/_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 = phase.sections.count + 1 %>
-
-
-<%= form_for @new_section, url: {action: "admin_createsection"} do |f| %>
-  <%= f.hidden_field :phase_id, value: phase.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
deleted file mode 100644
index 8969086..0000000
--- a/app/views/templates/_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 :org_id, value: current_user.org_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
index d876bd2..41eac67 100644
--- a/app/views/templates/_admin_nav_tabs.html.erb
+++ b/app/views/templates/_admin_nav_tabs.html.erb
@@ -15,7 +15,7 @@
     <% else %>
       <li>
     <% end %>
-      <%= link_to phase.title, admin_phase_template_path(phase.id) %>
+      <%= link_to phase.title, admin_show_phase_path(phase.id) %>
     </li>
     <% end %>
     <!-- Add another phase button -->
@@ -25,7 +25,7 @@
     <% else %>
       <li>
     <% end %>
-      <%= link_to t('org_admin.templates.add_phase_label'), admin_addphase_template_path(template) %>
+      <%= link_to t('org_admin.templates.add_phase_label'), admin_add_phase_path(template) %>
     </li>
     <%end%>
   </ul>
diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb
index 108c19d..58ef200 100644
--- a/app/views/templates/_edit_annotations.html.erb
+++ b/app/views/templates/_edit_annotations.html.erb
@@ -6,7 +6,7 @@
 **Copyright: Digital Curation Centre and University of California Curation Center
 -->
 
-<%= form_for(question, url: admin_updatequestion_template_path(question), html: { method: :put}) do |f| %>
+<%= form_for(question, url: admin_update_question_path(question), html: { method: :put}) do |f| %>
 <div class="question-div">
   <table class="dmp_details_table phase">
     <%= f.hidden_field :id,{ class: "quest_id" } %>
@@ -88,7 +88,7 @@
   <div class="move_2_right">
     <%= f.submit t("helpers.submit.save"), class: "btn btn-primary" %>
     <% if !question.section.phase.template.published? %>
-      <%= link_to t("helpers.submit.delete"), admin_destroyquestion_template_path(question_id: question.id),
+      <%= link_to t("helpers.submit.delete"), admin_destroy_question_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" %>
@@ -98,5 +98,5 @@
 
 
 <!--guidance block -->
-<%= render partial: "guidance_display", locals: {question: question} %>
+<%= render partial: "guidances/guidance_display", locals: {question: question} %>
 <% end %>
diff --git a/app/views/templates/_edit_guidance.html.erb b/app/views/templates/_edit_guidance.html.erb
deleted file mode 100644
index e351d51..0000000
--- a/app/views/templates/_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_template_path(suggested_answer), html: { method: :put}) do |f| %>
-  <%= f.hidden_field :org_id, value: current_user.org_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_template_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
deleted file mode 100644
index ace20c9..0000000
--- a/app/views/templates/_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_template_path(phase.id), 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_template_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
deleted file mode 100644
index 8ea1271..0000000
--- a/app/views/templates/_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_template_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.question_options.count == 0 %>
-                  <% 2.times {question.question_options.build } %>
-
-                <% end %>
-                                <% i = 0 %>
-                <% question.question_options.to_a.sort_by{|op| op["number"]}.each do |options_q|%>
-                  <%= f.fields_for :question_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_org_id(current_user.org.id) %>
-          <% if suggested_answer.nil? %>
-             <% suggested_answer = question.suggested_answers.build %>
-          <% end %>
-          <%= f.fields_for :suggested_answers, suggested_answer do |s|%>
-            <%= s.hidden_field :org_id, value: current_user.org.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.phase.template.published? %>
-        <%= link_to t("helpers.submit.delete"), admin_destroyquestion_template_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
deleted file mode 100644
index eb4abed..0000000
--- a/app/views/templates/_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_template_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 %>
-    <% 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.modifiable %>
-            <%= link_to t("helpers.submit.delete"), admin_destroysection_template_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.length > 0 %>
-          <% question_left = @questions.length %>
-          <% @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  %>
-                <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.modifiable %>
-
-          <% if @questions.length != 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
deleted file mode 100644
index fe20950..0000000
--- a/app/views/templates/_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_template_path(suggested_answer), html: { method: :put}) do |f| %>
-  <%= f.hidden_field :org_id, value: current_user.org_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_template_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/_guidance_display.html.erb b/app/views/templates/_guidance_display.html.erb
deleted file mode 100644
index 9a0755a..0000000
--- a/app/views/templates/_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 != "" %>
-      <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.phase.template.org.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_org(current_user.org).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
deleted file mode 100644
index 5182510..0000000
--- a/app/views/templates/_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/templates/_preview_question.html.erb b/app/views/templates/_preview_question.html.erb
deleted file mode 100644
index 37d3fb1..0000000
--- a/app/views/templates/_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") %>
-        <% options = question.question_options.order("number") %>
-
-        <!--checkbox display-->
-        <% if q_format.title == t("helpers.checkbox") %>
-          <%if !options.nil? %>
-            <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") %>
-          <% if !options.nil? %>
-            <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") %>
-          <% if !options.nil?  %>
-            <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") %>
-          <% if !options.nil? %>
-            <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(org_id: current_user.org_id) %>
-        <% if !suggested_answer.blank? %>
-          <div class="suggested-answer-div">
-            <span class="suggested-answer-intro">
-              <% if suggested_answer.is_example? %>
-                <%= 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(org_id: current_user.org_id) %>
-        <% if !suggested_answer.blank? %>
-          <div class="suggested-answer-div">
-            <span class="suggested-answer-intro">
-              <% if suggested_answer.is_example? %>
-                <%= 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") %>
-        <input type ="text" style="width: 97%;"/>
-      <!--text area display-->
-      <%elsif q_format.title == t("helpers.text_area") %>
-        <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
deleted file mode 100644
index f110902..0000000
--- a/app/views/templates/_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.modifiable %>
-    <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.template.org.not_funder %>
-  <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
index 606aabb..33f29df 100644
--- a/app/views/templates/_show_phases_sections.html.erb
+++ b/app/views/templates/_show_phases_sections.html.erb
@@ -12,10 +12,10 @@
       <!--delete a phase button. only displays when template not published-->
 
       <% if phase.sections.length > 0 %>
-          <%= link_to t("helpers.preview"), admin_previewphase_template_path(id: phase.id), class: 'btn btn-primary'%>
+          <%= link_to t("helpers.preview"), admin_preview_phase_path(id: phase.id), class: 'btn btn-primary'%>
       <% end %>
       <% if !phase.template.published? %>
-          <%= link_to t("helpers.submit.delete"), admin_destroyphase_template_path(phase_id: phase.id),
+          <%= link_to t("helpers.submit.delete"), admin_destroy_phase_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.modifiable %>
@@ -23,7 +23,7 @@
       <% else %>
           <% b_label = t('org_admin.templates.edit_phase_label')%>
       <% end %>
-      <%= link_to b_label, admin_phase_template_path(id: phase.id, edit: (b_label == t('org_admin.templates.edit_phase_label'))), class: "btn btn-primary" %>
+      <%= link_to b_label, admin_show_phase_path(id: phase.id, edit: (b_label == t('org_admin.templates.edit_phase_label'))), class: "btn btn-primary" %>
 
   </div>
   <% if phase.sections.any? %>
diff --git a/app/views/templates/_show_question.html.erb b/app/views/templates/_show_question.html.erb
deleted file mode 100644
index 8d8579c..0000000
--- a/app/views/templates/_show_question.html.erb
+++ /dev/null
@@ -1,148 +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") %>
-            <ul class='options'>
-            <% if question.question_options.is_a? QuestionOption  %>
-              <li>- <%= question.question_options.text %></li>
-            <% else %>
-              <% if !question.question_options.to_a.nil? %>
-                <% question.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") %>
-      <% if !question.default_value.nil? %>
-        <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") %>
-          <% if question.option_comment_display == true %>
-            <%= 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.phase.template.org.org_type != constant("organisation_types.funder")  %>
-      <% suggested_answer = question.get_suggested_answer(current_user.org_id) %>
-      <% if !suggested_answer.nil?  && suggested_answer.text != ""  %>
-        <tr>
-          <td class="first_template">
-            <% if suggested_answer.is_example? %>
-              <%= 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?  %>
-      <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? %>
-      <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 %>
-              ,
-              <% i +=1 %>
-            <% end %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-  <br/>
-  <!-- Add suggested or example answers to a funders template-->
-  <% if !question.modifiable %>
-    <% suggested_answer = question.get_suggested_answer(current_user.org_id) %>
-    <% if !suggested_answer.nil?  && suggested_answer.text != "" %>
-      <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 && question.section.modifiable) || question.section.phase.template.customization_of.present? %>
-    <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.published? %>
-        <%= link_to t("org_admin.questions.question_delete_button"), admin_destroyquestion_template_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 && question.modifiable %>
-    <% suggested_answer = question.get_suggested_answer(current_user.org_id) %>
-    <% if suggested_answer.nil? %>
-      <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
deleted file mode 100644
index 1544b83..0000000
--- a/app/views/templates/_show_section.html.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- show a section and its questions and guidance. Section is passed as an argument-->
-<% if @open && @section_id == section.id %>
-  <% 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 = section.questions.order("number") %>
-      <% if section_questions.present? %>
-        <% last_question_id = section_questions.last.id %>
-        <% section_questions.each do |question| %>
-          <div class="question_guidance_block">
-            <!--question 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>
-            <% if section.phase.template.customization_of.present? %>
-              <div id="edit_question_div_<%= question.id%>"  style="display: none">
-                  <!-- render the edit question block-->
-                  <%= render partial: 'edit_annotations', locals: {question: question} %>
-              </div>
-              <% end %>
-          </div>
-
-          <% if last_question_id == question.id %>
-            <div class="two-column-clear"></div>
-          <% else %>
-            <div class="two-column-clear question-divider"></div>
-          <% end %>
-        <% 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
deleted file mode 100644
index c760bc9..0000000
--- a/app/views/templates/_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/templates/admin_addphase.html.erb b/app/views/templates/admin_addphase.html.erb
deleted file mode 100644
index 02c62ad..0000000
--- a/app/views/templates/admin_addphase.html.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-<%- model_class = Phase -%>
-<%= stylesheet_link_tag "admin" %>
-<% javascript "admin.js" %>
-
-<h1>
-  <%= @template.title %>
-  <!-- link button to add new guidance -->
-  <div class="move_2_right">
-    <%= link_to t("org_admin.templates.view_all_templates"),
-                admin_index_template_path,
-                class: "btn btn-primary" %>
-  </div>
-</h1>
-
-<div class="div_clear"></div>
-
-<!-- render navigation tabs for the template-->
-<%= render partial: "admin_nav_tabs", locals: {template: @template, 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 :template_id, value: @template.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_template_template_path(@template), 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_phase.html.erb b/app/views/templates/admin_phase.html.erb
deleted file mode 100644
index 26c154e..0000000
--- a/app/views/templates/admin_phase.html.erb
+++ /dev/null
@@ -1,69 +0,0 @@
-<%- model_class = Phase -%>
-<%= stylesheet_link_tag "admin" %>
-<% javascript 'admin.js' %>
-
-<%= tinymce content_css: asset_path('application.css') %>
-
-<h1>
-  <%= @phase.template.title %>
-  <!-- link button to add new guidance -->
-  <div class="move_2_right">
-    <%= link_to t("org_admin.templates.view_all_templates"),
-      admin_index_template_path,
-      class: 'btn btn-primary' %>
-  </div>
-</h1>
-
-<div class="div_clear"></div>
-
-<!-- render navigation tabs for the template-->
-<%= render partial: "admin_nav_tabs", locals: {template: @phase.template, 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.modifiable && @edit %>
-          <div id="edit_phase_div" style="display: none">
-            <%= render partial: "edit_phase", locals: {phase: @phase}%>
-          </div>
-        <% end %>
-      </div>
-    </div>
-
-    <!-- sections, questions and guidance details-->
-    <% @sections.order("number ASC").each do |section| %>
-      <% if @edit && section.modifiable %>
-        <%= render partial: 'edit_section', locals: {section: section, edit: @edit, phase: @phase} %>
-      <% else %>
-        <%= render partial: 'show_section', locals: {section: section}%>
-      <% end %>
-     <% end %>
-
-  </div>
-</div>
-
-
-<% if @edit || @phase.template.customization_of.present? %>
-  <!-- add section block -->
-  <div id="add_section_block_div" style="display: none">
-    <%= render partial: 'add_section', locals: {phase: @phase} %>
-  </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
deleted file mode 100644
index 58de962..0000000
--- a/app/views/templates/admin_previewphase.html.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-<%- model_class = Phase -%>
-<%= stylesheet_link_tag "admin" %>
-
-<h1>
-  <%= @template.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_template_path(id: @phase.id, edit: "true"),
-        class: 'btn btn-primary' %>
-    <%= link_to t("org_admin.templates.view_all_templates"),
-        admin_index_template_path,
-        class: 'btn btn-primary' %>
-  </div>
-</h1>
-
-<div class="div_clear"></div>
-
-<!-- render navigation tabs for the template-->
-<%= render partial: "admin_nav_tabs", locals: {template: @template, active: @phase.id} %>
-
-<!-- phase main container -->
-<div class="project-tabs-body">
-  <div class="accordion" id="sections-accordion">
-    <% sections = @phase.sections %>
-    <% sections.order(:number).each do |section| %>
-      <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">
-            <% last_question_id = section.questions.order("number DESC").first.id%>
-
-            <% section.questions.order("number").each do |question| %>
-              <!--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 %>
-  </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
index 12edc0c..7316afa 100644
--- a/app/views/templates/admin_template.html.erb
+++ b/app/views/templates/admin_template.html.erb
@@ -14,18 +14,18 @@
 <div class="div_clear"></div>
 
 <!-- render navigation tabs for the template-->
-<%= render partial: "admin_nav_tabs", locals: {template: @template, active: "show_template"} %>
+<%= render partial: "templates/admin_nav_tabs", locals: {template: @template, active: "show_template"} %>
 
 <!-- body -->
 <div class="dmp_details_body">
   <div class="dmp_details">
     <% if @template.org.funder? || current_user.org.funder? then %>
       <div id="edit_template_div" style="display: none">
-        <%= render partial: "edit_template", locals: {template: @template}%>
+        <%= render partial: "templates/edit_template", locals: {template: @template}%>
       </div>
     <%end%>
     <div id="show_template_div">
-      <%= render partial: "show_template", locals: {template: @template}%>
+      <%= render partial: "templates/show_template", locals: {template: @template}%>
     </div>
   </div>
   <!-- If template has phases-->
@@ -33,7 +33,7 @@
     <% if @template.phases.count == 1 then %>
       <% @template.phases.each do |phase| %>
         <!--render the display block with the phase, sections and questions information-->
-        <%= render partial: 'show_phases_sections', locals: {phase: phase}%>
+        <%= render partial: 'templates/show_phases_sections', locals: {phase: phase}%>
       <%end%>
     <%else%>
       <% @template.phases.order(:number).each do |phase| %>
@@ -48,7 +48,7 @@
             <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}%>
+                <%= render partial: 'templates/show_phases_sections', locals: {phase: phase}%>
               </div>
             </div>
           </div>
diff --git a/config/routes.rb b/config/routes.rb
index 1eff413..e29b441 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -97,28 +97,45 @@
         get 'admin_index'
         get 'admin_template'
         get 'admin_new'
-        get 'admin_addphase'
-        get 'admin_phase'
-        get 'admin_previewphase'
-        get 'admin_cloneversion'
         get 'admin_template_history'
         delete 'admin_destroy'
-        delete 'admin_destroyversion'
-        delete 'admin_destroyphase'
-        delete 'admin_destroysection'
-        delete 'admin_destroyquestion'
-        delete 'admin_destroysuggestedanswer'
         post 'admin_create'
-        post 'admin_createphase'
-        post 'admin_createsection'
-        post 'admin_createquestion'
-        post 'admin_createsuggestedanswer'
         put 'admin_update'
-        put 'admin_updatephase'
-        put 'admin_updateversion'
-        put 'admin_updatesection'
-        put 'admin_updatequestion'
-        put 'admin_updatesuggestedanswer'
+      end
+    end
+
+    resources :phases, path: 'org/admin/templates/phases', only: [] do
+      member do
+        get 'admin_show'
+        get 'admin_preview'
+        get 'admin_add'
+        put 'admin_update'
+        post 'admin_create'
+        delete 'admin_destroy'
+      end
+    end
+
+    resources :sections, path: 'org/admin/templates/sections', only: [] do
+      member do
+        post 'admin_create'
+        put 'admin_update'
+        delete 'admin_destroy'
+      end
+    end
+
+    resources :questions, path: 'org/admin/templates/questions', only: [] do
+      member do
+        post 'admin_create'
+        put 'admin_update'
+        delete 'admin_destroy'
+      end
+    end
+
+    resources :suggested_answers, path: 'org/admin/templates/suggested_answers', only: [] do
+      member do
+        post 'admin_create'
+        put 'admin_update'
+        delete 'admin_destroy'
       end
     end