diff --git a/app/controllers/phases_controller.rb b/app/controllers/phases_controller.rb
index 391120b..eead0ca 100644
--- a/app/controllers/phases_controller.rb
+++ b/app/controllers/phases_controller.rb
@@ -8,10 +8,12 @@
     def edit
 
     @plan = Plan.eager_load2(params[:plan_id])
+    # authorization done on plan so found in plan_policy
     authorize @plan
 
     phase_id = params[:id].to_i
     @phase = @plan.template.phases.select {|p| p.id == phase_id}.first
+    @readonly = !@plan.editable_by?(current_user.id)
 
     # the eager_load pulls in ALL answers
     # need to restrict to just ones for this plan
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 526f76a..e554b93 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -140,7 +140,7 @@
     authorize @plan
     # If there was no phase specified use the template's 1st phase
     @phase = (params[:phase].nil? ? @plan.template.phases.first : Phase.find(params[:phase]))
-    @readonly = @plan.editable_by?(current_user.id)
+    @readonly = !@plan.editable_by?(current_user.id)
     respond_to :html
   end
 
diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb
index 5684072..368f077 100644
--- a/app/models/exported_plan.rb
+++ b/app/models/exported_plan.rb
@@ -86,7 +86,7 @@
   end
 
   def questions_for_section(section_id)
-    questions.where(section_id: section_id).sort_by(&:number)
+    Question.where(id: questions).where(section_id: section_id).order(:number)
   end
 
   def admin_details
@@ -128,6 +128,8 @@
         value = self.send(at)
         if value.present?
           output += admin_field_t(at.to_s) + ": " + value + "\n"
+        else
+          output += admin_field_t(at.to_s) + ": " + _('-') + "\n"
         end
     end
 
@@ -162,18 +164,17 @@
 private
 
   def questions
-    @questions ||= begin
-      question_settings = self.settings(:export).fields[:questions]
-
-      return [] if question_settings.is_a?(Array) && question_settings.empty?
-
-      questions = if question_settings.present? && question_settings != :all
-        Question.where(id: question_settings)
+    question_settings = self.settings(:export).fields[:questions]
+    @questions ||= if question_settings.present?
+      if question_settings == :all
+        Question.where(section_id: self.plan.sections.collect { |s| s.id }).pluck(:id)
+      elsif question_settings.is_a?(Array)
+        question_settings
       else
-        Question.where(section_id: self.plan.sections.collect {|s| s.id })
+        []
       end
-
-      questions.order(:number)
+    else
+      []
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 352b564..14f1af2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -107,14 +107,13 @@
   #
   # @param new_organisation_id [Integer] the id for an organisation
   # @return [String] the empty string as a causality of setting api_token
-=begin
-  def organisation_id=(new_organisation_id)
-    unless self.can_change_org? || new_organisation_id.nil? || self.organisation.nil?
+  def org_id=(new_org_id)
+    unless self.can_change_org? || new_org_id.nil? || self.org.nil?
       # rip all permissions from the user
       self.perms.delete_all
     end
     # set the user's new organisation
-    super(new_organisation_id)
+    super(new_org_id)
     self.save!
     # rip api permissions from the user
     self.remove_token!
@@ -124,10 +123,9 @@
   # sets a new organisation for the user
   #
   # @param new_organisation [Organisation] the new organisation for the user
-  def organisation=(new_organisation)
-    organisation_id = new_organisation.id unless new_organisation.nil?
+  def organisation=(new_org)
+    org_id = new_org.id unless new_org.nil?
   end
-=end
   
   ##
   # checks if the user is a super admin
diff --git a/app/policies/phase_policy.rb b/app/policies/phase_policy.rb
index 5d43a7e..caa0e3c 100644
--- a/app/policies/phase_policy.rb
+++ b/app/policies/phase_policy.rb
@@ -8,10 +8,10 @@
   end
 
   ##
+  # Org-admin side
   # 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)
diff --git a/app/policies/plan_policy.rb b/app/policies/plan_policy.rb
index d6c8703..aa99a2b 100644
--- a/app/policies/plan_policy.rb
+++ b/app/policies/plan_policy.rb
@@ -7,13 +7,13 @@
     @user = user
     @plan = plan
   end
-  
+
   def show?
     @plan.readable_by?(@user.id)
   end
 
   def edit?
-    @plan.editable_by?(@user.id)
+    @plan.readable_by?(@user.id)
   end
 
   def update_guidance_choices?
