diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb
index a2c5034..5d58414 100644
--- a/app/views/phases/_answer_form.html.erb
+++ b/app/views/phases/_answer_form.html.erb
@@ -126,26 +126,26 @@
           <%= link_to _('Guidance'), "#", :class => "guidance_accordion_button" %>
         </li>
         <li class="comment_tab_class">
-          <% if comments.count > 0 then%>
+          <% if comments.count > 0%>
             <% comments_label_with_count = "#{_('Notes')} (#{comments.count})"%>
             <%= link_to comments_label_with_count , "#", id: "notes_number_#{question_id}", class: "comments_accordion_button" %>
-          <%else%>
+          <% else %>
             <%= link_to _('Share note'), "#", id: "notes_number_#{question_id}", class: "comments_accordion_button" %>
-          <%end%>
+          <% end %>
         </li>
-        <%else%>
+        <% else %>
           <!-- remove the css from comment div-->
           <% css_style_comment_div = ""%>
           <% css_style_guidance_div = "display: none;"%>
           <li>
-            <% if comments.count > 0 then%>
+            <% if comments.count > 0 %>
               <% comments_label_with_count = "#{_('Notes')} (#{comments.count})"%>
               <p id="notes_number_<%=question_id%>" class= "accordion_label"><%= comments_label_with_count %></p>
-            <%else%>
+            <% else %>
               <p id="notes_number_<%=question_id%>" class= "accordion_label"><%= _('Share note') %></p>
-            <%end%>
+            <% end %>
           </li>
-        <%end%>
+        <% end %>
       </ul>
     </div>
 
@@ -171,7 +171,7 @@
 
              <!-- accordion body -->
              <div id="collapse-guidance-<%= question_id%>" class="guidance-accordion-body collapse">
-               <div class="accordion-inner"><%= annotation.text %></div>
+               <div class="accordion-inner"><%= raw annotation.text %></div>
              </div>
 
            </div>   <!-- accordion-group -->
@@ -184,13 +184,13 @@
          <% 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 %>">
+               <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-<%= guidance_accordion_id %>" class="guidance-accordion-body collapse">
+             <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 %>