diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html
index a5ab5a28..740875ed 100644
--- a/edivorce/apps/core/templates/overview.html
+++ b/edivorce/apps/core/templates/overview.html
@@ -18,7 +18,7 @@
                                     <li style="display: flex"><a href="{% url 'question_steps' '02_claimant' %}">Step 2: Your information</a><p style="margin-left: 90px">{{your_information}}</p></li>
                                     <li style="display: flex"><a href="{% url 'question_steps' '03_respondent' %}">Step 3: Your spouse</a><p style="margin-left: 90px">{{your_spouse}}</p></li>
                                     <li style="display: flex"><a href="{% url 'question_steps' '04_marriage' %}">Step 4: Your marriage</a><p style="margin-left: 90px">{{your_marriage}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'question_steps' '05_reason' %}">Step 5: Your separation</a><p style="margin-left: 90px">{{your_separation}}</p></li>
+                                    <li style="display: flex"><a href="{% url 'question_steps' '05_separation' %}">Step 5: Your separation</a><p style="margin-left: 90px">{{your_separation}}</p></li>
                                     <li style="display: flex"><a href="{% url 'question_steps' '06_support' %}">Step 6: Spousal support</a><p style="margin-left: 90px">{{spousal_support}}</p></li>
                                     <li style="display: flex"><a href="{% url 'question_steps' '07_property' %}">Step 7: Property and debt</a><p style="margin-left: 90px">{{property_and_debt}}</p></li>
                                     <li style="display: flex"><a href="{% url 'question_steps' '08_other_orders' %}">Step 8: Other orders</a><p style="margin-left: 90px">{{other_orders}}</p></li>
diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html
index b63b70d5..d0c45ebe 100644
--- a/edivorce/apps/core/templates/pdf/form1.html
+++ b/edivorce/apps/core/templates/pdf/form1.html
@@ -175,7 +175,7 @@
                     <td colspan="2"> <i class="fa {% if responses.no_reconciliation_possible == 'agree' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There is no possibility of reconciliation. </td>
                 </tr>
                 <tr>
-                    <td colspan="2"> <i class="fa {% if responses.no_collusion == 'agree' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There has been no collusion, as defined in section 11 (4) of the <em> Divorce Act </em> (Canada), in relation to this claim for divorce. </td>
+                    <td colspan="2"> <i class="fa {% if responses.no_collusion == 'No collusion' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There has been no collusion, as defined in section 11 (4) of the <em> Divorce Act </em> (Canada), in relation to this claim for divorce. </td>
                 </tr>
             </tbody>
         </table>
diff --git a/edivorce/apps/core/templates/question/04_marriage.html b/edivorce/apps/core/templates/question/04_marriage.html
index a44a4cc8..0bbad9df 100644
--- a/edivorce/apps/core/templates/question/04_marriage.html
+++ b/edivorce/apps/core/templates/question/04_marriage.html
@@ -104,7 +104,7 @@
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'question_steps' '05_reason' %}">
+                    <form action="{% url 'question_steps' '05_separation' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/question/05_reason.html b/edivorce/apps/core/templates/question/05_separation.html
similarity index 58%
rename from edivorce/apps/core/templates/question/05_reason.html
rename to edivorce/apps/core/templates/question/05_separation.html
index 145e3b6b..807d005f 100644
--- a/edivorce/apps/core/templates/question/05_reason.html
+++ b/edivorce/apps/core/templates/question/05_separation.html
@@ -9,25 +9,6 @@
         <div class="row">
             <div class="col-md-8 col-md-offset-2">
                 <h1>Step 5: Your Separation</h1>
-                <div>
-                    <h3>Did you and your spouse try and reconcile after you separated?</h3>
-                    <p><em>Please select one</em></p>
-                    <div class="radio"><label>{% input_field type="radio" name="try_reconcile_after_separated" %}
-                        No, {% if name_spouse %} {{ name_spouse }} {% else %} my spouse {% endif %} and I have not reconciled (gotten back together)</label>
-                    </div>
-                    <div class="radio"><label>{% input_field type="radio" name="try_reconcile_after_separated" %}
-                        Yes, {% if name_spouse %} {{ name_spouse }} {% else %} my spouse {% endif %} and I lived together again during the following period(s) in an unsuccessful attempt to reconcile</label>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="container-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-8 col-md-offset-2">
                 <div>
                     <p>
                         For this next question, we need to confirm that there is no chance you and your spouse will be getting back together.
