diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
index ef29a6d7..0361b0b4 100644
--- a/edivorce/apps/core/templates/question/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -7,108 +7,110 @@
 
 <p class="intro">Please select what you are asking for. Later on you will be asked to provide details for each request.</p>
 
-<div class="question-well">
-    <div class="checkbox">
-        <label class="checkbox-header">
-            {% input_field type="checkbox" name="want_which_orders" value="A legal end to the marriage" %}<b>A legal end to the marriage</b>
-        </label>
-    </div>
-    <p>
-        Divorce is the end of a legal marriage. To get a divorce, you must go through a legal process and get a court order that says the marriage has ended.
-    </p>
-    <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_common_law" aria-controls="collapse_common_law">
-        <div>
-            Are you in a
-            <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title='<b>Common law relationship</b><br /><br />The term "common-law relationship" is often used to refer to
-                    a marriage-like relationship that has lasted a certain length of time, usually one or two years.
-                    Used in some federal laws to refer to a marriage-like relationship of a year or longer.'>common law relationship<i class="fa fa-question-circle" aria-hidden="true"></i></span> (legally known as a "marriage like relationship)"?
+<div class="checkbox-group">
+    <div class="question-well">
+        <div class="checkbox">
+            <label class="checkbox-header">
+                {% input_field type="checkbox" name="want_which_orders" value="A legal end to the marriage" %}<b>A legal end to the marriage</b>
+            </label>
+        </div>
+        <p>
+            Divorce is the end of a legal marriage. To get a divorce, you must go through a legal process and get a court order that says the marriage has ended.
+        </p>
+        <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_common_law" aria-controls="collapse_common_law">
+            <div>
+                Are you in a
+                <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title='<b>Common law relationship</b><br /><br />The term "common-law relationship" is often used to refer to
+                        a marriage-like relationship that has lasted a certain length of time, usually one or two years.
+                        Used in some federal laws to refer to a marriage-like relationship of a year or longer.'>common law relationship<i class="fa fa-question-circle" aria-hidden="true"></i></span> (legally known as a "marriage like relationship)"?
+            </div>
+        </div>
+        <div class="collapse" id="collapse_common_law">
+            <div>
+                <p>
+                    A divorce is a court order, made under the Divorce Act, that ends a marriage. Only married spouses need to get a divorce to end their relationship; unmarried spouses and other unmarried couples do not need to divorce. Their relationships are over when
+                    they separate.
+                </p>
+                <p>
+                    So you do not need to ask for a legal end to the marriage (Divorce order). However, if you would like spousal support or property and debt issues addressed, you will need to ask for these orders.
+                </p>
+                <p>
+                    <b>Time Limits</b><br /> Note that there are important time limits if you want to apply for spousal support and/or divide property, debt, or a pension.
+                    <ul>
+                        <li>If you were married, you must apply to divide property within two years after you get an order for divorce.</li>
+                        <li>If you were living in a marriage-like relationship for at least two years, you must apply within two years of the date you separated.</li>
+                    </ul>
+                </p>
+                <p>
+                    For more information refer to the
+                    <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/spousal_support.php" target="_blank">Spousal Support</a> and
+                    <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/dividePropertyAndDebts.php" target="_blank">How to Divide Property and Debt fact sheets</a> on the Legal Services Society web site.
+                </p>
+            </div>
         </div>
     </div>
