diff --git a/edivorce/apps/core/templates/pdf/form37.html b/edivorce/apps/core/templates/pdf/form37.html
index 6678a4d2..914ce6a5 100644
--- a/edivorce/apps/core/templates/pdf/form37.html
+++ b/edivorce/apps/core/templates/pdf/form37.html
@@ -269,7 +269,7 @@
           </li>
 
           <li>  <!-- 7 -->
-  {% if 'None' in responses.special_extraordinary_expenses %}
+  {% if responses.special_extraordinary_expenses == 'NO'%}
             Expenses under section 7 of the Child Support Guidelines are not
             included in the proposed order.
   {% else %}
diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html
index ad90981e..f6c02976 100644
--- a/edivorce/apps/core/templates/question/06_children_income_expenses.html
+++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html
@@ -350,7 +350,7 @@
 
     <div class="question-well">
         <h3>
-            Are there any
+            Are you claiming any
             <span class="tooltip-link"
                   data-toggle="tooltip" data-placement="right" data-html="true"
                   title="
@@ -366,47 +366,15 @@
                     special and extraordinary expenses<i class="fa fa-question-circle" aria-hidden="true"></i>
             </span>?
         </h3>
-        <div class="checkbox-group">
-            <div class="checkbox">
-                <label>{% input_field type="checkbox" name="special_extraordinary_expenses" value="None" data_checkbox_radio="true" data_checkbox_radio_state_set="false" data_target_id="fact_sheet_a" data_reveal_target="false" %}
-                    <b>None</b>
-                </label>
-            </div>
-            <div class="checkbox">
-                <label>{% input_field type="checkbox" name="special_extraordinary_expenses" value="Children's Child Care" class="positive-reveal" data_checkbox_radio="true" data_checkbox_radio_state_set="true" data_target_id="fact_sheet_a" data_reveal_target="true" data_reveal_control_group=".positive-reveal" %}
-                    <b>Children's Child Care</b>
-                </label>
-            </div>
-            <div class="checkbox">
-                <label>{% input_field type="checkbox" name="special_extraordinary_expenses" value="Medical" class="positive-reveal" data_checkbox_radio="true" data_checkbox_radio_state_set="true" data_target_id="fact_sheet_a" data_reveal_target="true" data_reveal_control_group=".positive-reveal"%}
-                    <b>Medical</b>
-                </label>
-                <p>
-                    Health-related expenses that exceed insurance reimbursement by at least $100 per year, including
-                    orthodontic
-                    treatments, counseling, physiotherapy, occupational therapy, speech therapy, hearing therapy,
-                    prescription
-                    drugs, hearing aids, glasses, and contact lenses
-                </p>
-            </div>
-            <div class="checkbox">
-                <label>{% input_field type="checkbox" name="special_extraordinary_expenses" value="Education" class="positive-reveal"  data_checkbox_radio="true" data_checkbox_radio_state_set="true" data_target_id="fact_sheet_a" data_reveal_target="true" data_reveal_control_group=".positive-reveal"%}
-                    <b>Education</b>
-                </label>
-                <p>
-                    Expenses for post-secondary education, tutoring, private school (if the child was attending private
-                    school before the separation and the parents can afford the expense)
-                </p>
-            </div>
-            <div class="checkbox">
-                <label>{% input_field type="checkbox" name="special_extraordinary_expenses" value="Extraordinary extracurricular activity expenses" class="positive-reveal"  data_checkbox_radio="true" data_checkbox_radio_state_set="true" data_target_id="fact_sheet_a" data_reveal_target="true" data_reveal_control_group=".positive-reveal"%}
-                    <b>Extraordinary extracurricular activity expenses</b>
-                </label>
-                <p>
-                    Expenses for activities in which the child excels and is shown to be particularly gifted (for example,
-                    expenses for a child who is a gifted figure skater, but not expenses for general skating lessons)
-                </p>
-            </div>
+
+        <div class="btn-radio-group" data-toggle="buttons">
+            <label class="btn btn-radio">
+                {% input_field type="radio" name="special_extraordinary_expenses" autocomplete="off" value="YES" data_target_id="fact_sheet_a" data_reveal_target="true" %} Yes
+            </label>
+
+            <label class="btn btn-radio">
+                {% input_field type="radio" name="special_extraordinary_expenses" autocomplete="off" value="NO" data_target_id="fact_sheet_a" data_reveal_target="false" %} No
+            </label>
         </div>
     </div>
 
