diff --git a/app/views/guidance_groups/_show.html.erb b/app/views/guidance_groups/_show.html.erb
index 58c3c2f..4b21cea 100644
--- a/app/views/guidance_groups/_show.html.erb
+++ b/app/views/guidance_groups/_show.html.erb
@@ -11,17 +11,18 @@
   <% end %>
   <% group.keys.each_with_index do |theme, i| %>
     <div class="panel panel-default">
-      <div class="panel-heading" role="tab" id="heading-<%= i %>">
-        <h2 class="panel-title">
-          <a role="button" data-toggle="collapse" 
-             data-parent="<%= question.id %>-guidance" 
-             href="#collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>-<%= i %>" 
-             aria-controls="collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>-<%= i %>"
-             class="reverse">
-            <i class="fa fa-plus" aria-hidden="true"></i>
+      <div class="heading-button" role="button" data-toggle="collapse"
+           data-parent="<%= question.id %>-guidance" 
+           href="#collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>-<%= i %>"
+           aria-expanded="false" 
+           aria-controls="#collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>-<%= i %>">
+           
+        <div class="panel-heading" role="tab" id="heading-<%= i %>">
+          <h2 class="panel-title">
             <%= theme %>
-          </a>
-        </h2>
+            <i class="fa fa-plus pull-right" aria-hidden="true"></i>
+          </h2>
+        </div>
       </div>
       <div id="collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>-<%= i %>" class="panel-collapse collapse" role="tabpanel"
          aria-labelledby="heading-guidance-<%= question.id %>-<%= guidance_accordion_id %>-<%= i %>">
diff --git a/app/views/org_admin/templates/_edit.html.erb b/app/views/org_admin/templates/_edit.html.erb
index 26d2fce..20ffefd 100644
--- a/app/views/org_admin/templates/_edit.html.erb
+++ b/app/views/org_admin/templates/_edit.html.erb
@@ -36,22 +36,21 @@
         <% template_hash[:template][:phases].each do |phase_no, phase_hash| %>
           <% phase = phase_hash[:data] %>
             <div class="panel panel-default">
-              <div class="panel-heading" role="tab" id="<%= "headingPhase#{phase.id}" %>">
-                <div class="panel-title pull-left">
-                  <%= phase.title %>
+              <div class="heading-button" role="button" data-toggle="collapse"
+                   data-parent="phases_accordion" 
+                   href="#collapsePhase#<%= phase.id %>"
+                   aria-expanded="false" 
+                   aria-controls="#collapsePhase#<%= phase.id %>">
+                   
+                <div class="panel-heading" role="tab" id="<%= "headingPhase#{phase.id}" %>">
+                  <div class="panel-title pull-left">
+                    <%= phase.title %>
+                  </div>
+                  <div class="pull-right">
+                    <i class="fa fa-plus pull-right" aria-hidden="true"></i>
+                  </div>
+                  <div class="clearfix"></div>
                 </div>
-                <div class="panel-title pull-right">
-                  <a
-                    role="button"
-                    data-toggle="collapse"
-                    data-parent="phases_accordion" 
-                    href="<%= "#collapsePhase#{phase.id}" %>"
-                    aria-expanded="false" 
-                    aria-controls="<%= "collapsePhase#{phase.id}" %>">
-                      <i class="fa fa-plus" aria-hidden="true"></i>
-                  </a>
-                </div>
-                <div class="clearfix"></div>
               </div>
               <div id="<%= "collapsePhase#{phase.id}" %>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="<%= "headingPhase#{phase.id}" %>">
                 <div class="panel-body">
diff --git a/app/views/phases/_admin_show.html.erb b/app/views/phases/_admin_show.html.erb
index 6a14519..4c9b8fa 100644
--- a/app/views/phases/_admin_show.html.erb
+++ b/app/views/phases/_admin_show.html.erb
@@ -35,22 +35,21 @@
     <div class="panel-group" id="sections_accordion" role="tablist">
       <% phase.sections.each do |section| %>
         <div class="panel panel-default">