diff --git a/app/views/phases/_answer_form_ro.html.erb b/app/views/phases/_answer_form_ro.html.erb
index fcf175d..915db2a 100644
--- a/app/views/phases/_answer_form_ro.html.erb
+++ b/app/views/phases/_answer_form_ro.html.erb
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   **Project: DMPRoadmap
   **Description: This block sets up the type of question, its guidance.
   **Arguments transferred: an instance of "question"
@@ -10,9 +10,10 @@
   <!--question format-->
   <% q_format = question.question_format%>
 
+  <!-- always evaluates to true? readonly isnt even passed to here -->
   <% if readonly != "always" then %>
     <div id="question-form-<%= question.id %>" class="question-form" <%= if readonly == "conditional" then "style='display:none;'" end %>>
-        <%= semantic_form_for answer, :url => {:controller => :answers, :action => :create }, :html=>{:method=>:post}, :remote => true do |f| %>
+        <%= semantic_form_for answer, :url => {:controller => :answers, :action => :update }, :html=>{:method=>:post}, :remote => true do |f| %>
           <%= f.inputs do %>
             <%= f.input :plan_id, :as => :hidden %>
             <%= f.input :user_id, :as => :hidden, :input_html => { :value => current_user.id } %>
@@ -20,10 +21,10 @@
 
             <!-- Question text -->
             <!-- need 'raw' to stop formtastic f.*ing up the formatastic formatting -->
-            <%= raw question.text %>
+            <h4><%= raw question.text %> </h4>
 
             <!--Suggested answer area-->
-            <<% if question.annotations.where('type <> ?',Annotation.types[:example_answer]).any? %>
+            <% if question.annotations.where('type <> ?',Annotation.types[:example_answer]).any? %>
               <% annotation = question.annotations.where('type <> ?',Annotation.types[:example_answer]).order(:created_at).first %>
               <div class="suggested-answer-div">
                 <span class="suggested-answer-intro">
@@ -41,21 +42,21 @@
             <% if q_format.title == _('Check box') || q_format.title == _('Multi select box') || q_format.title == _('Radio buttons') || q_format.title == _('helpers.dropdown') then%>
               <% options = question.options.order("number") %>
               <!--checkbox display-->
-              <% if q_format.title == _('Check box') then %>
-                <% if readonly then %>
+              <% if q_format.title == _('Check box') %>
+                <% if readonly  %>
                   <%= f.input :options, :as => :check_boxes, :collection => options, :label => false, input_html => { :disabled => true, :id => "options-#{question.id}" } %>
                 <% else %>
                   <%= f.input :options, :as => :check_boxes, :collection => options, :label => false, :input_html => { :id => "options-#{question.id}" } %>
                 <% end %>
                 <!--multi select box display-->
-              <% elsif q_format.title == _('Multi select box') then %>
+              <% elsif q_format.title == _('Multi select box') %>
                 <% if readonly then %>
                   <%= f.input :options, :as => :select, :collection => options, :label => false, :input_html => { :multiple => true, :disabled => true , :id => "options-#{question.id}" } %>
                 <% else %>
                   <%= f.input :options, :as => :select, :collection => options, :label => false, :input_html => { :multiple => true , :id => "options-#{question.id}" } %>
                 <% end %>
                 <!--Radio buttons display-->
-              <% elsif q_format.title == _('Radio buttons') then%>
+              <% elsif q_format.title == _('Radio buttons') %>
                 <ol class="choices-group">
                   <% options.each do |op| %>
                     <li class= "choices-group">
@@ -63,31 +64,25 @@
                         <% if readonly then %>
                           <%= f.radio_button :option_ids, op.id, :checked => true, disabled: true, id: "answer_option_ids_#{op.id}"%>
                         <% else %>
-                          <%= f.radio_button :option_ids, op.id, :checked => true, id: "answer_option_ids_#{op.id}"%> 
+                          <%= f.radio_button :option_ids, op.id, :checked => true, id: "answer_option_ids_#{op.id}"%>
                         <% end %>
                       <%else%>
                         <% if readonly then %>
-                          <%= f.radio_button :option_ids,  op.id, :checked => false, disabled: true, id: "answer_option_ids_#{op.id}"%> 
+                          <%= f.radio_button :option_ids,  op.id, :checked => false, disabled: true, id: "answer_option_ids_#{op.id}"%>
                         <% else %>
