diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index 2e5dc35a..3cf8f50c 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -12,7 +12,7 @@
     and file them (open your court case) at a
     <span class="tooltip-link" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
        title="<b>Court Registry</b><br /><br />Registries are located in courthouses around the province. You can file your divorce documents at any
-       <a href='http://www.ag.gov.bc.ca/courts/overview/locations/' target='_blank'>Supreme Court registry</a>.
+       <a href='http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx' target='_blank'>Supreme Court registry</a>.
        Usually, people file their documents at the Supreme Court registry nearest to where they live or work (Supreme Court registry addresses)."> court registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>.
 </p>
 
@@ -140,8 +140,8 @@
         <tr>
             <td>The affidavit can be signed and sworn/affirmed by both of you when at the registry.</td>
             <td>
-                <p>Either your or your spouse can sign and swear/affirm ahead of time, but the 2nd party will need to sign when at the registry.</p>
-                <p>If one of you decides to swear/affirm the affidavit at a later date,  it must be done within 30 days of filing your Requisition Form (F35)</p>
+                <p>Either you or your spouse can sign and swear/affirm ahead of time, but the 2nd party will need to sign when at the registry.</p>
+                <p>If one of you decides to swear/affirm ahead of time, at the time of filing the application, both affidavits must have been notarized within 30 days prior to filing.</p>
             </td>
         </tr>
     </table>
diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html
index 3ea77dad..e4824abc 100644
--- a/edivorce/apps/core/templates/pdf/form1.html
+++ b/edivorce/apps/core/templates/pdf/form1.html
@@ -69,7 +69,7 @@
                     <td colname="c2"> <span class="form-entry not-complete">&nbsp;</span></td>
                 </tr>
                 <tr>
-                    <td><i class="fa fa-square-o" aria-hidden="true"></i> were never married </td>
+                    <td><i class="fa {% if responses.married_marriage_like == 'Living together in a marriage like relationship' %}fa-check-square-o{% else %}fa-square-o{% endif %}" aria-hidden="true"></i> were never married </td>
                     <td colname="c2"> </td>
                 </tr>
             </tbody>
@@ -297,7 +297,7 @@
                 <tr>
                     {% check_list source=responses.want_which_orders value='Spousal support' as order_wanted %}
                     <td colname="c2"> <i class="fa {% if order_wanted %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> Claimant 1 and Claimant 2 are asking for an order for spousal support as follows:
-                        <span class="form-entry form-textarea not-complete">{% if responses.spouse_support_details %} {{responses.spouse_support_details|linebreaksbr }} {% else %} &nbsp; {% endif %}</span>
+                        <span class="form-entry form-textarea not-complete">{% if order_wanted and responses.spouse_support_details %} {{responses.spouse_support_details|linebreaksbr }} {% else %} &nbsp; {% endif %}</span>
                     </td>
                 </tr>
                 <tr>
diff --git a/edivorce/apps/core/templates/prequalification/step_04.html b/edivorce/apps/core/templates/prequalification/step_04.html
index e160c95f..208cfd59 100644
--- a/edivorce/apps/core/templates/prequalification/step_04.html
+++ b/edivorce/apps/core/templates/prequalification/step_04.html
@@ -49,7 +49,7 @@
         </div>
 
         <div class="information-message bg-danger hard-stop" id="younger_19" hidden>
-            <p>Sorry but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. forms (PDF). The <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms</a> can be found on the Court Services Branch website: Supreme Court - Provincial Court.</p>
+            <p>Sorry but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. forms (PDF). The <a href="http://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms" target="_blank">forms</a> can be found on the Court Services Branch website: Supreme Court - Provincial Court.</p>
 
             <p>A <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">listing of forms</a> that may be required for a Joint Divorce can also be found on the Family Law website. </p>
         </div>
@@ -66,7 +66,7 @@
             <div class="checkbox"><label>{% input_field type="checkbox" name="children_financial_support" value="Yes, other reason" data_target_id="need_support" data_reveal_target="true" data_target_class="not-disqualified-other" data_reveal_class="false" %}Yes, other reason(s)</label></div>
         </div>
         <div class="information-message bg-danger hard-stop" id="need_support" hidden>
-            <p>Sorry but at this point in time you will not be able to complete your application for divorce using this online tool. Currently the tool supports a limited number of scenarios. In the meantime, you can file for divorce using the <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms provided</a> on the Supreme Court of B.C. website.</p>
+            <p>Sorry but at this point in time you will not be able to complete your application for divorce using this online tool. Currently the tool supports a limited number of scenarios. In the meantime, you can file for divorce using the <a href="http://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms" target="_blank">forms</a> provided on the Supreme Court of B.C. website.</p>
 
             <p>A <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">listing of forms</a> that may be required for a Joint Divorce, as well as an overview of the divorce process,  can be found on the <a href="http://www.familylaw.lss.bc.ca/guides/divorce/" target="_blank">Legal Services Society website</a>. </p>
         </div>
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index 248b3c07..d453dbe3 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -143,7 +143,7 @@
     </div>
 
     <div class="information-message bg-danger hard-stop" id="certificate_in_english" hidden>
