diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 0ad6a26995..07db43c502 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -306,6 +306,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                       'grammar': 1,
                       # needs to be after all the other feedback
                       'markup_text': 3}
+        do_not_render = ['topicality', 'prompt-overlap']
 
         default_priority = 2
 
@@ -360,6 +361,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             if len(feedback) == 0:
                 return format_feedback('errors', 'No feedback available')
 
+            for tag in do_not_render:
+                if tag in feedback:
+                    feedback.pop(tag)
+
             feedback_lst = sorted(feedback.items(), key=get_priority)
             feedback_list_part1 = u"\n".join(format_feedback(k, v) for k, v in feedback_lst)
         else:
diff --git a/lms/templates/open_ended_feedback.html b/lms/templates/open_ended_feedback.html
index 7fffddb88f..c169198040 100644
--- a/lms/templates/open_ended_feedback.html
+++ b/lms/templates/open_ended_feedback.html
@@ -1,17 +1,14 @@
 <section>
-    <header>Feedback</header>
+    <header></header>
     <div class="shortform-custom" data-open-text='Show detailed results' data-close-text='Hide detailed results'>
         <div class="result-output">
             <p>Score: ${score}</p>
-            % if grader_type == "ML":
-                <p>Check below for full feedback:</p>
-            % endif
+            ${rubric_feedback | n}
         </div>
     </div>
     <div class="longform">
         <div class="result-output">
             ${ feedback | n}
         </div>
-        ${rubric_feedback | n}
     </div>
 </section>
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index c340da3af7..3f3eb95629 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -1,11 +1,11 @@
 <form class="rubric-template" id="inputtype_${id}" xmlns="http://www.w3.org/1999/html">
-    <h3>Rubric</h3>
     % if view_only and has_score:
-    <p>This is the rubric that was used to grade your submission. The highlighted selection matches how the grader feels you performed in each category.</p>
+        <p></p>
     % elif view_only:
-    <p>Use the below rubric to rate this submission.</p>
+        <p>Use the below rubric to rate this submission.</p>
     % else:
-    <p>Select the criteria you feel best represents this submission in each category.</p>
+        <h3>Rubric</h3>
+        <p>Select the criteria you feel best represents this submission in each category.</p>
     % endif
     <div class="rubric">
         % for i in range(len(categories)):
@@ -14,23 +14,25 @@
             <ul class="rubric-list">
                 % for j in range(len(category['options'])):
                 <% option = category['options'][j] %>
-                %if option['selected']:
-                <li class="selected-grade">
+                    %if option['selected']:
+                        <li class="selected-grade">
                     %else:
-                <li>
+                        <li>
                     % endif
                     % if view_only:
-                    ## if this is the selected rubric block, show it highlighted
-                    <div class="rubric-label">
-                        ${option['points']} points : ${option['text']}
-                    </div>
+                        % if option['selected']:
+                            ## if this is the selected rubric block, show it highlighted
+                            <div class="rubric-label">
+                                ${option['points']} points : ${option['text']}
+                            </div>
+                        % endif
                     % else:
-                    <label class="rubric-label" for="score-${i}-${j}">
-                        <input type="radio" class="score-selection" name="score-selection-${i}" id="score-${i}-${j}" value="${option['points']}"/>
-                        <span class="wrappable"> ${option['points']} points : ${option['text']}</span>
-                    </label>
+                        <label class="rubric-label" for="score-${i}-${j}">
+                            <input type="radio" class="score-selection" name="score-selection-${i}" id="score-${i}-${j}" value="${option['points']}"/>
+                            <span class="wrappable"> ${option['points']} points : ${option['text']}</span>
+                        </label>
                     % endif
-                </li>
+                    </li>
                 % endfor
             </ul>
         % endfor