-    <div class="collapse" id="collapse_common_law">
-        <div>
-            <p>
-                A divorce is a court order, made under the Divorce Act, that ends a marriage. Only married spouses need to get a divorce to end their relationship; unmarried spouses and other unmarried couples do not need to divorce. Their relationships are over when
-                they separate.
-            </p>
-            <p>
-                So you do not need to ask for a legal end to the marriage (Divorce order). However, if you would like spousal support or property and debt issues addressed, you will need to ask for these orders.
-            </p>
-            <p>
-                <b>Time Limits</b><br /> Note that there are important time limits if you want to apply for spousal support and/or divide property, debt, or a pension.
+
+    <div class="question-well">
+        <div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Spousal support" data_target_id="spouse_support_alert" data_reveal_target="true" %}<b>Spousal support</b></label></div>
+        <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseExample2" aria-controls="collapseExample">
+            <div>
+                What is spousal support?
+            </div>
+        </div>
+        <div class="collapse" id="collapseExample2">
+            <div>
+                <p>
+                    When a couple separates, one spouse may be eligible to receive financial support from the other. This is called spousal support. Spousal support is separate and distinct from child support. Unlike child support, spousal support is not a right in every
+                    case. You are entitled to spousal support in certain situations.<br /> The objectives of spousal support are to:
+                </p>
                 <ul>
-                    <li>If you were married, you must apply to divide property within two years after you get an order for divorce.</li>
-                    <li>If you were living in a marriage-like relationship for at least two years, you must apply within two years of the date you separated.</li>
+                    <li>Deal with any economic advantages or disadvantages a spouse may face as a result of the relationship or separation</li>
+                    <li>Share the financial consequences arising from care of the children</li>
+                    <li>Reduce the financial hardship a spouse will experience as a result of the separation, and</li>
+                    <li>Encourage each spouse to become financially self-sufficient within a reasonable period of time.</li>
                 </ul>
