diff --git a/common/lib/capa/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html
index 106694ea4a..ce1b6d9476 100644
--- a/common/lib/capa/capa/templates/choicegroup.html
+++ b/common/lib/capa/capa/templates/choicegroup.html
@@ -1,13 +1,15 @@
 <form class="choicegroup capa_inputtype" id="inputtype_${id}">
-  % if state == 'unsubmitted':
-  <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
-  % elif state == 'correct': 
-  <span class="correct" id="status_${id}"></span>
-  % elif state == 'incorrect':
-  <span class="incorrect" id="status_${id}"></span>
-  % elif state == 'incomplete':
-  <span class="incorrect" id="status_${id}"></span>
-  % endif
+  <div class="indicator_container">
+    % if state == 'unsubmitted':
+    <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
+    % elif state == 'correct': 
+    <span class="correct" id="status_${id}"></span>
+    % elif state == 'incorrect':
+    <span class="incorrect" id="status_${id}"></span>
+    % elif state == 'incomplete':
+    <span class="incorrect" id="status_${id}"></span>
+    % endif
+  </div>
 
   <fieldset>
     % for choice_id, choice_description in choices:
diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 12046587a3..d5824f38cf 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -42,18 +42,21 @@ section.problem {
       content: url('../images/correct-icon.png');
     }
 
-    > span {
-      padding-right: 20px;
+    min-width:100px; 
+    width: auto !important; 
+    width: 100px;
+
+    .indicator_container {
       float: left;
-      background-position: 0 0  !important;
+      width: 25px;
+      margin-right: 15px;
     }
 
     fieldset {
       @include box-sizing(border-box);
-      float: left;
       border-left: 1px solid #ddd;
       padding-left: 20px;
-      margin: 20px 0;
+      margin: 0px 0px 20px;
     }
 
     input[type="radio"],
@@ -63,8 +66,7 @@ section.problem {
     }
 
     text {
-      display: block;
-      margin-left: 25px;
+      margin-left: 5px;
     }
   }