@@ -45,27 +26,50 @@
     <div class="container">
         <div class="row">
             <div class="col-md-8 col-md-offset-2">
-                <div>
-                    <p><em>Ok, this next questions uses some legal terminology so we'll help you understand what is being asked.</em></p>
+                <!-- TODO: Confirm with JA and remove this part-->
+                <div hidden>
+                    <div>
+                        <p><em>Ok, this next questions uses some legal terminology so we'll help you understand what is being asked.</em></p>
+
+                        <p><em>We’re legally required to ask that you confirm that you and (!!insert spouse name) haven’t lied or
+                            tried to deceive the court in any way. This is called “collusion”. An example of collusion is both
+                            of you saying that you’ve been separated for longer than you actually have been.</em></p>
 
-                    <p><em>We’re legally required to ask that you confirm that you and (!!insert spouse name) haven’t lied or
-                        tried to deceive the court in any way. This is called “collusion”. An example of collusion is both
-                        of you saying that you’ve been separated for longer than you actually have been.</em></p>
+                        <p><em>Please confirm that there’s been no collusion in this claim for divorce. The court can refuse to
+                            grant a divorce if you and your spouse have not been honest (collusion) about your marriage and
+                            separation details.</em></p>
+                    </div>
 
-                    <p><em>Please confirm that there’s been no collusion in this claim for divorce. The court can refuse to
-                        grant a divorce if you and your spouse have not been honest (collusion) about your marriage and
-                        separation details.</em></p>
+                    <div>
+                        <h3>There has been no collusion
+                            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+                           title="<b>COURT REGISTRY</b><br /><br />A central office (for the B.C. Supreme Court) at which
+                           the court files for each court proceeding in that district are maintained, and at which legal documents,
+                           can be filed, searched for and reviewed" aria-hidden="true"></i>,
+                            as defined in section 11(4) of the Divorce Act (Canada), in relation to this claim for divorce.</h3>
+                        <div class="radio"><label>{% input_field type="radio" name="no_collusion" value="agree" %}I agree</label></div>
+                        <div class="radio"><label>{% input_field type="radio" name="no_collusion" value="disagree" %}I disagree</label></div>
+                    </div>
                 </div>
 
                 <div>
-                    <h3>There has been no collusion
+                    <p>
+                        We’re legally required to ask that you confirm that you and {% if responses.name_spouse %} {{ responses.name_spouse }} {% else %} your spouse {% endif %}
+                        haven’t lied or tried to deceive the court in any way. This is called “collusion
                         <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
-                       title="<b>COURT REGISTRY</b><br /><br />A central office (for the B.C. Supreme Court) at which
-                       the court files for each court proceeding in that district are maintained, and at which legal documents,
-                       can be filed, searched for and reviewed" aria-hidden="true"></i>,
-                        as defined in section 11(4) of the Divorce Act (Canada), in relation to this claim for divorce.</h3>
-                    <div class="radio"><label>{% input_field type="radio" name="no_collusion" value="agree" %}I agree</label></div>
-                    <div class="radio"><label>{% input_field type="radio" name="no_collusion" value="disagree" %}I disagree</label></div>
+                       title="<b>Collusion</b><br /><br />Basically this statement confirms that you and your spouse haven’t lied or tried to deceive the court in any way
+                       (for example, saying that you’ve been separated for longer than you have been). It is a legal requirement that you confirm you are providing accurate
+                       and complete information. Apologies if you are offended with this question." aria-hidden="true"></i>
+                        ”. An example of collusion is both
+                        of you saying that you’ve been separated for longer than you actually have been.
+                    </p>
+                    <div class="checkbox-group">
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="no_collusion" value="No collusion" %} My spouse and I have not engaged in collusion to deceive the court in any way.
+                            </label>
+                        </div>
+                    </div>
                 </div>
 
                 <div style="display: flex">
