diff --git a/app/views/branded/answers/_new_edit.html.erb b/app/views/branded/answers/_new_edit.html.erb
index 182578d..47c2565 100644
--- a/app/views/branded/answers/_new_edit.html.erb
+++ b/app/views/branded/answers/_new_edit.html.erb
@@ -63,7 +63,7 @@
     <% elsif question.question_format.number? %>
         <%= render(partial: 'questions/new_edit_question_numberfield', locals: { f: f, question: question, answer: answer }) %>
     <% elsif question.question_format.textarea? %>
-        <%= render(partial: 'questions/new_edit_question_textarea', locals: { f: f, question: question, answer: answer, locking: locking }) %>
+        <%= render(partial: 'questions/new_edit_question_textarea', locals: { f: f, question: question, answer: answer, locking: locking, readonly: readonly}) %>
     <% end %>
     <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
   </fieldset>
diff --git a/app/views/branded/layouts/_branding.html.erb b/app/views/branded/layouts/_branding.html.erb
index 025a954..f1da75d 100644
--- a/app/views/branded/layouts/_branding.html.erb
+++ b/app/views/branded/layouts/_branding.html.erb
@@ -65,7 +65,7 @@
               <%= _('Admin') %>
               <span class="caret"></span>
             </a>
-            <ul class="dropdown-menu dmpopidor-dropdow" aria-labelledby="admin-menu">
+            <ul class="dropdown-menu dmpopidor-dropdown" aria-labelledby="admin-menu">
               <% if current_user.can_org_admin? %>
                 <li <%= 'class=active' if active_page?(org_admin_plans_path) %>>
                   <%= link_to _('Plans'), org_admin_plans_path %>
diff --git a/app/views/branded/plans/_edit_details.html.erb b/app/views/branded/plans/_edit_details.html.erb
index 1087935..90cc163 100644
--- a/app/views/branded/plans/_edit_details.html.erb
+++ b/app/views/branded/plans/_edit_details.html.erb
@@ -152,7 +152,7 @@
     <div class="col-md-5 guidance-configuration">
       <h2><%= _('Plan Guidance Configuration') %></h2>
 
-      <% if @all_guidance_groups.length > 0 %><% if @all_guidance_groups.length > 0 %>
+      <% if @all_guidance_groups.length > 0 %>
         <p><%= _('To help you write your plan, %{application_name} can show you guidance from a variety of organisations.') %
             {application_name: Rails.configuration.branding[:application][:name]} %>
             </p>
diff --git a/app/views/branded/plans/_form_v2.html.erb b/app/views/branded/plans/_form_v2.html.erb
index 1424c96..3fe8203 100644
--- a/app/views/branded/plans/_form_v2.html.erb
+++ b/app/views/branded/plans/_form_v2.html.erb
@@ -101,7 +101,7 @@
           <%= d_('dmpopidor', 'Multiple templates are available, which one would you like to use?') %>
         </h2>
         <!-- Hidden field to store the URL from which to get available templates (async) -->
-        <%= hidden_field_tag 'template-option-target', org_admin_template_options_path %>
+        <%= hidden_field_tag 'template-option-target', template_options_path %>
         <div class="form-group row">
           <div class="col-md-6">
             <%= select_tag(:plan_template_id, "<option value=\"-1\">#{_('Please select a template')}</option>", name: 'plan[template_id]', class: 'form-control', 'aria-describedby': 'template-selection') %>
diff --git a/app/views/plans/_download_form.html.erb b/app/views/plans/_download_form.html.erb
index ef26ab3..7a4377e 100644
--- a/app/views/plans/_download_form.html.erb
+++ b/app/views/plans/_download_form.html.erb
@@ -113,9 +113,5 @@
     </div>
   </div>
 
-<<<<<<< HEAD
-  <%= button_tag(_('Download Plan'), class: "btn btn-primary", type: "submit") %>
-=======
   <%= button_tag(sanitize(_('Download Plan <em class="sr-only">(new window)</em>')), class: "btn btn-primary", type: "submit") %>
->>>>>>> 4d9665ef8c76736ac750fe6ed0763da26be2a0f3
 <% end %>