-        <p>Sorry but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. forms (PDF). The forms can be found on the Court Services Branch website. <http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm></p>
+        <p>Sorry but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. <a href="http://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms">forms</a> (PDF). The forms can be found on the Court Services Branch website.</p>
 
         <p>A listing of forms that may be required for a Joint Divorce can also be found on the <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">Family Law of B.C. website</a>.  </p>
 
diff --git a/edivorce/apps/core/templates/prequalification/step_06.html b/edivorce/apps/core/templates/prequalification/step_06.html
index 08751e97..81ae4389 100644
--- a/edivorce/apps/core/templates/prequalification/step_06.html
+++ b/edivorce/apps/core/templates/prequalification/step_06.html
@@ -84,7 +84,7 @@
 
     <div class="information-message bg-danger hard-stop" id="other_reason" hidden>
         <p>If you ask for a divorce  due to "other reason" reasons, you have to present evidence to the court to prove the facts of the adultery or physical or mental cruelty.</p>
-        <p>At this point in time you will need to complete your application for divorce using the PDF version of the forms. The <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms</a> can be found on the Court Services Branch website: Supreme Court - Provincial Court.</p>
+        <p>At this point in time you will need to complete your application for divorce using the PDF version of the forms. The <a href="http://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms" target="_blank">forms</a> can be found on the Court Services Branch website: Supreme Court - Provincial Court.</p>
     </div>
 
     <div class="not-disqualified">
diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index cada7b42..a24d3f9b 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -100,7 +100,7 @@
 </div>
 
 <div class="question-well">
-    <h3>When is your birthday?</h3>
+    <h3>What is your date of birth?</h3>
     <p>
         <span class="input-group date date-picker-group">
             {% input_field type="text" name="birthday_you" class="date-picker form-control" id="birth_date" placeholder="DD/MM/YYYY" %}
diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
index 209b3e13..3fbdef14 100644
--- a/edivorce/apps/core/templates/question/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -114,7 +114,7 @@
 </div>
 
 <div class="question-well">
-    <h3>When is your spouse's birthday?</h3>
+    <h3>What is your spouse's date of birth?</h3>
     <p>
         <span class="input-group date date-picker-group">
             {% input_field type="text" name="birthday_spouse" class="date-picker form-control" id="birth_date" placeholder="DD/MM/YYYY" %}
@@ -180,7 +180,7 @@
                 <h1 class="modal-title">Your Spouse</h1>
             </div>
             <div class="modal-body">
-                <p>Next we need to get some details about your spouse.  Make sure you have a copy of your marriage certificate or registration of marriage. The spelling of the name must match what is on the marriage certificate.</p>
+                <p>Next we need to get some details about your spouse. Make sure you have a copy of your marriage certificate or registration of marriage. The spelling of the name must match what is on the marriage certificate.</p>
             </div>
             <div class="modal-footer">
                 <a type="button" class="btn btn-primary btn-lg" data-dismiss="modal">Continue</a>
diff --git a/edivorce/apps/core/templates/question/06_support.html b/edivorce/apps/core/templates/question/06_support.html
index 54d4c031..73e9f0f7 100644
--- a/edivorce/apps/core/templates/question/06_support.html
+++ b/edivorce/apps/core/templates/question/06_support.html
@@ -144,7 +144,7 @@
                 <h1 class="modal-title">Spousal Support</h1>
             </div>
             <div class="modal-body">
-                <p>Okay, {{ name_you }} now we need to ask you several questions about spousal support.</p>
+                <p>Okay {{ name_you }}, now we need to ask you several questions about spousal support.</p>
                 <p>Spousal support is paid by one spouse to financially support the other spouse after separation, under an agreement or order.  The purpose of spousal support is to help meet the on-going financial needs of a financially dependent spouse for a defined period of time.</p>
                 <p>The answers you provide will be used to populate what's called a Draft Final Order Form (F52). A draft final order sets out what orders (decisions) you want the court to make. This will be reviewed by a judge or master.  If the judge or master makes the order you ask for, they'll sign the draft order you filed and it becomes your final court order.</p>
                 <p>If there's a problem with your order and the judge or master doesn't approve it, the court registry will let you know. You might have to draft another version of the order or appear in court to give the judge or master more information about what you wrote in the order.</p>
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index b733d9a7..94a9af00 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -161,7 +161,7 @@
 },
 {
     "fields": {
-        "name": "When is your birthday?",
+        "name": "What is your date of birth?",
         "description": "For step 2, Form 1 2. Divorce section A"
     },
     "model": "core.question",