diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js
index 6b934602..cc83e1f2 100755
--- a/edivorce/apps/core/static/js/main.js
+++ b/edivorce/apps/core/static/js/main.js
@@ -197,10 +197,11 @@ $(function () {
     // Dynamically calculate total child support payment for payor
     var calcTotalChildSupportPayment = function() {
         var payor = $('#child_support_payor').text();
+        var payorMonthlyChildSupportAmount = parseFloat($('#payor_monthly_child_support_amount').text()) || 0;
         var yourShare = parseFloat($('#your_proportionate_share_amount').text()) || 0;
         var spouseShare = parseFloat($('#spouse_proportionate_share_amount').text()) || 0;
-        var fact_sheet_b_proposed_amount = parseFloat($('#fact_sheet_b_proposed_amount').text()) || 0;
-        var fact_sheet_c_proposed_amount = parseFloat($('#fact_sheet_c_proposed_amount').text()) || 0;
+        var factSheet_B_ProposedAmount = parseFloat($('#fact_sheet_b_proposed_amount').text()) || 0;
+        var factSheet_C_ProposedAmount = parseFloat($('#fact_sheet_c_proposed_amount').text()) || 0;
         var payorShare = 0;
 
         if (payor === 'Myself (Claimant 1)') {
@@ -213,7 +214,15 @@ $(function () {
             payorShare = yourShare + spouseShare;
         }
 
-        return (payorShare + fact_sheet_b_proposed_amount + fact_sheet_c_proposed_amount).toFixed(2);
+        if ($('#show_fact_sheet_b').text() === 'False') {
+            factSheet_B_ProposedAmount = 0;
+        }
+        if ($('#show_fact_sheet_c').text() === 'False') {
+            factSheet_C_ProposedAmount = 0;
+        }
+
+        // This number should include the share paid to individual
+        return (payorMonthlyChildSupportAmount + payorShare + factSheet_B_ProposedAmount + factSheet_C_ProposedAmount).toFixed(2);
     };
 
     $('#total_child_support_payment').text(calcTotalChildSupportPayment());
diff --git a/edivorce/apps/core/templates/partials/fact_sheet_f_table.html b/edivorce/apps/core/templates/partials/fact_sheet_f_table.html
index fd52e6a9..7f166de5 100644
--- a/edivorce/apps/core/templates/partials/fact_sheet_f_table.html
+++ b/edivorce/apps/core/templates/partials/fact_sheet_f_table.html
@@ -110,7 +110,7 @@
 <div class="question-well-border-less">
     <h3>
         Do you and your spouse agree that $<span
-            id="agreed_child_support_amount_{{ claimant_id }}">{% agreed_child_support_amount claimant_id %}</span> is the child support amount?
+            id="agreed_child_support_amount_{{ claimant_id }}">{% agreed_child_support_amount claimant_id line_breaks=False %}</span> is the child support amount?
     </h3>
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
diff --git a/edivorce/apps/core/templates/question/06_children_facts.html b/edivorce/apps/core/templates/question/06_children_facts.html
index 6dad36b0..7da10726 100644
--- a/edivorce/apps/core/templates/question/06_children_facts.html
+++ b/edivorce/apps/core/templates/question/06_children_facts.html
@@ -573,10 +573,10 @@
             </div>
         </div>
 
-        <div id="fact_sheet_f_table_1" hidden>
+        <div id="fact_sheet_f_table_1" class="question-well-border-less" hidden>
             {% include "partials/fact_sheet_f_table.html" with table_id=1 claimant_id='you' %}
         </div>
-        <div id="fact_sheet_f_table_2" hidden>
+        <div id="fact_sheet_f_table_2" class="question-well-border-less" hidden>
             {% include "partials/fact_sheet_f_table.html" with table_id=2 claimant_id='spouse' %}
         </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 1780b44d..c7d52295 100644
--- a/edivorce/apps/core/templates/question/06_children_what_for.html
+++ b/edivorce/apps/core/templates/question/06_children_what_for.html
@@ -18,10 +18,13 @@
             expenses:
         </h3>
             <span id="child_support_payor" hidden>{{ child_support_payor }}</span>
+            <span id="payor_monthly_child_support_amount" hidden>{{ payor_monthly_child_support_amount }}</span>
             <span id="your_proportionate_share_amount" hidden>{{ your_proportionate_share_amount }}</span>
             <span id="spouse_proportionate_share_amount" hidden>{{ spouse_proportionate_share_amount }}</span>
             <span id="fact_sheet_b_proposed_amount" hidden>{{ difference_between_claimants }}</span>
             <span id="fact_sheet_c_proposed_amount" hidden>{{ difference_payment_amounts }}</span>
+            <span id="show_fact_sheet_b" hidden>{{ derived.show_fact_sheet_b }}</span>
+            <span id="show_fact_sheet_c" hidden>{{ derived.show_fact_sheet_c }}</span>
         <h3>
             $<span id="total_child_support_payment"></span>
         </h3>
diff --git a/edivorce/apps/core/templatetags/format_utils.py b/edivorce/apps/core/templatetags/format_utils.py
index bf18d4be..4cfdd181 100644
--- a/edivorce/apps/core/templatetags/format_utils.py
+++ b/edivorce/apps/core/templatetags/format_utils.py
@@ -177,6 +177,9 @@ def lookup(obj, property):
 
 
 @register.simple_tag(takes_context=True)
-def agreed_child_support_amount(context, claimant_id):
+def agreed_child_support_amount(context, claimant_id, line_breaks=True):
     """Return the agree amount for the specific claimant fact sheet table."""
-    return linebreaksli(context.get('amount_income_over_high_income_limit_{}'.format(claimant_id), ''))
+    if not line_breaks:
+        return context.get('amount_income_over_high_income_limit_{}'.format(claimant_id), '')
+    else:
+        return linebreaksli(context.get('amount_income_over_high_income_limit_{}'.format(claimant_id), ''))