diff --git a/edivorce/apps/core/templates/question/06_support.html b/edivorce/apps/core/templates/question/06_support.html
index 2d4ae31d..a3bdf339 100644
--- a/edivorce/apps/core/templates/question/06_support.html
+++ b/edivorce/apps/core/templates/question/06_support.html
@@ -11,7 +11,19 @@
                 <h1>Step 6. Spousal Support</h1>
 
                 <div>
-                    <h3>You and your spouse are asking for an order for spousal support as follows:</h3>
+                    <div>
+                        <p>Spousal support is paid by one spouse to financially support the other spouse after separation, under an agreement or order
+                            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
+                           title="<b>Order</b><br />A type of court ruling a judge or master makes that sets out what you must do or not do." aria-hidden="true"></i>.</p>
+
+                        <p>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>For more information, please see the <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/spousal_support.php">fact sheet Spousal Support</a> by the Legal Services Society.</p>
+                    </div>
+                    <h3>You and your spouse are asking for an order
+                        <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
+                           title="<b>Order</b><br />A type of court ruling a judge or master makes that sets out what you must do or not do." aria-hidden="true"></i>
+                        for spousal support as follows:</h3>
                     {% input_field type="textarea" name="spouse_support_details" rows="8" cols="65" class="response-textarea" %}
 
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_support_amount" aria-controls="collapse_support_amount">
@@ -82,8 +94,18 @@
             <div class="col-md-8 col-md-offset-2">
                 <div>
                     <h3>Please indicate which act you are asking for support under.</h3>
-                    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="divorce" data_target_id="other_reason" data_reveal_target="false" %}the Divorce Act (Canada)</label></div>
-                    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="family" data_target_id="other_reason" data_reveal_target="true" %}the Family Law Act</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="divorce" data_target_id="family_law_time_limit" data_reveal_target="false" %}the Divorce Act (Canada)</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="family" data_target_id="family_law_time_limit" data_reveal_target="true" %}the Family Law Act</label></div>
+
+                    <div class="information-message bg-danger" id="family_law_time_limit" hidden>
+                        <h2>Time limit to apply for court order</h2>
+                        <p>
+                            If you were married, you must apply for spousal support under the Family Law Act within two years after you get an order for divorce. If you are applying for spousal support under the Divorce Act, you do not have a time limit.
+                        </p>
+                        <p>
+                            If you were unmarried, and you qualify for spousal support, you must apply within two years of the date you separated.
+                        </p>
+                    </div>
 
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_support_act" aria-controls="collapse_support_act">
                         <div>
@@ -107,7 +129,7 @@
                     </div>
                 </div>
                 <div style="display: flex">
-                    <form action="{% url 'question_steps' '05_reason' %}">
+                    <form action="{% url 'question_steps' '05_separation' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
diff --git a/edivorce/apps/core/templates/question/09_other_questions.html b/edivorce/apps/core/templates/question/09_other_questions.html
index e7759b54..784a7a15 100644
--- a/edivorce/apps/core/templates/question/09_other_questions.html
+++ b/edivorce/apps/core/templates/question/09_other_questions.html
@@ -9,6 +9,72 @@
         <div class="row">
             <div class="col-md-8 col-md-offset-2">
                 <h1>Step 9. Other Questions</h1>
