diff --git a/common/lib/capa/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html
index 457d9e7817..b9d8164321 100644
--- a/common/lib/capa/capa/templates/choicegroup.html
+++ b/common/lib/capa/capa/templates/choicegroup.html
@@ -1,23 +1,35 @@
 <form class="choicegroup capa_inputtype" id="inputtype_${id}">
-  <div class="indicator_container">
-    % if status == 'unsubmitted':
-    <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
-    % elif status == 'correct': 
-    <span class="correct" id="status_${id}"></span>
-    % elif status == 'incorrect':
-    <span class="incorrect" id="status_${id}"></span>
-    % elif status == 'incomplete':
-    <span class="incorrect" id="status_${id}"></span>
-    % endif
-  </div>
 
   <fieldset>
     % for choice_id, choice_description in choices:
-    <label for="input_${id}_${choice_id}">  <input type="${input_type}" name="input_${id}${name_array_suffix}" id="input_${id}_${choice_id}" value="${choice_id}"
+    <label for="input_${id}_${choice_id}">          
+
+        % if choice_id in value:
+        <span class="indicator_container">
+            % if status == 'unsubmitted':
+            <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
+            % elif status == 'correct': 
+            <span class="correct" id="status_${id}"></span>
+            % elif status == 'incorrect':
+            <span class="incorrect" id="status_${id}"></span>
+            % elif status == 'incomplete':
+            <span class="incorrect" id="status_${id}"></span>
+            % endif
+        </span>
+        % else:
+        <span class="indicator_container">&#160;</span>
+        % endif
+        
+        <input type="${input_type}" name="input_${id}${name_array_suffix}" id="input_${id}_${choice_id}" value="${choice_id}"
     % if choice_id in value:
     checked="true"
     % endif
-    /> ${choice_description} </label>
+    />
+    
+    ${choice_description}
+
+    </label>
+
     % endfor
     <span id="answer_${id}"></span>
   </fieldset>
diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 5b9a62a9fd..b705f5146e 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -227,7 +227,7 @@ section.problem {
         background: url('../images/correct-icon.png') center center no-repeat;
         height: 20px;
         position: relative;
-        top: 6px;
+        top: 3px;
         width: 25px;
       }
 
@@ -237,7 +237,7 @@ section.problem {
         height: 20px;
         width: 20px;
         position: relative;
-        top: 6px;
+        top: 3px;
       }
     }