-                          <%= f.radio_button :option_ids, op.id, :checked => false, id: "answer_option_ids_#{op.id}"%> 
+                          <%= f.radio_button :option_ids, op.id, :checked => false, id: "answer_option_ids_#{op.id}"%>
                         <% end %>
                       <% end %>
                       <%= op.text %> </li>
                   <% end %>
                 </ol>
                 <!--dropdown display-->
-              <% elsif q_format.title == _('Dropdown') then%>
-                <% if readonly then %>
+              <% elsif q_format.title == _('Dropdown') %>
+                <% if readonly  %>
                   <%= f.input :options, :as => :select, :collection => options, :label => false, :input_html => { :multiple => false, :disabled => true, :id => "options-#{question.id}" } %>
                 <% else %>
                   <%= f.input :options, :as => :select, :collection => options, :label => false, :input_html => { :multiple => false, :id => "options-#{question.id}" } %>
                 <% end %>
-              <% end %>
-              <!-- Comment text area for the multiple choice answers-->
-              <% if question.option_comment_display == true then%>
-                <%= label_tag("answer-text-#{question.id}".to_sym, _('Comment')) %>
-                <%= text_area_tag("answer-text-#{question.id}".to_sym, answer.text, class: "tinymce") %>
-              <%end%>
 
               <!--text field display-->
             <% elsif q_format.title == _('Text field') then %>
@@ -96,16 +91,17 @@
             <% elsif q_format.title == _('Text area') then%>
               <%= text_area_tag("answer-text-#{question.id}".to_sym, answer.text, class: "tinymce") %>
             <% end %>
+            <!-- Comment text area for the multiple choice answers-->
+              <% if question.option_comment_display == true then%>
+                <%= label_tag("answer-text-#{question.id}".to_sym, _('Comment')) %>
+                <%= text_area_tag("answer-text-#{question.id}".to_sym, answer.text, class: "tinymce") %>
+              <%end%>
 
           <% end %>
 
           <!--action buttons-->
           <%= f.actions do %>
-            <% if readonly then %>
-              <%= f.action :submit, :label => _('Save'), :button_html => { :class => "btn btn-primary"}, :input_html => { :disabled => true } %>
-            <% else %>
-              <%= f.action :submit, :label => _('Save'), :button_html => { :class => "btn btn-primary"} %>
-            <% end %>
+
             <li id="saving-<%= question.id %>" class="saving-message" style="display:none;"><%= _('Saving...')%></li>
           <% end %>
         <% end %>
@@ -113,7 +109,6 @@
   <% end %>
 
   <div id="question-readonly-<%= question.id %>" class="question-readonly" <%= if readonly == nil then "style='display:none;'" end %>>
-      <h4><%= question.text %></h4>
       <div class="answer-readonly">
         <% if q_format.title == _('Check box') || q_format.title == _('Multi select box') || q_format.title == _('Radio buttons') || q_format.title == _('Dropdown') %>
           <ul class="options">
@@ -134,7 +129,7 @@
   <% if answer.created_at.nil? then %>
     <span id="<%= question.id %>-status" class="label label-warning answer-status"><%= _('Not answered yet') %></span>
   <% else %>
-    <span id="<%= question.id %>-status" class="label label-info answer-status"><%= _('Answered')%><abbr class="timeago" data-time="<%= answer.created_at.iso8601 %>" title="<%= answer.created_at.iso8601 %>"><%= answer.created_at %></abbr><%= _(' by')%><%= answer.user.name %></span>
+    <span id="<%= question.id %>-status" class="label label-info answer-status"><%= _('Answered ')%><abbr class="timeago" data-time="<%= answer.created_at.iso8601 %>" title="<%= answer.created_at.iso8601 %>"><%= answer.created_at %></abbr><%= _(' by ')%><%= answer.user.name %></span>
   <% end %>
   <span id="<%= question.id %>-unsaved" class="label label-inverse answer-unsaved" style="display:none;"><%= _('Unsaved changes') %></span>
 </div>
@@ -143,12 +138,13 @@
 <!-- Question right column -->
 <div class="question-area-right-column">
   <div id="right-area-tabs-<%= question.id %>" class="question_right_column_nav">
-    <% @comments = Notes.where("question_id = ? AND plan_id = ?", question.id, answer.plan_id ) %>
+    <% @comments = answer.notes.all %>
     <%= hidden_field_tag :question_id, question.id, :class => "question_id" %>
 
     <ul class="question_right_column_ul">
       <!-- if we have some guidance on the question or by theme -->