-          <div class="panel-heading" role="tab" id="<%= "headingSection#{section.id}" %>">
-            <div class="panel-title pull-left">
-              <%= section.title %>
+          <div class="heading-button" role="button" data-toggle="collapse"
+               data-parent="sections-accordion" 
+               href="#collapseSection<%= section.id%>"
+               aria-expanded="false" 
+               aria-controls="#collapseSection<%= section.id%>">
+
+            <div class="panel-heading" role="tab" id="<%= "headingSection#{section.id}" %>">
+              <div class="panel-title pull-left">
+                <%= section.title %>
+              </div>
+              <div class="pull-right">
+                <i class="fa fa-plus pull-right" aria-hidden="true"></i>
+              </div>
+              <div class="clearfix"></div>
             </div>
-            <div class="panel-title pull-right">
-              <a
-                role="button"
-                data-toggle="collapse"
-                data-parent="#sections-accordion"
-                href="#collapseSection<%= section.id%>"
-                aria-expanded="false"
-                aria-controls="#collapseSection<%= section.id%>">
-                  <i class="fa fa-plus" aria-hidden="true"></i>
-                </a>
-            </div>
-            <div class="clearfix"></div>
           </div>
           <div
             id="<%= "collapseSection#{section.id}" %>"
diff --git a/app/views/phases/_edit_plan_answers.html.erb b/app/views/phases/_edit_plan_answers.html.erb
index 7f76823..41445ac 100644
--- a/app/views/phases/_edit_plan_answers.html.erb
+++ b/app/views/phases/_edit_plan_answers.html.erb
@@ -27,27 +27,24 @@
     <% phase.sections.order(:number).each do |section| %>
       <% sectionid = section.id %>
       <div class="panel panel-default">
-        <div class="panel-heading" role="tab" id="heading-<%= sectionid %>">
-          <div class="panel-title pull-left">
-            <%= section.title %> 
-            <% if plan.present? %>
-                <span class="section-progress-<%= sectionid %>">
-                  <%= render :partial => "/sections/progress", locals: { section: section, plan: plan } %>
-                </span>
-            <% end %>
+        <div class="heading-button" role="button" data-toggle="collapse"
+             data-parent="sections-accordion" 
+             href="#collapse-<%= sectionid %>"
+             aria-expanded="false" 
+             aria-controls="collapse-<%= sectionid %>">
+
+          <div class="panel-heading" role="tab" id="heading-<%= sectionid %>">
+            <div class="panel-title pull-left">
+              <%= section.title %> 
+              <% if plan.present? %>
+                  <span class="section-progress-<%= sectionid %>">
+                    <%= render :partial => "/sections/progress", locals: { section: section, plan: plan } %>
+                  </span>
+              <% end %>
+            </div>
+            <i class="fa fa-plus pull-right" aria-hidden="true"></i>
+            <div class="clearfix"></div>
           </div>
-          <div class="panel-title pull-right">
-            <a
-              role="button"
-              data-toggle="collapse"
-              data-parent="sections-accordion" 
-              href="#collapse-<%= sectionid %>"
-              aria-expanded="false" 
-              aria-controls="collapse-<%= sectionid %>">
-                <i class="fa fa-plus" aria-hidden="true"></i>
-            </a>
-          </div>
-          <div class="clearfix"></div>
         </div>
         <div id="collapse-<%= sectionid %>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-<%= sectionid %>">
           <div class="panel-body"><!-- accordion body -->
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index 4a835e2..a489166 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -162,9 +162,10 @@
                    locals: {choices: @all_ggs_grouped_by_org, form: f, 
                             current_selections: @selected_guidance_groups} %>
       </ul>
+
+      <p><%= _('Find guidance from additional organisations below') %></p>
+      <%= link_to 'see the full list', select_guidances_list_plan_path(@plan), 'data-toggle' =>  'modal', 'data-target' => '#modal-full-guidances', class: 'modal-guidances-window' %>
+      <div id="modal-full-guidances" class="modal" tabindex="-1" role="dialog"></div>
     </div>