diff --git a/edivorce/apps/core/templates/question/06_children_what_for.html b/edivorce/apps/core/templates/question/06_children_what_for.html
index c7d52295..b3e74db2 100644
--- a/edivorce/apps/core/templates/question/06_children_what_for.html
+++ b/edivorce/apps/core/templates/question/06_children_what_for.html
@@ -82,13 +82,11 @@
                 Federal Child Support Guidelines
             </a>amount based on the income of the payor(s)?
         </h3>
-        <div class="radio">
-            <label>
+        <div class="btn-radio-group" data-toggle="buttons">
+            <label class="btn btn-radio">
                 {% input_field type="radio" name="does_payour_amount_match_guidelines" value="YES" data_target_id="amount_does_not_match" data_reveal_target="false" data_reveal_force_hide_group=".hide-grouping" %} Yes
             </label>
-        </div>
-        <div class="radio">
-            <label>
+            <label class="btn btn-radio">
                 {% input_field type="radio" name="does_payour_amount_match_guidelines" value="NO" data_target_id="amount_does_not_match" data_reveal_target="true" %} No
             </label>
         </div>
@@ -96,13 +94,11 @@
 
     <div class="question-well support-amount-match hide-grouping" id="amount_does_not_match" hidden>
         <h3>Do you and the other parent agree (have consented) on the child support amount?</h3>
-        <div class="radio">
-            <label>
+        <div class="btn-radio-group" data-toggle="buttons">
+            <label class="btn btn-radio">
                 {% input_field type="radio" name="claimants_agree_to_child_support_amount" value="YES" data_target_id="what_special_provisions" data_reveal_target="false" %} Yes
             </label>
-        </div>
-        <div class="radio">
-            <label>
+            <label class="btn btn-radio">
                 {% input_field type="radio" name="claimants_agree_to_child_support_amount" value="NO" data_target_id="what_special_provisions" data_reveal_target="true" %} No
             </label>
         </div>
@@ -112,30 +108,6 @@
         <h3>What special provisions have been made?</h3>
         {% input_field type="textarea" name="child_support_payment_special_provisions" class="response-textarea form-control" tabindex="-1" maxlength="1000" rows="3" %}
     </div>
-{##}
-{#        <div class="question-well hide-grouping support-amount-match" id="you_spouse_agree" hidden>#}
-{#            <div id="enter_agreed_appropriate_amount">#}
-{#                <h3>#}
-{#                    What is the amount that you and your spouse have agreed to (that differs from the Child Support Guidelines table amount)?#}
-{#                </h3>#}
-{#                <div>#}
-{#                    <div class="dollar-prefix">#}
-{#                        {% money_input_field name="agreed_child_support_amount" value="" class="fact-sheet-input money" %}#}
-{#                    </div>#}
-{#                </div>#}
-{#                <h3>#}
-{#                    Why do you think the court should approve your proposed amount?#}
-{#                </h3>#}
-{#                <p>#}
-{#                    Discuss the conditions, means, needs and other circumstances of the child, and the financial#}
-{#                    ability of#}
-{#                    each parent to support the child/children.#}
-{#                </p>#}
-{#                <div>#}
-{#                    {% input_field type="textarea" name="reason_child_support_amount" class="fact-sheet-input form-control response-textarea" maxlength="1000" rows="6" %}#}
-{#                </div>#}
-{#            </div>#}
-{#        </div>#}
 
     <div class="question-well">
         <h3>Do you have a separation agreement that sets out what you've agreed to around parenting and child support?</h3>
diff --git a/edivorce/apps/core/utils/derived.py b/edivorce/apps/core/utils/derived.py
index e9f2727e..bbc6ee10 100644
--- a/edivorce/apps/core/utils/derived.py
+++ b/edivorce/apps/core/utils/derived.py
@@ -135,8 +135,7 @@ def show_fact_sheet_a(responses, derived):
     indicated.
     """
 
-    expenses = json.loads(responses.get('special_extraordinary_expenses', '[]'))
-    return len(expenses) > 0 and "None" not in expenses
+    return responses.get('special_extraordinary_expenses', '') == 'YES'
 
 
 def show_fact_sheet_b(responses, derived):
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index c2d388ab..1b3a021a 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -1281,7 +1281,7 @@
 },
 {
     "fields": {
-        "name": "Are there any special and extraordinary expenses?",
+        "name": "Are you claiming any special and extraordinary expenses?",
         "description": "For Step 6, Your children - Income & expenses",
         "summary_order": 0,
         "required": "Required"