+
+                <div>
+                    <div>
+                        <h3>What is the best address to send you official court documents?</h3>
+                        <h2>Your Contact Information</h2>
+                        <p><em>House and street number</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_street_you" class="form-block input-wide response-textbox" %}
+                        <p><em>City</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_city_you" class="form-block input-wide response-textbox" %}
+                        <p><em>Prov/State</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_prov_you" class="form-block input-narrow response-textbox" %}
+
+                        <p>Country</p>
+
+                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_you" value="Canada" %}Canada</label></div>
+                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_you" value="USA" %}USA</label></div>
+                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_you" value="Other" %}Other {% input_field type="text" name="address_to_send_official_document_other_country_you" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
+
+                        <p><em>Postal code</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_postal_code_you" class="form-block input-wide response-textbox" %}
+                    </div>
+
+                    <div>
+                        <p><em>If you don’t live within 30 km of a court registry, you must provide a fax number or email address.
+                            If you main address is a PO box, you can list this instead of the fax or email but you must also list
+                            an address that’s not a PO box.</em></p>
+
+                        <p><em>Fax number (optional)</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_fax_you" class="form-block input-wide response-textbox" %}
+                        <p><em>Email Address (optional)</em></p>
+                        {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_you" class="form-block input-wide response-textbox" %}
+                    </div>
+                </div>
+
+                <div>
+                    <div>
+                        <h2>Your Spouse's Contact Information</h2>
+                        <p><em>House and street number</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_street_spouse" class="form-block input-wide response-textbox" %}
+                        <p><em>City</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_city_spouse" class="form-block input-wide response-textbox" %}
+                        <p><em>Prov/State</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_prov_spouse" class="form-block input-narrow response-textbox" %}
+
+                        <p>Country</p>
+
+                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_spouse" value="Canada" %}Canada</label></div>
+                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_spouse" value="USA" %}USA</label></div>
+                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_spouse" value="Other" %}Other {% input_field type="text" name="address_to_send_official_document_other_country_spouse" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
+
+                        <p><em>Postal code</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_postal_code_spouse" class="form-block input-wide response-textbox" %}
+                    </div>
+
+                    <div>
+                        <p><em>If your spouse doesn’t live within 30 km of a court registry, your spouse must provide a fax number or email address.
+                            If your spouse's main address is a PO box, your spouse can list this instead of the fax or email but your spouse must also list
+                            an address that’s not a PO box.</em></p>
+
+                        <p><em>Fax number (optional)</em></p>
+                        {% input_field type="text" name="address_to_send_official_document_fax_spouse" class="form-block input-wide response-textbox" %}
+                        <p><em>Email Address (optional)</em></p>
+                        {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_spouse" class="form-block input-wide response-textbox" %}
+                    </div>
+                </div>
+
                 <div style="display: flex">
                     <form action="{% url 'question_steps' '08_other_orders' %}">
                         <input type="submit" value="Back"/>
@@ -25,3 +91,5 @@
     </div>
 </div>
 {% endblock %}
+{% block sidebar %}
+{% endblock %}
diff --git a/edivorce/apps/core/templates/question/10_location.html b/edivorce/apps/core/templates/question/10_location.html
index a664e01c..a480cd5e 100644
--- a/edivorce/apps/core/templates/question/10_location.html
+++ b/edivorce/apps/core/templates/question/10_location.html
@@ -9,91 +9,28 @@
         <div class="row">
             <div class="col-md-8 col-md-offset-2">
                 <h1>Step 10: Filing Location</h1>
-                <p>The only way to obtain an order for divorce is by starting a court proceeding in the B.C. Supreme Court;
-                    you must sue your spouse if you want to get divorced. To do this you will need to submit (file)
-                    your divorce application at a court registry
+                <p>
+                    Ok, we're almost done asking you questions. The last set of information that we need to know is where
+                    you will be filing your divorce document. You will need to file your documents in person at a court registry.
+                </p>
+                <p>
+                    The only way to obtain an order for divorce is by starting a court proceeding in the B.C. Supreme Court;
+                    you must sue your spouse if you want to get divorced. To do this you will need to submit (file) your divorce application at a court registry
                     <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
-                       title="<b>COURT REGISTRY</b><br /><br />A central office (for the B.C. Supreme Court) at which
-                       the court files for each court proceeding in that district are maintained, and at which legal documents,
-                       can be filed, searched for and reviewed" aria-hidden="true"></i>.</p>
+                       title="<b>COURT REGISTRY</b><br /><br />A registry is where you file your divorce documents.
+                       Registries are located in courthouses around the province. " aria-hidden="true"></i>.
+                </p>
                 <div>
-                    <h3>At what court registry will you be filing?</h3>
+                    <h3>Where will you be filing for divorce?</h3>
                     <p><em>Select a city to find the nearest Supreme Court Registry</em></p>
                     <select class="response-dropdown" name="court_registry_for_filing">
                         <option value="" disabled selected>Please select</option>
-                        <option value="Port Coquitlam">Port Coquitlam</option>
-                        <option value="Burnaby">Burnaby</option>
-                        <option value="New Westminster">New Westminster</option>
-                        <option value="Vancouver">Vancouver</option>
+                        {% for registry in registries %}
+                            <option value='{{registry}}'>{{registry}}</option>
+                        {% endfor %}
                     </select>
                 </div>
 
-                <div>
-                    <div>
-                        <h3>What is the best address to send you official court documents?</h3>
-                        <p><em>This is known as your "address for service"</em></p>
-                        <p><em>House and street number</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_street_you" class="form-block input-wide response-textbox" %}
-                        <p><em>City</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_city_you" class="form-block input-wide response-textbox" %}
-                        <p><em>Prov/State</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_prov_you" class="form-block input-narrow response-textbox" %}
-
-                        <p>Country</p>
-
-                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_you" value="Canada" %}Canada</label></div>
-                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_you" value="USA" %}USA</label></div>
-                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_you" value="Other" %}Other {% input_field type="text" name="address_to_send_official_document_other_country_you" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
-
-                        <p><em>Postal code</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_postal_code_you" class="form-block input-wide response-textbox" %}
-                    </div>
-
-                    <div>
-                        <p><em>If you don’t live within 30 km of a court registry, you must provide a fax number or email address.
-                            If you main address is a PO box, you can list this instead of the fax or email but you must also list
-                            an address that’s not a PO box.</em></p>
-
-                        <p><em>Fax number (optional)</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_fax_you" class="form-block input-wide response-textbox" %}
-                        <p><em>Email Address (optional)</em></p>
-                        {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_you" class="form-block input-wide response-textbox" %}
-                    </div>
-                </div>
-
-                <div>
-                    <div>
-                        <h3>What is the best address to send your spouse official court documents?</h3>
-                        <p><em>This is known as your "address for service"</em></p>
-                        <p><em>House and street number</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_street_spouse" class="form-block input-wide response-textbox" %}
-                        <p><em>City</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_city_spouse" class="form-block input-wide response-textbox" %}
-                        <p><em>Prov/State</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_prov_spouse" class="form-block input-narrow response-textbox" %}
-
-                        <p>Country</p>
-
-                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_spouse" value="Canada" %}Canada</label></div>
-                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_spouse" value="USA" %}USA</label></div>
-                        <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_spouse" value="Other" %}Other {% input_field type="text" name="address_to_send_official_document_other_country_spouse" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
-
-                        <p><em>Postal code</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_postal_code_spouse" class="form-block input-wide response-textbox" %}
-                    </div>
-
-                    <div>
-                        <p><em>If your spouse doesn’t live within 30 km of a court registry, your spouse must provide a fax number or email address.
-                            If your spouse's main address is a PO box, your spouse can list this instead of the fax or email but your spouse must also list
-                            an address that’s not a PO box.</em></p>
-
-                        <p><em>Fax number (optional)</em></p>
-                        {% input_field type="text" name="address_to_send_official_document_fax_spouse" class="form-block input-wide response-textbox" %}
-                        <p><em>Email Address (optional)</em></p>
-                        {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_spouse" class="form-block input-wide response-textbox" %}
-                    </div>
-                </div>
-
                 <div style="display: flex">
                     <form action="{% url 'question_steps' '09_other_questions' %}">
                         <input type="submit" value="Back"/>
@@ -110,3 +47,14 @@
     </div>
 </div>
 {% endblock %}
+
+{% block sidebarText %}
+<div>
+    <p>
+        You can file your divorce documents at any Supreme Court registry.
+        Usually, people file their documents at the Supreme Court registry nearest to where they live or work
+        <a href="http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx">(Supreme Court registry addresses).</a>
+        When you go to the registry, ask any staff person to direct you to the divorce counter.
+    </p>
+</div>
+{% endblock %}
diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py
index f87a973b..aff64f0c 100644
--- a/edivorce/apps/core/urls.py
+++ b/edivorce/apps/core/urls.py
@@ -17,7 +17,7 @@ urlpatterns = [
 
     url(r'^pdf-form(?P<form_number>[0-9]{1,3})$', pdf.form, name="pdf_form"),
     url(r'^prequalification/step_(?P<step>[0-9]{2})$', main.prequalification, name="prequalification"),
-    url(r'^question/(?P<step>.*)', main.form, name="question_steps"),
+    url(r'^question/(?P<step>.*)', main.question, name="question_steps"),
     url(r'^', main.intro, name="intro"),
 ]
 
diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py
index 056bc934..09508ffa 100644
--- a/edivorce/apps/core/utils/question_step_mapping.py
+++ b/edivorce/apps/core/utils/question_step_mapping.py
@@ -18,22 +18,27 @@ question_step_mapping = {'prequalification': ['married_marriage_like', 'lived_in
                          'spousal_support': ['spouse_support_details', 'spouse_support_act',],
                          'property_and_debt': ['deal_with_property_debt', 'how_to_divide_property_debt', 'other_property_claims',],
                          'other_orders': [],
-                         'other_questions': [],
-                         'filing_locations': ['court_registry_for_filing',
-                                              'address_to_send_official_document_street_you',
-                                              'address_to_send_official_document_city_you',
-                                              'address_to_send_official_document_prov_you',
-                                              'address_to_send_official_document_country_you',
-                                              'address_to_send_official_document_other_country_you',
-                                              'address_to_send_official_document_postal_code_you',
-                                              'address_to_send_official_document_fax_you',
-                                              'address_to_send_official_document_email_you',
-                                              'address_to_send_official_document_street_spouse',
-                                              'address_to_send_official_document_city_spouse',
-                                              'address_to_send_official_document_prov_spouse',
-                                              'address_to_send_official_document_country_spouse',
-                                              'address_to_send_official_document_other_country_spouse',
-                                              'address_to_send_official_document_postal_code_spouse',
-                                              'address_to_send_official_document_fax_spouse',
-                                              'address_to_send_official_document_email_spouse',],
+                         'other_questions': ['address_to_send_official_document_street_you',
+                                             'address_to_send_official_document_city_you',
+                                             'address_to_send_official_document_prov_you',
+                                             'address_to_send_official_document_country_you',
+                                             'address_to_send_official_document_other_country_you',
+                                             'address_to_send_official_document_postal_code_you',
+                                             'address_to_send_official_document_fax_you',
+                                             'address_to_send_official_document_email_you',
+                                             'address_to_send_official_document_street_spouse',
+                                             'address_to_send_official_document_city_spouse',
+                                             'address_to_send_official_document_prov_spouse',
+                                             'address_to_send_official_document_country_spouse',
+                                             'address_to_send_official_document_other_country_spouse',
+                                             'address_to_send_official_document_postal_code_spouse',
+                                             'address_to_send_official_document_fax_spouse',
+                                             'address_to_send_official_document_email_spouse', ],
+                         'filing_locations': ['court_registry_for_filing',],
                          }
+
+
+"""
+    Dictionary for a list of court registries
+"""
+list_of_registries = ['Vancouver', 'Burnaby', 'Port Coquitlam', 'New Westminster',]
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 1102a98c..314e26f7 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -4,6 +4,7 @@ from django.utils import timezone
 from ..decorators import bceid_required
 from ..models import BceidUser
 from ..utils.user_response import get_responses_from_db, get_responses_from_db_grouped_by_steps, get_responses_from_session, copy_session_to_db
+from edivorce.apps.core.utils.question_step_mapping import list_of_registries
 
 
 @bceid_required
@@ -67,7 +68,7 @@ def prequalification(request, step):
 
 
 @bceid_required
-def form(request, step):
+def question(request, step):
     """
     View rendering main questions
     For review page, use response grouped by step to render page
@@ -78,6 +79,9 @@ def form(request, step):
         responses_dict = get_responses_from_db_grouped_by_steps(user)
     else:
         responses_dict = get_responses_from_db(user)
+    # If page is filing location page, add registries dictionary for list of court registries
+    if step == "10_location":
+        responses_dict['registries'] = sorted(list_of_registries)
     return render(request, template_name=template, context=responses_dict)