diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index bcde979..61ad438 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -107,7 +107,7 @@
   def admin_previewphase
     @phase = Phase.find(params[:id])
     authorize @phase.template
-    @template = Phase.template
+    @template = @phase.template
   end
 
 
diff --git a/app/models/question.rb b/app/models/question.rb
index d6ec73e..7a37132 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -96,11 +96,12 @@
     # pulls together guidance from various sources for question
     guidances = {}
     theme_ids = question.theme_ids
-
-    GuidanceGroup.where(org_id: org.id).each do |group|
-      group.guidances.each do |g|
-        g.themes.where("id IN (?)", theme_ids).each do |gg|
-          guidances["#{group.name} " + I18n.t('admin.guidance_lowercase_on') + " #{gg.title}"] = g
+    if theme_ids.present?
+      GuidanceGroup.where(org_id: org.id).each do |group|
+        group.guidances.each do |g|
+          g.themes.where("id IN (?)", theme_ids).each do |gg|
+            guidances["#{group.name} " + I18n.t('admin.guidance_lowercase_on') + " #{gg.title}"] = g
+          end
         end
       end
     end
diff --git a/app/views/templates/_preview_question.html.erb b/app/views/templates/_preview_question.html.erb
index dee1c97..37d3fb1 100644
--- a/app/views/templates/_preview_question.html.erb
+++ b/app/views/templates/_preview_question.html.erb
@@ -8,7 +8,7 @@
     <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.options.order("number") %>
+        <% options = question.question_options.order("number") %>
 
         <!--checkbox display-->
         <% if q_format.title == t("helpers.checkbox") %>
diff --git a/app/views/templates/admin_previewphase.html.erb b/app/views/templates/admin_previewphase.html.erb
index 12c2507..58de962 100644
--- a/app/views/templates/admin_previewphase.html.erb
+++ b/app/views/templates/admin_previewphase.html.erb
@@ -2,63 +2,58 @@
 <%= stylesheet_link_tag "admin" %>
 
 <h1>
-	<%= @version.phase.dmptemplate.title %>
-	<!-- link button to add new guidance -->
-	<div class="move_2_right">
-        <%= link_to t("org_admin.templates.back_to_edit_phase_label"),
-		           admin_phase_dmptemplate_path(:id => @version.phase_id, :version_id => @version.id, :edit => "true"),
-		            :class => 'btn btn-primary' %>
-		<%= link_to t("org_admin.templates.view_all_templates"),
-		            admin_index_dmptemplate_path,
-		            :class => 'btn btn-primary' %>
-	</div>            
+  <%= @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: {dmptemplate: @version.phase.dmptemplate, active: @version.phase_id} %>
+<%= 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 = @version.sections %>
-    	<% sections.order(:number).each do |section| %>
-            <%if (section.organisation_id == @version.phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%>
-						
-                <div class="accordion-group">
-                    <div class="accordion-heading">
-                        <a class="accordion-toggle" data-toggle="collapse" data-parent="#sections-accordion" href="#collapse-<%= section.id%>">
-                            <div class="accordion_heading_text">
-                                <%= section.title %>
-                            </div>	
-                            <!-- + or - icon-->
-                            <span class="icon-plus icon-white accordion-icon"> </span>
-                            
-                        </a>
-                    </div>
-                    <div id="collapse-<%= section.id%>" class="accordion-body collapse section-collapse">
-                        <div class="section_desc">
-                            <%= raw section.description %>
-                        </div>
-                        <div class="accordion-inner">	
-                            <% section.questions.order("number").each do |question| %>
-                                <% last_question_id = section.questions.order("number DESC").first.id%>
-                
-                                <!--question block-->
-                                <%= render :partial => 'preview_question', locals: {question: question}%>
-                
-                                <% if last_question_id == question.id then %>
-                                    <div class="two-column-clear"></div>
-                                <% else %>
-                                    <div class="two-column-clear question-divider"></div>
-                                <% end %>
-                
-                            <%end%>
-                        </div>
-                    </div>
-                </div>		
-            <%end%>
-    	<%end%>
-	</div>
-</div>	
\ No newline at end of file
+  <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