diff --git a/app/views/annotations/_show.html.erb b/app/views/annotations/_show.html.erb
index 8f2898a..969c323 100644
--- a/app/views/annotations/_show.html.erb
+++ b/app/views/annotations/_show.html.erb
@@ -1,11 +1,10 @@
 <!--show annotations. annotation is passed as an argument-->
 <h3 class="accordion_heading_text">
-  <% if annotation.type == :example_answer %>
+  <%= (plan.template.org.abbreviation.present? ? plan.template.org.abbreviation : plan.template.org.name) %>
+  <% if annotation.example_answer? %>
     <%= _('Example Answer') %>
-  <% elsif annotation.type == :guidance %>
-    <%= _('Guidance') %>
   <% else %>
-    <%= (plan.template.org.abbreviation.present? ? plan.template.org.abbreviation : plan.template.org.name) %>
+    <%= _('Guidance') %>
   <% end %>
   <span class="fa fa-plus" aria-hidden="true"></span>
 </h3>
diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb
index 843ea9e..baa548a 100644
--- a/app/views/phases/edit.html.erb
+++ b/app/views/phases/edit.html.erb
@@ -95,7 +95,7 @@
                       end
                     end
                     %>
-                    
+
                     <!-- Answer Section -->
                     <div class="question-div edit-plan-left">
                       <div class="question-form">
@@ -116,17 +116,9 @@
                     </div>
                   </div>   <!-- id_css -->
                 <% end %> <!-- section.questions -->
-            
+
               </div>   <!--  loaded -->
-              
-              <!-- pop up about unsaved answers -->
-							<div id="section-<%= sectionid %>-collapse-alert" class="modal" style="display:none" role="dialog"
-									 aria-label="<%= _("Unsaved Answers Alert") %>" 
-									 aria-describedby="#section-<%= sectionid %>-collapse-alert-plural">
-							
-								
-							</div>
-							
+
               <div id="section-<%= sectionid %>-collapse-alert" data-container="body" class="modal" 
                    role="dialog" aria-label="<%= _("Unsaved Answers Alert") %>" 
                    aria-describedby="#section-<%= sectionid %>-collapse-alert-plural" style="display: none;">
diff --git a/lib/assets/javascripts/views/answers/status.js b/lib/assets/javascripts/views/answers/status.js
index 6debe9a..57caeba 100644
--- a/lib/assets/javascripts/views/answers/status.js
+++ b/lib/assets/javascripts/views/answers/status.js
@@ -17,7 +17,7 @@
                 return funcs[id];
             },
             set: function(id, func){
-                funcs[id] = DMPROADMAP.debounce(func, 5000);
+                funcs[id] = DMPROADMAP.debounce(func, 1000);
             }
         }
     })();
@@ -42,8 +42,6 @@
     });
     // Listener for changes at any element value from question-form
     $('.question-form').on('change', 'form.answer fieldset input, form.answer fieldset select', function(){
-        var unsaved = $(this).closest('.question-form').find('.answer-unsaved');
-        unsaved.css('visibility', 'visible');
         var notAnswered = $(this).closest('.question-form').find('.not-answered');
         notAnswered.hide();
     });
@@ -58,8 +56,6 @@
     // Function bounded to Jquery scope that setup event handlers for tinymce instances
     $.fn.tinymce_answer_events = function(editor){
         editor.on('change', function(){
-            var unsaved = $('#'+editor.id).closest('.question-form').find('.answer-unsaved');
-            unsaved.css('visibility', 'visible');
             var notAnswered = $('#'+editor.id).closest('.question-form').find('.not-answered');
             notAnswered.hide();
         });
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss
index 3af4d6d..b8299f4 100644
--- a/lib/assets/stylesheets/dmproadmap/forms.scss
+++ b/lib/assets/stylesheets/dmproadmap/forms.scss
@@ -753,16 +753,6 @@
     }
   }
 
-  .answer-unsaved {
-    width: auto;
-    max-width: 200px;
-    text-align: center;
-    color: $error-color;
-    background: $error-background;
-    padding: 5px 10px;
-    border-radius: 3px;
-  }
-
   .section-description {
     width: 60%;
   }
@@ -785,6 +775,8 @@
     }
     .suggested-answer-border {
       margin-top: -20px;
+      max-height: 200px;
+      overflow: scroll;
     }
   }
 
@@ -810,6 +802,9 @@
     .tab-panel {
       min-height: auto;
     }
+    .question-guidance .expand-collapse-all {
+      margin-bottom: 5px;
+    }
   }
 
   .comment-area {