diff --git a/app/views/branded/guidance_groups/_index_by_theme.html.erb b/app/views/branded/guidance_groups/_index_by_theme.html.erb
new file mode 100644
index 0000000..624c1f7
--- /dev/null
+++ b/app/views/branded/guidance_groups/_index_by_theme.html.erb
@@ -0,0 +1,57 @@
+<%# locals{ question, dataset, guidance_groups_by_theme } %>
+<% parent_id = guidance_groups_by_theme.object_id %>
+<div id="<%= parent_id %>" class="panel-group" role="tablist" aria-multiselectable="true">
+  <div id="guidance-accordion-controls">
+    <div class="accordion-controls" data-parent="<%= parent_id %>">
+      <a href="#" data-toggle-direction="show"><%= _('expand all') %></a>
+        <span>|</span>
+      <a href="#" data-toggle-direction="hide"><%= _('collapse all') %></a>
+    </div>
+  </div>
+  <% guidance_groups_by_theme.each_pair do |guidance_group, theme_hash| %>
+    <% guidances_output = [] %>
+    <% theme_hash.each_pair do |theme, guidances| %>
+      <% question_guidance_id = "#{question.object_id}-#{guidances.object_id}-dataset-#{dataset.id}" %>
+      <%# if guidances with this theme have not been output %>
+      <% if (guidances.map(&:id) - guidances_output).any? %>
+        <div class="panel panel-default">
+          <div
+            class="heading-button"
+            role="button"
+            data-toggle="collapse"
+            href="<%= "##{question_guidance_id}" %>"
+            aria-expanded="false"
+            aria-controls="<%= "##{question_guidance_id}" %>">
+            <div class="panel-heading" role="tab" id="<%= "panel-heading-#{question_guidance_id}" %>">
+              <h2 class="panel-title">
+                <%= theme.title %>
+                <i class="fa fa-plus pull-right" aria-hidden="true"></i>
+              </h2>
+            </div>
+          </div>
+          <div
+            id="<%= "#{question_guidance_id}" %>"
+            class="panel-collapse collapse"
+            role="tabpanel"
+            aria-labelledby="<%= "panel-heading-#{question_guidance_id}" %>">
+            <div class="panel-body">
+              <% multiple = false %>
+              <% guidances.each do |guidance| %>
+                <% if multiple %>
+                  <hr>
+                <% end %>
+                <p>
+                  <% unless guidances_output.include?(guidance.id) %>
+                    <%= sanitize(guidance.text) %>
+                    <% guidances_output << guidance.id %>
+                    <% multiple = true %>
+                  <% end %>
+                </p>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/branded/phases/_guidances_notes.html.erb b/app/views/branded/phases/_guidances_notes.html.erb
index 6e7e6ac..6cb8045 100644
--- a/app/views/branded/phases/_guidances_notes.html.erb
+++ b/app/views/branded/phases/_guidances_notes.html.erb
@@ -63,7 +63,7 @@
                     <% end %>
                     <% if tab[:groups].present? %>
                       <%= render partial: 'guidance_groups/index_by_theme',
-                          locals: { question: question, guidance_groups_by_theme: tab[:groups] } %>
+                          locals: { question: question, dataset: dataset, guidance_groups_by_theme: tab[:groups] } %>
                     <% end %>
                   </div>
                 </div>