-            </p>
-            <p>
-                For more information refer to the
-                <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/spousal_support.php" target="_blank">Spousal Support</a> and
-                <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/dividePropertyAndDebts.php" target="_blank">How to Divide Property and Debt fact sheets</a> on the Legal Services Society web site.
+                <p>
+                    For more information, please refer to the
+                    <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/spousal_support.php">Spousal Support fact sheet</a> on the Family Law in B.C. website.
+                </p>
+            </div>
+        </div>
+        <div class="information-message bg-danger" id="spouse_support_alert" hidden>
+            <p>If you and your spouse have already agreed on spousal support (which could be in the form of a
+                <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Separation agreement</b><br /><br />A document that sets out how you and your spouse have agreed to deal with thing matters like parenting support and property after you separate
+                           (Provincial family law calls it an agreement). There's no official form to use for drafting up a separation agreement. ">separation agreement<i class="fa fa-question-circle" aria-hidden="true"></i></span> ) then you
+                do not need to ask for an Order for Spousal Support. However if you want the spousal support agreement to be enforceable (legally binding) you will need to select this option.
             </p>
         </div>
     </div>
-</div>
 
-<div class="question-well">
-    <div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Spousal support" data_target_id="spouse_support_alert" data_reveal_target="true" %}<b>Spousal support</b></label></div>
-    <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseExample2" aria-controls="collapseExample">
-        <div>
-            What is spousal support?
-        </div>
-    </div>
-    <div class="collapse" id="collapseExample2">
-        <div>
-            <p>
-                When a couple separates, one spouse may be eligible to receive financial support from the other. This is called spousal support. Spousal support is separate and distinct from child support. Unlike child support, spousal support is not a right in every
-                case. You are entitled to spousal support in certain situations.<br /> The objectives of spousal support are to:
-            </p>
+    <div class="question-well">
+        <div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Division of property and debts" data_target_id="property_division_alert" data_reveal_target="true" %}<b>Division of property and debts</b></label></div>
+
+        <p>Anything you own including real estate, bank accounts, cars and RRSPs. For more information, please refer to the <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/debtsAfterSeparation.php" target="_blank">Dealing with Debts
+                After Separation fact sheet</a> on the Family Law in B.C. website.</p>
+
+        <div class="information-message bg-danger" id="property_division_alert" hidden>
+            <b>Time limit to apply for court order </b> {% if married_marriage_like != "Living together in a marriage like relationship" %}
+            <p>If you were <b>married</b>, you must apply to divide property within two years after you get an order for divorce.</p>
+            {% else %}
+            <p>If you were living in a <b>marriage-like relationship</b> for at least two years, you must apply within two years of the date you separated.</p>
+            <p>In order to be considered a spouse for the purpose of dividing property or debt you must have lived together in a marriage-like relationship for at least two years.</p>
+            {% endif %}
+            <p><em>For more information, please refer to  the following fact sheets on the  Legal Services Society website:</em></p>
             <ul>
-                <li>Deal with any economic advantages or disadvantages a spouse may face as a result of the relationship or separation</li>
-                <li>Share the financial consequences arising from care of the children</li>
-                <li>Reduce the financial hardship a spouse will experience as a result of the separation, and</li>
-                <li>Encourage each spouse to become financially self-sufficient within a reasonable period of time.</li>
+                <li><a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/dividePropertyAndDebts.php" target="_blank">How to Divide Property and Debts</a></li>
+                <li><a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/debtsAfterSeparation.php" target="_blank">Dealing with Debts After Separation</a></li>
             </ul>
-            <p>
-                For more information, please refer to the
-                <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/spousal_support.php">Spousal Support fact sheet</a> on the Family Law in B.C. website.
-            </p>
         </div>
     </div>
-    <div class="information-message bg-danger" id="spouse_support_alert" hidden>
-        <p>If you and your spouse have already agreed on spousal support (which could be in the form of a
-            <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Separation agreement</b><br /><br />A document that sets out how you and your spouse have agreed to deal with thing matters like parenting support and property after you separate
-                       (Provincial family law calls it an agreement). There's no official form to use for drafting up a separation agreement. ">separation agreement<i class="fa fa-question-circle" aria-hidden="true"></i></span> ) then you
-            do not need to ask for an Order for Spousal Support. However if you want the spousal support agreement to be enforceable (legally binding) you will need to select this option.
-        </p>
-    </div>
-</div>
-
-<div class="question-well">
-    <div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Division of property and debts" data_target_id="property_division_alert" data_reveal_target="true" %}<b>Division of property and debts</b></label></div>
 
-    <p>Anything you own including real estate, bank accounts, cars and RRSPs. For more information, please refer to the <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/debtsAfterSeparation.php" target="_blank">Dealing with Debts
-            After Separation fact sheet</a> on the Family Law in B.C. website.</p>
-
-    <div class="information-message bg-danger" id="property_division_alert" hidden>
-        <b>Time limit to apply for court order </b> {% if married_marriage_like != "Living together in a marriage like relationship" %}
-        <p>If you were <b>married</b>, you must apply to divide property within two years after you get an order for divorce.</p>
-        {% else %}
-        <p>If you were living in a <b>marriage-like relationship</b> for at least two years, you must apply within two years of the date you separated.</p>
-        <p>In order to be considered a spouse for the purpose of dividing property or debt you must have lived together in a marriage-like relationship for at least two years.</p>
-        {% endif %}
-        <p><em>For more information, please refer to  the following fact sheets on the  Legal Services Society website:</em></p>
-        <ul>
-            <li><a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/dividePropertyAndDebts.php" target="_blank">How to Divide Property and Debts</a></li>
-            <li><a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/debtsAfterSeparation.php" target="_blank">Dealing with Debts After Separation</a></li>
-        </ul>
+    <div class="question-well">
+        <div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Other orders" %}<b>Other orders</b></label></div>
+        <p><em>For example, a name change.</em></p>
     </div>
 </div>
 
-<div class="question-well">
-    <div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Other orders" %}<b>Other orders</b></label></div>
-    <p><em>For example, a name change.</em></p>
-</div>
-
 <div class="checkbox hidden"><label>{% input_field type="checkbox" name="want_which_orders" value="Child support" %}<b>Child support (Out of scope)</b></label></div>
 
 <div class="information-message bg-danger" id="child_support_alert" hidden>