diff --git a/app/views/guidance_groups/_show.html.erb b/app/views/guidance_groups/_show.html.erb
index 2238f91..8c311d4 100644
--- a/app/views/guidance_groups/_show.html.erb
+++ b/app/views/guidance_groups/_show.html.erb
@@ -9,16 +9,14 @@
       </div>
     </div>
   <% end %>
-
-  <% i = 0 %>
   <% group.keys.each do |theme| %>
     <div class="panel panel-default">
       <div class="panel-heading" role="tab" id="headingA">
         <h2 class="panel-title">
           <a role="button" data-toggle="collapse" 
              data-parent="<%= question.id %>-guidance" 
-             href="#collapse-guidance-<%= guidance_accordion_id %>-<%= i %>" 
-             aria-controls="collapse-guidance-<%= guidance_accordion_id %>-<%= i %>"
+             href="#collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>" 
+             aria-controls="collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>"
              class="reverse">
             <span class="fa fa-plus" aria-hidden="true"></span>
             <%= theme %>
@@ -27,14 +25,13 @@
       </div>
     </div>
 
-    <div id="collapse-guidance-<%= guidance_accordion_id %>-<%= i %>" class="panel-collapse collapse" role="tabpanel"
-         aria-labelledby="heading-guidance-<%= guidance_accordion_id %>-<%= i %>">
+    <div id="collapse-guidance-<%= question.id %>-<%= guidance_accordion_id %>" class="panel-collapse collapse" role="tabpanel"
+         aria-labelledby="heading-guidance-<%= question.id %>-<%= guidance_accordion_id %>">
       <div class="panel-body">
         <% group[theme].each do |guidance| %>
           <%= raw guidance %>
         <% end %>
       </div>
     </div>
-    <% i += 1 %>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/phases/_guidances_notes.html.erb b/app/views/phases/_guidances_notes.html.erb
index b6d53f1..3545372 100644
--- a/app/views/phases/_guidances_notes.html.erb
+++ b/app/views/phases/_guidances_notes.html.erb
@@ -68,15 +68,13 @@
         <% end %>
 
         <% guidance_accordion_id = 0 %>
-        <% guidance_set.keys.each do |group| %>
+        <% guidance_set.keys.each_with_index do |i, group| %>
           <% obj = guidance_groups.select{ |gg| gg.name == group }.first %>
-          <% i = 0 %>
           <% if obj.present? %>
-            <div id="guidance-<%= question.id %>-<%= obj.id %>" role="tabpanel" class="tab-pane">
+            <div id="guidance-<%= question.id %>-<%= obj.id %>" role="tabpanel" class="tab-pane<%= annotations.present? ? '' : ' active' %>">
+              <% accordion_id = "#{gg.id}-#{i}" %>
               <%= render partial: 'guidance_groups/show', 
-                         locals: { group: guidance_set[group], question: question, guidance_accordion_id: guidance_accordion_id } %>
-              <% guidance_accordion_id += 1 %>
-              <% i += 1 %>
+                         locals: { group: guidance_set[group], question: question, guidance_accordion_id: accordion_id } %>
             </div>
           <% end %>
         <% end %>