-      <% if (!question.guidance.nil? && question.guidance != "") || !question_guidances.empty?  then %>
+      <% q_guidance = question.get_guidance_annotation(current_user.org) %>
+      <% if (q_guidance.present? && q_guidance.text.present?) || !question_guidances.empty? %>
         <!-- add css to comment div-->
         <% css_style_comment_div = "display: none;"%>
         <% css_style_guidance_div = ""%>
@@ -156,8 +152,8 @@
           <%= link_to _('Guidance'), "#", :class => "guidance_accordion_button" %>
         </li>
         <li class="comment_tab_class">
-          <% if @comments.count > 0 then%>
-            <% comments_label_with_count = "#{_('Notes')} (#{@comments.count})"%>
+          <% if @comments.length > 0 %>
+            <% comments_label_with_count = "#{_('Notes')} (#{@comments.length})"%>
             <%= link_to comments_label_with_count , "#", :class => "comments_accordion_button" %>
           <%else%>
             <%= link_to _('Share note'), "#", :class => "comments_accordion_button" %>
@@ -184,59 +180,56 @@
   <div class="question-guidance" id="guidance-question-area-<%= question.id %>" style="<%= css_style_guidance_div%>" >
     <div class="accordion" id="<%= question.id %>-guidance">
       <!--guidance save with the question-->
-      <% if !question.guidance.nil? && question.guidance != "" then %>
+      <% q_guidance = question.get_guidance_annotation(current_user.org) %>
+      <% if q_guidance.present? && q_guidance.text.present %>
         <div class="accordion-group">
           <div class="accordion-heading">
             <a class="accordion-guidance-link" data-toggle="collapse" data-parent="#<%= question.id %>-guidance" href="#collapse-guidance-<%= question.id%>">
               <div class="accordion_heading_text">