-    <p><%= _('Find guidance from additional organisations below') %></p>
-    <%= link_to 'see the full list', select_guidances_list_plan_path(@plan), 'data-toggle' =>  'modal', 'data-target' => '#modal-full-guidances', class: 'modal-guidances-window' %>
-    <div id="modal-full-guidances" class="modal" tabindex="-1" role="dialog"></div>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/plans/_overview_details.html.erb b/app/views/plans/_overview_details.html.erb
index 526ed8b..6949ebf 100644
--- a/app/views/plans/_overview_details.html.erb
+++ b/app/views/plans/_overview_details.html.erb
@@ -21,19 +21,24 @@
       <div class="panel-group" id="plan-overview-accordion" role="tablist" aria-multiselectable="true">
         <% plan.template.phases.each do |p| %>
           <div class="panel panel-default">
-            <div class="panel-heading" role="tab" id="plan-overview-heading-<%= p.id %>">
-              <div class="panel-title">
-                <div class="pull-left">
-                  <%= _("%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})") % {
-                    :phase_title => p.title, :sections_size => p.sections.size, :sections => n_('section', 'sections', p.sections.size),
-                    :questions_size => p.questions.size, :questions => n_('question', 'questions', p.questions.size) } %>
+            <div class="heading-button" role="button" data-toggle="collapse"
+                 data-parent="plan-overview-accordion" 
+                 href="#plan-overview-collapse-<%= p.id %>"
+                 aria-expanded="false" 
+                 aria-controls="#plan-overview-collapse-<%= p.id %>">
+
+              <div class="panel-heading" role="tab" id="plan-overview-heading-<%= p.id %>">
+                <div class="panel-title">
+                  <div class="pull-left">
+                    <%= _("%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})") % {
+                      :phase_title => p.title, :sections_size => p.sections.size, :sections => n_('section', 'sections', p.sections.size),
+                      :questions_size => p.questions.size, :questions => n_('question', 'questions', p.questions.size) } %>
+                  </div>
+                  <div class="pull-right">
+                    <i class="fa fa-plus pull-right" aria-hidden="true"></i>
+                  </div>
+                  <div class="clearfix"></div>
                 </div>
-                <div class="pull-right">
-                  <%= link_to(raw('<i class="fa fa-plus" aria-hidden="true"></i>'), "#plan-overview-collapse-#{p.id}",
-                    role: 'button', 'data-toggle': 'collapse', 'data-parent': 'plan-overview-accordion',
-                    'aria-extended': false, 'aria-controls': "#plan-overview-collapse-#{p.id}") %>
-                </div>
-                <div class="clearfix"></div>
               </div>
             </div>
             <div id="plan-overview-collapse-<%= p.id %>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="plan-overview-heading-<%= p.id %>">
diff --git a/lib/assets/javascripts/utils/panelHeading.js b/lib/assets/javascripts/utils/panelHeading.js
index 48a71be..194657f 100644
--- a/lib/assets/javascripts/utils/panelHeading.js
+++ b/lib/assets/javascripts/utils/panelHeading.js
@@ -1,5 +1,5 @@
 $(() => {
-  $('.panel-heading a').on('click', (e) => {
+  $('.heading-button').on('click', (e) => {
     $(e.currentTarget).find('i.fa').toggleClass('fa-plus').toggleClass('fa-minus');
   });
 });
diff --git a/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss
index 8231ec9..da0f835 100644
--- a/lib/assets/stylesheets/overrides.scss
+++ b/lib/assets/stylesheets/overrides.scss
@@ -124,7 +124,7 @@
 .panel-default {
   border-color: $grey;
 }
-.panel-default > .panel-heading {
+.heading-button > .panel-heading, .panel-default > .panel-heading {
   background-color: $grey;
   color: $white;
   border-top-right-radius: 0px;