diff --git a/common/lib/xmodule/xmodule/crowdsource_hinter.py b/common/lib/xmodule/xmodule/crowdsource_hinter.py
index ebb07506cb..147de956af 100644
--- a/common/lib/xmodule/xmodule/crowdsource_hinter.py
+++ b/common/lib/xmodule/xmodule/crowdsource_hinter.py
@@ -227,7 +227,7 @@ class CrowdsourceHinterModule(CrowdsourceHinterFields, XModule):
                 if not rand_hint in hints:
                     go_on = True
             hints.append(rand_hint)
-            self.previous_answers += [[hint_index, [hint_answer]]]
+            self.previous_answers += [[hint_answer, [hint_index]]]
         return {'hints': hints,
                 'answer': answer}
 
@@ -281,7 +281,6 @@ class CrowdsourceHinterModule(CrowdsourceHinterFields, XModule):
                         except KeyError:
                             # Sometimes, the hint that a user saw will have been deleted by the instructor.
                             continue
-
         return {'answer_to_hints': answer_to_hints,
                 'user_submissions': self.user_submissions}
 
diff --git a/common/templates/hinter_display.html b/common/templates/hinter_display.html
index ebd98e09bd..4050824c5b 100644
--- a/common/templates/hinter_display.html
+++ b/common/templates/hinter_display.html
@@ -46,7 +46,7 @@
             % for hint_pk, hint_text in pk_dict.items():
                 <p>
                 <input class="vote" data-answer="${answer}" data-hintno="${hint_pk}" type="button" value="Vote">
-                ${answer}: ${hint_text}
+                ${hint_text}
                 </p>
             % endfor
         % endfor
@@ -71,7 +71,7 @@
             <div class = "previous-answer" id="previous-answer-${unspace(answer)}" data-answer="${answer}">
             <div class = "hint-inner-container">
                 <p>
-                What hint would you give a student who made the same mistake you did?  Please don't give away the answer.
+                What hint would you give a student who also arrived at an answer of ${answer}?  Please don't give away the correct answer.
                 </p>
                 <textarea cols="50" class="custom-hint" data-answer="${answer}">
 What would you say to help someone who got this wrong answer?