-                <%= question.section.organisation.abbreviation %> 
-                <%if question.section.organisation.abbreviation == "EPSRC" then %>
-                  <%= _('Policy Expectations')%>
-                <%else%>
-                  <%= _('Guidance')%>
-                <%end%>
+                <%= q_guidance.org.abbreviation %>
+                  <%= _(' 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 class="accordion-inner"><%= raw q_guidance.text %></div>
           </div>
         </div>
       <% end %>
       <!--guidance from themes -->
-      <% guidance_accordion_id = 1 %>
-      <% question_guidances.each_pair do |theme, group| %>
-          <% group.each do |gobj| %>
-            <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_accordion_id %>">
-                  <div class="accordion_heading_text">
-                      <%= gobj[:org] %> guidance on <%= theme %>
-                    <% end %>
-                  </div>
-                  <span class="plus-laranja"> </span></a>
-              </div>
-              <div id="collapse-guidance-<%= guidance_accordion_id %>" class="guidance-accordion-body collapse">
-                <div class="accordion-inner"><%= raw gobj[:text] %></div>
-              </div>
-              <% guidance_accordion_id += 1 %>
-            </div>
-          <% end %>
+      <% guidance_accordion_id = 0 %>
+       <% question_guidances.each_pair do |theme, group| %>
+         <% group.each do |gobj| %>
+           <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%>-<%= guidance_accordion_id %>">
+                 <div class="accordion_heading_text">
+                   <%= gobj[:org] %> guidance on <%= theme %>
+                 </div>
+                 <span class="plus-laranja"> </span></a>
+             </div>
+             <div id="collapse-guidance-<%=question.id%>-<%= guidance_accordion_id %>" class="guidance-accordion-body collapse">
+               <div class="accordion-inner"><%= raw gobj[:text] %></div>
+             </div>
+             <% guidance_accordion_id += 1 %>
+           </div>
+         <% end %>   <!-- group.each -->
+       <% end %>   <!-- question_guidances.each_pair -->
       <% end %>
     </div>
   </div>
 
   <!--comment area -->
   <div class="comment-area" id="comment-question-area-<%= question.id %>"  style="<%= css_style_comment_div%>">
-    <%= render :partial => "comments", locals: {questionId: question.id, plan_id: answer.plan_id }%>
+    <%= render :partial => "note", locals: {question: question, plan: @plan, answer: answer }%>
   </div>
 
 
 
 </div>
 <!--display or not the break line between questions-->
-<% if last_question_id == question.id then %>
+<% if last_question_id == question.id %>
   <div class="two-column-clear"></div>
 <% else %>
   <div class="two-column-clear question-divider"></div>
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb
index f91d5f7..3a29a21 100644
--- a/app/views/phases/edit.html.erb
+++ b/app/views/phases/edit.html.erb
@@ -28,10 +28,10 @@
       <!-- verify if the session[:question_id_comments] has been created. -->
       <% if session[:question_id_comments].to_i != 0 then %>
         <% question_from_comment = Question.find(session[:question_id_comments])%>
-        <% if sectionid == question_from_comment.section_id then %>    
+        <% if sectionid == question_from_comment.section_id then %>
           <%= hidden_field_tag :comment_section_id, question_from_comment.section_id, :class => "comment_section_id" %>
-        <%end%>    
-      <% end%>     
+        <%end%>
+      <% end%>
 
       <div class="accordion-group">
 
@@ -91,9 +91,9 @@
                        partialname += "_ro"
                      end
                   %>
-  
+
                   <% guidances = @question_guidance[question.id] %>
-  
+
                   <%= render partial: partialname,
                       locals: {
                         plan: @plan,
@@ -101,9 +101,10 @@
                         question: question,
                         question_guidances: guidances,
                         last_question_id: section.questions.last.id,
+                        readonly: @readonly
                       }
                   %>
-                </div>   <!-- id_css -->    
+                </div>   <!-- id_css -->
               <% end %>   <!-- section.questions -->
             </div>   <!--  loaded -->
           </div>   <!--  accordion-inner -->
diff --git a/app/views/plans/edit.html.erb b/app/views/plans/edit.html.erb
index d44caea..57a7d38 100644
--- a/app/views/plans/edit.html.erb
+++ b/app/views/plans/edit.html.erb
@@ -8,6 +8,7 @@
 
 <!-- render the project title -->
 <%= render :partial => "plan_title", locals: {plan: @plan} %>
+<h1> <%=@readonly%> </h1>
 
 <!-- progress bar -->
 <% status = @plan.status %>
diff --git a/app/views/plans/export.html.erb b/app/views/plans/export.html.erb
index 990af6c..8e79cc4 100644
--- a/app/views/plans/export.html.erb
+++ b/app/views/plans/export.html.erb
@@ -22,7 +22,7 @@
 					%>
 						<tr>
 							<th class="dmp_th_border"><p>- <%= admin_field_t(field.to_s) -%></p></th>
-							<td class="dmp_td_border"><%= value.present? ? value : _('-') -%></td>
+							<td class="dmp_td_border"><%= value.present? ? value : _('-') %></td>
 						</tr>
 						<% end %>
 					</tbody>
diff --git a/app/views/plans/export.pdf.erb b/app/views/plans/export.pdf.erb
index c41b244..874acd4 100644
--- a/app/views/plans/export.pdf.erb
+++ b/app/views/plans/export.pdf.erb
@@ -21,9 +21,10 @@
         <h1><%= @plan.title %></h1>
         <% @exported_plan.admin_details.each do |field|
              value = @exported_plan.send(field)
-             if value.present?
-        %>
-          <p><strong><%= admin_field_t(field.to_s) -%></strong> <%= value -%></p>
+             if value.present? %>
+                <p><strong><%= admin_field_t(field.to_s) -%></strong> <%= value -%></p>
+          <% else %>
+                <p><strong><%= admin_field_t(field.to_s) -%></strong> <%= _('-') %></p>
           <% end %>
         <% end %>
 
diff --git a/test/functional/plans_controller_test.rb b/test/functional/plans_controller_test.rb
index 259bfbf..3811003 100644
--- a/test/functional/plans_controller_test.rb
+++ b/test/functional/plans_controller_test.rb
@@ -107,20 +107,6 @@
     assert assigns(:selected_guidance_groups)
   end
 
-  # GET /plan/:id/edit (edit_plan_path)
-  # ----------------------------------------------------------
-  test 'show the edit plan page' do
-    # Should redirect user to the root path if they are not logged in!
-    try_no_user_and_unauthorized(edit_plan_path(@plan))
-    
-    sign_in @user    
-    get edit_plan_path(@plan)
-    assert_response :success
-    assert assigns(:plan)
-    assert assigns(:phase)
-    assert assigns(:readonly)
-  end
-
   # PUT /plan/:id (plan_path)
   # ----------------------------------------------------------
   test 'update the plan' do