diff --git a/edivorce/apps/core/templates/base.html b/edivorce/apps/core/templates/base.html
index 1eaaf91a..fe887abe 100644
--- a/edivorce/apps/core/templates/base.html
+++ b/edivorce/apps/core/templates/base.html
@@ -32,7 +32,7 @@
                 <div class="row">
                     <div class="col-sm-8">
                         <div class="top_banner-logo">
-                            <a href="{% url 'index' %}"><img src="{% static 'svg/bc-logo.svg' %}" /></a>
+                            <a href="{% url 'intro' %}"><img src="{% static 'svg/bc-logo.svg' %}" /></a>
                             <h4>Uncontested Divorce <span class="beta">beta</span></h4>
                         </div>
                     </div>
diff --git a/edivorce/apps/core/templates/dashboard.html b/edivorce/apps/core/templates/dashboard.html
deleted file mode 100644
index 8051975f..00000000
--- a/edivorce/apps/core/templates/dashboard.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Dashboard{% endblock %}
-
-{% block content %}
-<div class="row">
-  <div class="col-lg-12">
-    <p>Dashboard</p>
-  </div>
-</div>
-{% endblock %}
diff --git a/edivorce/apps/core/templates/f1/00_intro.html b/edivorce/apps/core/templates/f1/00_intro.html
deleted file mode 100644
index f39dd23b..00000000
--- a/edivorce/apps/core/templates/f1/00_intro.html
+++ /dev/null
@@ -1,87 +0,0 @@
-{% extends 'base.html' %}
-{% load input_option %}
-
-{% block title %}{{ block.super }}: Other Orders{% endblock %}
-
-{% block content %}
-<div class="container-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-8 col-md-offset-2">
-                <h3>Do you have a separation agreement
-                        <i class="fa fa-question-circle" 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 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." aria-hidden="true"></i>
-                        or a court order
-                        <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
-                               title="<b>Court Orders Definition</b><br /><br />A record of a decision made by a judge or master that tells you
-                               or your spouse what you must do (or not do).  For example: The court has made an order that
-                               your spouse must pay you $250 on a monthly basis to help pay off your combined debt." aria-hidden="true"></i>
-                        that sets out what you've agreed to or what the court has already ordered about parenting, child and spousal support, and/or property?</h3>
-                <div class="btn-radio-group" data-toggle="buttons">
-                    <label class="btn btn-radio">
-                        {% input_option type="radio" name="agreement" value="YES" autocomplete="off" data_target_id="have_order" data_reveal_target="true" data_related_id="no_order" %} Yes
-                    </label>
-
-                    <label class="btn btn-radio">
-                        {% input_option type="radio" name="agreement" value="NO" autocomplete="off" data_target_id="have_order" data_reveal_target="false" data_related_id="no_order" %} No
-                    </label>
-                </div>
-
-                <div class="information-message" id="have_order" hidden>
-                    <p>Refer to that separation agreement or court order when filling out the documents for divorce. You'll also need to attach a copy to the documents you file with the court.</p>
-                    <p>The parts of the agreement that deal with parenting and support can be enforced as if they were in a court order.</p>
-                    <p>More information on <a href="http://www.familylaw.lss.bc.ca/guides/mini/fileAgreementSC.php" target="_blank">how to flle your agreement</a> can be found on the Legal Services Society web site.</p>
-                </div>
-
-                <div id="no_order" hidden>
-                    <p>
-                        When you divorce or separate from your spouse or common-law partner, there are many issues you may need work out. These include:
-                    </p>
-                    <ul>
-                        <li>How will you take care of the children?</li>
-                        <li>How will you divide property and debt?</li>
-                        <li>Will one of you pay child support?</li>
-                        <li>Will one of you pay spousal support?</li>
-                    </ul>
-                    <p>
-                        If you and your spouse can work together to reach a fair agreement, it's important that you have it written down and that both of you sign it.
-                    </p>
-                    <p>More information on <a href="http://www.familylaw.lss.bc.ca/guides/mini/fileAgreementSC.php" target="_blank">how to flle your agreement</a> can be found on the Legal Services Society web site.</p>
-                </div>
-                <form action="{% url 'form_steps' 'f1' '01_orders' %}">
-                <input type="submit" value="Next"/>
-            </form>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-{% block sidebarText %}
-    <div>
-        <p>
-            If you need to get a separation agreement, contact a family justice counsellor, mediator, or family law lawyer
-            for help.
-        </p>
-        <p>
-            The Legal Services Society web site has a number of resources to help you to find out how to draft your own
-            agreement:
-        </p>
-        <ul>
-            <li><a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/makingAnAgmtAfterYouSeparate.php" target="_blank">Making an
-                agreement after you separate</a></li>
-            <li><a href="ttp://www.familylaw.lss.bc.ca/resources/fact_sheets/whoCanHelpYouReachAnAgmt.php" target="_blank">Who can help you
-                reach an agreement?</a></li>
-            <li><a href="http://www.familylaw.lss.bc.ca/guides/separation/index.php" target="_blank">Self-help guide How to write your own
-                separation agreement</a></li>
-        </ul>
-        <p>
-            A <a href="http://www.justiceeducation.ca/sites/default/files/worksheets/Separation%20Agreement%20Worksheet.pdf" target="_blank">
-                separation agreement workshop</a> is also available on the Justice Education Society web site.
-        </p>
-        <p>A separation agreement is only required to be filed or disclosed in a joint divorce action if you have children,
-            in which case it is attached as an exhibit to the Child Support Affidavit. In a sole proceeding, you must
-            disclose this information right in Form F3.</p>
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/f35/review.html b/edivorce/apps/core/templates/f35/review.html
deleted file mode 100644
index 79c9a5a0..00000000
--- a/edivorce/apps/core/templates/f35/review.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Review{% endblock %}
-
-{% block content %}
-<div class="row">
-  <div class="col-lg-12">
-    <p>Review</p>
-  </div>
-</div>
-{% endblock %}
diff --git a/edivorce/apps/core/templates/f36/review.html b/edivorce/apps/core/templates/f36/review.html
deleted file mode 100644
index 79c9a5a0..00000000
--- a/edivorce/apps/core/templates/f36/review.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Review{% endblock %}
-
-{% block content %}
-<div class="row">
-  <div class="col-lg-12">
-    <p>Review</p>
-  </div>
-</div>
-{% endblock %}
diff --git a/edivorce/apps/core/templates/f38/review.html b/edivorce/apps/core/templates/f38/review.html
deleted file mode 100644
index 79c9a5a0..00000000
--- a/edivorce/apps/core/templates/f38/review.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Review{% endblock %}
-
-{% block content %}
-<div class="row">
-  <div class="col-lg-12">
-    <p>Review</p>
-  </div>
-</div>
-{% endblock %}
diff --git a/edivorce/apps/core/templates/f52/review.html b/edivorce/apps/core/templates/f52/review.html
deleted file mode 100644
index 79c9a5a0..00000000
--- a/edivorce/apps/core/templates/f52/review.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Review{% endblock %}
-
-{% block content %}
-<div class="row">
-  <div class="col-lg-12">
-    <p>Review</p>
-  </div>
-</div>
-{% endblock %}
diff --git a/edivorce/apps/core/templates/home.html b/edivorce/apps/core/templates/home.html
deleted file mode 100644
index 5e72f75c..00000000
--- a/edivorce/apps/core/templates/home.html
+++ /dev/null
@@ -1 +0,0 @@
-home
diff --git a/edivorce/apps/core/templates/index.html b/edivorce/apps/core/templates/index.html
deleted file mode 100644
index 00e78d9f..00000000
--- a/edivorce/apps/core/templates/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Login{% endblock %}
-
-{% block page_heading %}Step 1: Home{% endblock page_heading %}
-
-{% block content %}
-<div class="container-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-8 col-md-offset-2">
-                <p>Home</p>
-                <h3>Intro page</h3>
-                <form action="{% url 'intro' %}">
-                    <input type="submit" value="To Intro" style="border: solid"/>
-                </form>
-                <h3>Prequalification page</h3>
-                <form action="{% url 'prequalification' '01' %}">
-                    <input type="submit" value="To Prequalification" style="border: solid"/>
-                </form>
-                <h3>F1 page</h3>
-                <form action="{% url 'form_steps' 'f1' '01_orders' %}">
-                    <input type="submit" value="To F1" style="border: solid"/>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-{% block sidebar %}{% endblock %}
diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html
index 51838fd6..a5ab5a28 100644
--- a/edivorce/apps/core/templates/overview.html
+++ b/edivorce/apps/core/templates/overview.html
@@ -14,17 +14,17 @@
                             <div>
                                 <ul>
                                     <li style="display: flex"><a href="{% url 'prequalification' '01' %}">Qualifying Questions</a><p style="margin-left: 90px">{{prequalification}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '01_orders' %}">Step 1: What are you asking for?</a><p style="margin-left: 90px">{{which_orders}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '02_claimant' %}">Step 2: Your information</a><p style="margin-left: 90px">{{your_information}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '03_respondent' %}">Step 3: Your spouse</a><p style="margin-left: 90px">{{your_spouse}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '04_marriage' %}">Step 4: Your marriage</a><p style="margin-left: 90px">{{your_marriage}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '05_reason' %}">Step 5: Your separation</a><p style="margin-left: 90px">{{your_separation}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '06_support' %}">Step 6: Spousal support</a><p style="margin-left: 90px">{{spousal_support}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '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 'form_steps' 'f1' '08_other_orders' %}">Step 8: Other orders</a><p style="margin-left: 90px">{{other_orders}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '09_other_questions' %}">Step 9: Other questions</a><p style="margin-left: 90px">{{other_questions}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '10_location' %}">Step 10: Filing locations</a><p style="margin-left: 90px">{{filing_locations}}</p></li>
-                                    <li style="display: flex"><a href="{% url 'form_steps' 'f1' '11_review' %}">Step 11: Review</a></li>
+                                    <li style="display: flex"><a href="{% url 'question_steps' '01_orders' %}">Step 1: What are you asking for?</a><p style="margin-left: 90px">{{which_orders}}</p></li>
+                                    <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' '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>
+                                    <li style="display: flex"><a href="{% url 'question_steps' '09_other_questions' %}">Step 9: Other questions</a><p style="margin-left: 90px">{{other_questions}}</p></li>
+                                    <li style="display: flex"><a href="{% url 'question_steps' '10_location' %}">Step 10: Filing locations</a><p style="margin-left: 90px">{{filing_locations}}</p></li>
+                                    <li style="display: flex"><a href="{% url 'question_steps' '11_review' %}">Step 11: Review</a></li>
                                 </ul>
                             </div>
                         </li>
diff --git a/edivorce/apps/core/templates/chunks/review_user_responses.html b/edivorce/apps/core/templates/partials/review_user_responses.html
similarity index 100%
rename from edivorce/apps/core/templates/chunks/review_user_responses.html
rename to edivorce/apps/core/templates/partials/review_user_responses.html
diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html
index 85d75ff4..2b3d1cda 100644
--- a/edivorce/apps/core/templates/pdf/form1.html
+++ b/edivorce/apps/core/templates/pdf/form1.html
@@ -48,7 +48,7 @@
                     <td colspan="2"> Claimant 1 and Claimant 2: </td>
                 </tr>
                 <tr>
-                    <td><i class="fa {% if responses.when_were_you_live_married_like %} icon-check>&#xe800;</i>{% else %} icon-check-empty">&#xf096;</i> {% endif %} began to live together in a marriage-like relationship on [<em>dd/mm/yyyy</em>]</td>
+                    <td><i class="fa {% if responses.when_were_you_live_married_like %} icon-check">&#xe800;</i>{% else %} icon-check-empty">&#xf096;</i> {% endif %} began to live together in a marriage-like relationship on [<em>dd/mm/yyyy</em>]</td>
                     <td colname="c2"> {% if responses.when_were_you_live_married_like %} {{ responses.when_were_you_live_married_like }} {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}</td>
                 </tr>
                 <tr>
diff --git a/edivorce/apps/core/templates/prequalification/step_01.html b/edivorce/apps/core/templates/prequalification/step_01.html
index d5416ff4..d94fe1bc 100644
--- a/edivorce/apps/core/templates/prequalification/step_01.html
+++ b/edivorce/apps/core/templates/prequalification/step_01.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
@@ -14,7 +14,7 @@
                     work for you.</p>
                 <h3>Are you</h3>
                 <div class="radio"><label>
-                    {% input_option type="radio"  name="married_marriage_like" value="Legally married" %}
+                    {% input_field type="radio"  name="married_marriage_like" value="Legally married" %}
                     Legally married<i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
                                       data-html="true"
                                       title="<b>LEGALLY MARRIED</b><br /><br />Legally married is defined as: when two people agree
@@ -25,7 +25,7 @@
                 </div>
 
                 <div class="radio"><label>
-                    {% input_option type="radio"  name="married_marriage_like" value="Living together in a marriage like relationship" %}
+                    {% input_field type="radio"  name="married_marriage_like" value="Living together in a marriage like relationship" %}
                     Living together in a marriage like<i class="fa fa-question-circle" data-toggle="tooltip"
                                                          data-placement="right" data-html="true"
                                                          title="<b>MARRIAGE LIKE RELATIONSHIP</b><br /><br />The term &quot;common-law relationship&quot;
diff --git a/edivorce/apps/core/templates/prequalification/step_02.html b/edivorce/apps/core/templates/prequalification/step_02.html
index d25c3389..6d618876 100644
--- a/edivorce/apps/core/templates/prequalification/step_02.html
+++ b/edivorce/apps/core/templates/prequalification/step_02.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
@@ -14,11 +14,11 @@
 
                     <div class="btn-radio-group" data-toggle="buttons">
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="lived_in_bc" autocomplete="off" value="YES" data_target_id="cannot_divorce_in_bc" data_reveal_target="false" %} Yes
+                            {% input_field type="radio" name="lived_in_bc" autocomplete="off" value="YES" data_target_id="cannot_divorce_in_bc" data_reveal_target="false" %} Yes
                         </label>
 
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="lived_in_bc" autocomplete="off" value="NO" data_target_id="cannot_divorce_in_bc" data_reveal_target="true" %} No
+                            {% input_field type="radio" name="lived_in_bc" autocomplete="off" value="NO" data_target_id="cannot_divorce_in_bc" data_reveal_target="true" %} No
                         </label>
                     </div>
 
@@ -50,11 +50,11 @@
 
                     <div class="btn-radio-group" data-toggle="buttons">
                         <label class="btn btn-radio">
-                            {% input_option type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="YES" data_target_id="divorce_precondition" data_reveal_target="false" %} Yes
+                            {% input_field type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="YES" data_target_id="divorce_precondition" data_reveal_target="false" %} Yes
                         </label>
 
                         <label class="btn btn-radio">
-                            {% input_option type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="NO" data_target_id="divorce_precondition" data_reveal_target="true" %} No
+                            {% input_field type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="NO" data_target_id="divorce_precondition" data_reveal_target="true" %} No
                         </label>
                     </div>
 
diff --git a/edivorce/apps/core/templates/prequalification/step_03.html b/edivorce/apps/core/templates/prequalification/step_03.html
index 14eaa6de..5c52d40c 100644
--- a/edivorce/apps/core/templates/prequalification/step_03.html
+++ b/edivorce/apps/core/templates/prequalification/step_03.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
@@ -16,7 +16,7 @@
                        have clearly communicated  your intention for a permanent separation (and are starting to act upon it).</p>
                         <p>This could mean:</p><ul><li>You're living in separate rooms</li><li>You're sleeping in separate beds</li><li>There's no sexual relationship</li>" aria-hidden="true"></i>?
                     </h3>
-                    <p>{% input_option type="text" name="separation_date" class="date-picker" id="separated_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
+                    <p>{% input_field type="text" name="separation_date" class="date-picker" id="separated_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
 
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_determine_separation_date" aria-controls="collapse_determine_separation_date">
                         <div>
@@ -79,10 +79,10 @@
 
                 <div>
                     <h3>Did you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} try and reconcile after you separated <span id="separation_date_span"></span>?</h3>
-                    <div class="radio"><label>{% input_option type="radio" name="try_reconcile_after_separated" value="NO" %}
+                    <div class="radio"><label>{% input_field type="radio" name="try_reconcile_after_separated" value="NO" %}
                         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_option type="radio" name="try_reconcile_after_separated" value="YES" %}
+                    <div class="radio"><label>{% input_field type="radio" name="try_reconcile_after_separated" value="YES" %}
                         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>
 
diff --git a/edivorce/apps/core/templates/prequalification/step_04.html b/edivorce/apps/core/templates/prequalification/step_04.html
index 3691d465..c1cf350a 100644
--- a/edivorce/apps/core/templates/prequalification/step_04.html
+++ b/edivorce/apps/core/templates/prequalification/step_04.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
@@ -22,11 +22,11 @@
 
                 <div class="btn-radio-group" data-toggle="buttons">
                     <label class="btn btn-radio">
-                        {% input_option type="radio"  name="children_of_marriage" autocomplete="off" value="YES" data_target_id="has_children" data_reveal_target="true" %} Yes
+                        {% input_field type="radio"  name="children_of_marriage" autocomplete="off" value="YES" data_target_id="has_children" data_reveal_target="true" %} Yes
                     </label>
 
                     <label class="btn btn-radio">
-                        {% input_option type="radio"  name="children_of_marriage" autocomplete="off" value="NO" data_target_id="has_children" data_reveal_target="false" %} No
+                        {% input_field type="radio"  name="children_of_marriage" autocomplete="off" value="NO" data_target_id="has_children" data_reveal_target="false" %} No
                     </label>
                 </div>
 
@@ -43,11 +43,11 @@
 
                     <div class="btn-radio-group" data-toggle="buttons">
                         <label class="btn btn-radio">
-                            {% input_option type="radio"  name="any_under_19" autocomplete="off" value="YES" data_target_id="younger_19" data_reveal_target="true" data_related_id="financial_support" %} Yes
+                            {% input_field type="radio"  name="any_under_19" autocomplete="off" value="YES" data_target_id="younger_19" data_reveal_target="true" data_related_id="financial_support" %} Yes
                         </label>
 
                         <label class="btn btn-radio">
-                            {% input_option type="radio"  name="any_under_19" autocomplete="off" value="NO" data_target_id="younger_19" data_reveal_target="false" data_related_id="financial_support" %} No
+                            {% input_field type="radio"  name="any_under_19" autocomplete="off" value="NO" data_target_id="younger_19" data_reveal_target="false" data_related_id="financial_support" %} No
                         </label>
                     </div>
 
@@ -63,11 +63,11 @@
                     <div class="reveal" id="financial_support" hidden>
                         <h3>Are you financially supporting any of the children that are 19 years or older? Please check all that apply.</h3>
                         <div class="checkbox-group">
-                            <div class="checkbox"><label>{% input_option type="checkbox" name="children_financial_support" value="No" data_target_id="need_support" data_reveal_target="false" %}No</label></div>
-                            <div class="checkbox"><label>{% input_option type="checkbox" name="children_financial_support" value="Yes, attending post secondary institution (e.g. college, university)" data_target_id="need_support" data_reveal_target="true" %}Yes, attending post secondary institution (e.g. college, university)</label></div>
-                            <div class="checkbox"><label>{% input_option type="checkbox" name="children_financial_support" value="Yes, due to disability" data_target_id="need_support" data_reveal_target="true" %}Yes, due to disability</label></div>
-                            <div class="checkbox"><label>{% input_option type="checkbox" name="children_financial_support" value="Yes, due to illness" data_target_id="need_support" data_reveal_target="true" %}Yes, due to illness</label></div>
-                            <div class="checkbox"><label>{% input_option type="checkbox" name="children_financial_support" value="Yes, other reason" data_target_id="need_support" data_reveal_target="true" %}Yes, other reason(s)</label></div>
+                            <div class="checkbox"><label>{% input_field type="checkbox" name="children_financial_support" value="No" data_target_id="need_support" data_reveal_target="false" %}No</label></div>
+                            <div class="checkbox"><label>{% input_field type="checkbox" name="children_financial_support" value="Yes, attending post secondary institution (e.g. college, university)" data_target_id="need_support" data_reveal_target="true" %}Yes, attending post secondary institution (e.g. college, university)</label></div>
+                            <div class="checkbox"><label>{% input_field type="checkbox" name="children_financial_support" value="Yes, due to disability" data_target_id="need_support" data_reveal_target="true" %}Yes, due to disability</label></div>
+                            <div class="checkbox"><label>{% input_field type="checkbox" name="children_financial_support" value="Yes, due to illness" data_target_id="need_support" data_reveal_target="true" %}Yes, due to illness</label></div>
+                            <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" %}Yes, other reason(s)</label></div>
                         </div>
                         <div class="information-message bg-danger" 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.
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index 06fad216..9e0f33e5 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
@@ -29,11 +29,11 @@
                 
                 <div class="btn-radio-group" data-toggle="buttons">
                     <label class="btn btn-radio">
-                        {% input_option type="radio"  name="original_marriage_certificate" autocomplete="off" value="YES" data_target_id="marriage_certificate" data_reveal_target="false" %} Yes
+                        {% input_field type="radio"  name="original_marriage_certificate" autocomplete="off" value="YES" data_target_id="marriage_certificate" data_reveal_target="false" %} Yes
                     </label>
 
                     <label class="btn btn-radio">
-                        {% input_option type="radio"  name="original_marriage_certificate" autocomplete="off" value="NO" data_target_id="marriage_certificate" data_reveal_target="true" %} No
+                        {% input_field type="radio"  name="original_marriage_certificate" autocomplete="off" value="NO" data_target_id="marriage_certificate" data_reveal_target="true" %} No
                     </label>
                 </div>
 
@@ -67,11 +67,11 @@
 
                     <div class="btn-radio-group" data-toggle="buttons">
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="provide_certificate_later" autocomplete="off" value="YES" data_target_id="reason_not_providing" data_reveal_target="false" data_related_id="provide_later_date" %} Yes
+                            {% input_field type="radio" name="provide_certificate_later" autocomplete="off" value="YES" data_target_id="reason_not_providing" data_reveal_target="false" data_related_id="provide_later_date" %} Yes
                         </label>
 
                         <label class="btn btn-radio btn-radio-long">
-                            {% input_option type="radio" name="provide_certificate_later" autocomplete="off" value="NO" data_target_id="reason_not_providing" data_reveal_target="true" data_related_id="provide_later_date" %} No, it is impossible to obtain a marriage certificate (or registration of marriage
+                            {% input_field type="radio" name="provide_certificate_later" autocomplete="off" value="NO" data_target_id="reason_not_providing" data_reveal_target="true" data_related_id="provide_later_date" %} No, it is impossible to obtain a marriage certificate (or registration of marriage
                         </label>
                     </div>
 
@@ -97,7 +97,7 @@
                            title="<b>Notice of Joint Family Claim</b><br /><br />This is the document that start the court case.
                            The Notice of Joint Family Claim (form F1) gives the court details about you and your spouse, about your marriage
                            and separation, and about what you're asking the court for.</a>." aria-hidden="true"></i>(form F1).</p>
-                        {% input_option type="textarea" class="response-textarea" name="provide_certificate_later_reason" rows="8" cols="65" %}
+                        {% input_field type="textarea" class="response-textarea" name="provide_certificate_later_reason" rows="8" cols="65" %}
                         <p>If the registrar
                             <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
                            title="<b>registrar</b><br /><br />An officer of the court who has the power to make
@@ -122,7 +122,7 @@
                         </div>
                         <h3>Please tell us why it is impossible to obtain a marriage certificate or registration of marriage.
                             The registrar will review and then decide whether or not they will accept your reason (s).</h3>
-                        {% input_option type="textarea" class="response-textarea" name="not_provide_certificate_reason" rows="8" cols="65" %}
+                        {% input_field type="textarea" class="response-textarea" name="not_provide_certificate_reason" rows="8" cols="65" %}
                     </div>
                 </div>
 
@@ -131,11 +131,11 @@
 
                     <div class="btn-radio-group" data-toggle="buttons">
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="marriage_certificate_in_english" autocomplete="off" value="YES" data_target_id="certificate_in_english" data_reveal_target="false" %} Yes
+                            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="YES" data_target_id="certificate_in_english" data_reveal_target="false" %} Yes
                         </label>
 
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="marriage_certificate_in_english" autocomplete="off" value="NO" data_target_id="certificate_in_english" data_reveal_target="true" %} No
+                            {% input_field type="radio" name="marriage_certificate_in_english" autocomplete="off" value="NO" data_target_id="certificate_in_english" data_reveal_target="true" %} No
                         </label>
                     </div>
 
diff --git a/edivorce/apps/core/templates/prequalification/step_06.html b/edivorce/apps/core/templates/prequalification/step_06.html
index eac9f3b3..e084a09e 100644
--- a/edivorce/apps/core/templates/prequalification/step_06.html
+++ b/edivorce/apps/core/templates/prequalification/step_06.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
@@ -15,7 +15,7 @@
                     has broken down and cannot be repaired.</em>
                 </p>
                     <div>
-                        <div class="radio"><label>{% input_option type="radio"  name="divorce_reason" value="live separate" data_target_id="other_reason" data_reveal_target="false" %}You and your spouse have lived separate and apart for one year or more</label></div>
+                        <div class="radio"><label>{% input_field type="radio"  name="divorce_reason" value="live separate" data_target_id="other_reason" data_reveal_target="false" %}You and your spouse have lived separate and apart for one year or more</label></div>
                         <p><em>Usually the grounds for divorce are that you've been living separately and apart form your spouse for at least one year</em></p>
                         <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_separated_apart" aria-controls="collapse_separated_apart">
                             <div>
@@ -71,7 +71,7 @@
                         </div>
                     </div>
                 <div>
-                    <div class="radio"><label>{% input_option type="radio"  name="divorce_reason" value="other" data_target_id="other_reason" data_reveal_target="true" %}Other reasons (grounds)</label></div>
+                    <div class="radio"><label>{% input_field type="radio"  name="divorce_reason" value="other" data_target_id="other_reason" data_reveal_target="true" %}Other reasons (grounds)</label></div>
 
                     <div class="information-message bg-danger" 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
diff --git a/edivorce/apps/core/templates/preview/f1.html b/edivorce/apps/core/templates/preview/f1.html
deleted file mode 100644
index 79c9a5a0..00000000
--- a/edivorce/apps/core/templates/preview/f1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Review{% endblock %}
-
-{% block content %}
-<div class="row">
-  <div class="col-lg-12">
-    <p>Review</p>
-  </div>
-</div>
-{% endblock %}
diff --git a/edivorce/apps/core/templates/f1/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
similarity index 90%
rename from edivorce/apps/core/templates/f1/01_orders.html
rename to edivorce/apps/core/templates/question/01_orders.html
index 4487e186..f93a4e78 100644
--- a/edivorce/apps/core/templates/f1/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
@@ -21,7 +21,7 @@
                     <div>
                         <div class="checkbox">
                             <label>
-                                {% input_option type="checkbox" name="want_which_orders" value="A legal end to the marriage" %}<b>A legal end to the marriage</b>
+                                {% 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>
@@ -55,7 +55,7 @@
                             </div>
                         </div>
                     </div>
-                    <div><div class="checkbox"><label>{% input_option 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><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>
                         <p><em>Payments to support you, not the children.</em></p>
                         <p><em>For more information, please see the fact sheet Spousal Support
                             <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
@@ -80,7 +80,7 @@
                             <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>
-                    <div><div class="checkbox"><label>{% input_option 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>
+                    <div><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><em>Anything you own including real estate, bank accounts, cars and RRSPs.</em></p>
                         <p><em>For more information, please refer to  the following fact sheets on the  Legal Services Society website:</em></p>
                         <ul>
@@ -102,10 +102,10 @@
                                 </ul>
                         </div>
                     </div>
-                    <div><div class="checkbox"><label>{% input_option type="checkbox" name="want_which_orders" value="Other orders" %}<b>Other orders</b></label></div>
+                    <div><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="checkbox"><label>{% input_option type="checkbox" name="want_which_orders" value="Child support" data_target_id="child_support_alert" data_reveal_target="true" %}<b>Child support (Out of scope)</b></label></div>
+                    <div><div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Child support" data_target_id="child_support_alert" data_reveal_target="true" %}<b>Child support (Out of scope)</b></label></div>
                         <div class="information-message bg-danger" id="child_support_alert" hidden>
                             <p>We've noticed that at this point in time you are not applying for spousal support and/or division of property, debt, or a pension. If you decide to request these items in the future there are some time limits.</p>
                             <h2>Division of Property and Debts</h2>
@@ -118,13 +118,13 @@
                 </div>
 
                 <div style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '00_intro' %}">
+                    <form action="{% url 'overview' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '02_claimant' %}">
+                    <form action="{% url 'question_steps' '02_claimant' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
similarity index 81%
rename from edivorce/apps/core/templates/f1/02_claimant.html
rename to edivorce/apps/core/templates/question/02_claimant.html
index 30775fe4..a22aee3d 100644
--- a/edivorce/apps/core/templates/f1/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Your Information{% endblock %}
 
@@ -13,7 +13,7 @@
 
                 <div>
                     <h3>Please enter your name as it appears on the marriage certificate</h3>
-                    {% input_option type="text" name="name_you" class="form-block input-wide response-textbox" %}
+                    {% input_field type="text" name="name_you" class="form-block input-wide response-textbox" %}
 
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_changed_name" aria-controls="collapse_changed_name">
                         <div>
@@ -45,11 +45,11 @@
 
                     <div class="btn-radio-group" data-toggle="buttons">
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="any_other_name_you" autocomplete="off" value="YES" data_target_id="enter_name" data_reveal_target="true" %} Yes
+                            {% input_field type="radio" name="any_other_name_you" autocomplete="off" value="YES" data_target_id="enter_name" data_reveal_target="true" %} Yes
                         </label>
 
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="any_other_name_you" autocomplete="off" value="NO" data_target_id="enter_name" data_reveal_target="false" %} No
+                            {% input_field type="radio" name="any_other_name_you" autocomplete="off" value="NO" data_target_id="enter_name" data_reveal_target="false" %} No
                         </label>
                     </div>
 
@@ -79,20 +79,20 @@
 
                     <div id="enter_name" hidden>
                         <h3>Please enter the name</h3>
-                        {% input_option type="text" name="other_name_you" class="form-block input-wide response-textbox" %}
+                        {% input_field type="text" name="other_name_you" class="form-block input-wide response-textbox" %}
                         <input type="button" value="Add name"/>
                     </div>
                 </div>
 
                 <div>
                     <h3>What was your last name when you were born?</h3>
-                    {% input_option type="text" name="last_name_born_you" class="form-block input-wide response-textbox" %}
+                    {% input_field type="text" name="last_name_born_you" class="form-block input-wide response-textbox" %}
                     <p>This is often referred to as Family name or Surname</p>
                 </div>
 
                 <div>
                     <h3>What was your last name before you were married?</h3>
-                    {% input_option type="text" name="last_name_before_married_you" class="form-block input-wide response-textbox" %}
+                    {% input_field type="text" name="last_name_before_married_you" class="form-block input-wide response-textbox" %}
                     <p>This is often referred to as Family name or Surname</p>
                 </div>
             </div>
@@ -106,15 +106,15 @@
             <div class="col-md-8 col-md-offset-2">
                 <div>
                     <h3>When is your birthday?</h3>
-                    <p>{% input_option type="text" name="birthday_you" class="date-picker" id="birth_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
+                    <p>{% input_field type="text" name="birthday_you" class="date-picker" id="birth_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
                 </div>
 
                 <div>
                     <h3>How long have you lived in British Columbia?</h3>
                     <p>Please select one</p>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="lived_in_bc_you" value="Since birth" %}Since birth</label></div>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other radio_with_textbox" name="lived_in_bc_you" value="Moved to British Columbia on" %}Moved to British Columbia on {% input_option type="text" name="moved_to_bc_date_you" id="moved_date" class="date-picker other-textbox" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></label></div>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="lived_in_bc_you" value="Do not live in British Columbia" %}Do not live in British Columbia</label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_you" value="Since birth" %}Since birth</label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="lived_in_bc_you" value="Moved to British Columbia on" %}Moved to British Columbia on {% input_field type="text" name="moved_to_bc_date_you" id="moved_date" class="date-picker other-textbox" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_you" value="Do not live in British Columbia" %}Do not live in British Columbia</label></div>
 
                     <p>In order to apply for a divorce in British Columbia, you or your spouse must have been a regular resident in B.C (the legal term is ordinarily resident
                     <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
@@ -149,13 +149,13 @@
                 </div>
 
                 <div style="display: flex">
-            <form action="{% url 'form_steps' 'f1' '01_orders' %}">
+            <form action="{% url 'question_steps' '01_orders' %}">
                 <input type="submit" value="Back"/>
             </form>
             <form action="#">
                 <input type="submit" value="Save"/>
             </form>
-            <form action="{% url 'form_steps' 'f1' '03_respondent' %}">
+            <form action="{% url 'question_steps' '03_respondent' %}">
                 <input type="submit" value="Next"/>
             </form>
         </div>
diff --git a/edivorce/apps/core/templates/f1/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
similarity index 79%
rename from edivorce/apps/core/templates/f1/03_respondent.html
rename to edivorce/apps/core/templates/question/03_respondent.html
index 740c6cb9..0f279235 100644
--- a/edivorce/apps/core/templates/f1/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}{% load input_option %}
+{% extends 'base.html' %}{% load input_field %}
 
 {% block title %}{{ block.super }}: Your Spouse{% endblock %}
 
@@ -12,7 +12,7 @@
 
                 <div>
                     <h3>Please enter your spouse's name as it appears on the marriage certificate</h3>
-                    {% input_option type="text" name="name_spouse" class="form-block input-wide response-textbox" %}
+                    {% input_field type="text" name="name_spouse" class="form-block input-wide response-textbox" %}
                     <p>This is also know as surname or family name.</p>
 
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
@@ -49,11 +49,11 @@
 
                     <div class="btn-radio-group" data-toggle="buttons">
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="any_other_name_spouse" autocomplete="off" value="YES" data_target_id="enter_name" data_reveal_target="true" %} Yes
+                            {% input_field type="radio" name="any_other_name_spouse" autocomplete="off" value="YES" data_target_id="enter_name" data_reveal_target="true" %} Yes
                         </label>
 
                         <label class="btn btn-radio">
-                            {% input_option type="radio" name="any_other_name_spouse" autocomplete="off" value="NO" data_target_id="enter_name" data_reveal_target="false" %} No
+                            {% input_field type="radio" name="any_other_name_spouse" autocomplete="off" value="NO" data_target_id="enter_name" data_reveal_target="false" %} No
                         </label>
                     </div>
 
@@ -80,7 +80,7 @@
 
                     <div id="enter_name" hidden>
                         <h3>Please enter the name</h3>
-                        {% input_option type="text" name="other_name_spouse" class="form-block input-wide response-textbox" %}
+                        {% input_field type="text" name="other_name_spouse" class="form-block input-wide response-textbox" %}
                         <input type="button" value="Add name"/>
                     </div>
 
@@ -88,13 +88,13 @@
 
                 <div>
                     <h3>What was their last name when they were born?</h3>
-                    {% input_option type="text" name="last_name_born_spouse" class="form-block input-wide response-textbox" %}
+                    {% input_field type="text" name="last_name_born_spouse" class="form-block input-wide response-textbox" %}
                     <p>This is often referred to as Family name or Surname</p>
                 </div>
 
                 <div>
                     <h3>What was their last name before you were married?</h3>
-                    {% input_option type="text" name="last_name_before_married_spouse" class="form-block input-wide response-textbox" %}
+                    {% input_field type="text" name="last_name_before_married_spouse" class="form-block input-wide response-textbox" %}
                     <p>This is often referred to as Family name or Surname</p>
                 </div>
             </div>
@@ -108,15 +108,15 @@
             <div class="col-md-8 col-md-offset-2">
                 <div>
                     <h3>When is your spouse's birthday?</h3>
-                    <p>{% input_option type="text" name="birthday_spouse" class="date-picker" id="birth_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
+                    <p>{% input_field type="text" name="birthday_spouse" class="date-picker" id="birth_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
                 </div>
 
                 <div>
                     <h3>How long has your spouse lived in British Columbia?</h3>
                     <p>Please select one</p>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="lived_in_bc_spouse" value="Since birth" %}Since birth</label></div>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other radio_with_textbox" name="lived_in_bc_spouse" value="Moved to British Columbia on" %}Moved to British Columbia on {% input_option type="text" name="moved_to_bc_date_spouse" id="moved_date" class="date-picker other-textbox" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></label></div>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="lived_in_bc_spouse" value="Do not live in British Columbia" %}Do not live in British Columbia</label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_spouse" value="Since birth" %}Since birth</label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="lived_in_bc_spouse" value="Moved to British Columbia on" %}Moved to British Columbia on {% input_field type="text" name="moved_to_bc_date_spouse" id="moved_date" class="date-picker other-textbox" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_spouse" value="Do not live in British Columbia" %}Do not live in British Columbia</label></div>
 
                     <p>In order to apply for a divorce in British Columbia, you or your spouse must have been a regular resident in B.C (the legal term is ordinarily resident
                     <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
@@ -151,13 +151,13 @@
                 </div>
 
                 <div style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '02_claimant' %}">
+                    <form action="{% url 'question_steps' '02_claimant' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '04_marriage' %}">
+                    <form action="{% url 'question_steps' '04_marriage' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/04_marriage.html b/edivorce/apps/core/templates/question/04_marriage.html
similarity index 72%
rename from edivorce/apps/core/templates/f1/04_marriage.html
rename to edivorce/apps/core/templates/question/04_marriage.html
index bfbba7b9..c7eb01bb 100644
--- a/edivorce/apps/core/templates/f1/04_marriage.html
+++ b/edivorce/apps/core/templates/question/04_marriage.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Your Marriage{% endblock %}
 
@@ -31,12 +31,12 @@
 
                 <div id="when_married">
                     <h3>When were you married?</h3>
-                    <p>{% input_option type="text" name="when_were_you_married" class="date-picker" id="marriage_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
+                    <p>{% input_field type="text" name="when_were_you_married" class="date-picker" id="marriage_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
                 </div>
 
                 <div id="lived_together">
                     <h3>When did you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} begin to live together in a marriage-like relationship?</h3>
-                    <p>{% input_option type="text" name="when_were_you_live_married_like" class="date-picker" id="lived_start_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
+                    <p>{% input_field type="text" name="when_were_you_live_married_like" class="date-picker" id="lived_start_date" placeholder="DD/MM/YYYY" %} <i class="fa fa-calendar circle" aria-hidden="true"></i></p>
 
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_start_date" aria-controls="collapse_start_date">
                         <div>
@@ -74,37 +74,37 @@
                     <h3>Where were you married?</h3>
                     <p>Enter the location as it appears on the marriage certificate (e.g. city, province or state and country)</p>
                     <p>City</p>
-                    {% input_option type="text" name="where_were_you_married_city" class="form-block input-wide response-textbox" %}
+                    {% input_field type="text" name="where_were_you_married_city" class="form-block input-wide response-textbox" %}
                     <p>Prov/State</p>
-                    {% input_option type="text" name="where_were_you_married_prov" class="form-block input-narrow response-textbox" %}
+                    {% input_field type="text" name="where_were_you_married_prov" class="form-block input-narrow response-textbox" %}
                     <p>Country</p>
 
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="where_were_you_married_country" value="Canada" %}Canada</label></div>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="where_were_you_married_country" value="USA" %}USA</label></div>
-                    <div class="radio"><label>{% input_option type="radio" class="radio-with-other radio_with_textbox" name="where_were_you_married_country" value="Other" %}Other {% input_option type="text" name="where_were_you_married_other_country" class="response-textbox other-textbox input-inline" %}</label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="where_were_you_married_country" value="Canada" %}Canada</label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="where_were_you_married_country" value="USA" %}USA</label></div>
+                    <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="where_were_you_married_country" value="Other" %}Other {% input_field type="text" name="where_were_you_married_other_country" class="response-textbox other-textbox input-inline" %}</label></div>
                 </div>
 
                 <div>
                     <h3>Before you got married to your spouse, what was your marital status?</h3>
-                    <div class="radio"><label>{% input_option type="radio" name="marital_status_before_you" value="Never married" %}Never married</label></div>
-                    <div class="radio"><label>{% input_option type="radio" name="marital_status_before_you" value="Divorced" %}Divorced</label></div>
-                    <div class="radio"><label>{% input_option type="radio" name="marital_status_before_you" value="Widowed" %}Widowed</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="marital_status_before_you" value="Never married" %}Never married</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="marital_status_before_you" value="Divorced" %}Divorced</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="marital_status_before_you" value="Widowed" %}Widowed</label></div>
                 </div>
 
                 <div>
                     <h3>What was the marital status of your spouse before your marriage?</h3>
-                    <div class="radio"><label>{% input_option type="radio" name="marital_status_before_spouse" value="Never married" %}Never married</label></div>
-                    <div class="radio"><label>{% input_option type="radio" name="marital_status_before_spouse" value="Divorced" %}Divorced</label></div>
-                    <div class="radio"><label>{% input_option type="radio" name="marital_status_before_spouse" value="Widowed" %}Widowed</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="marital_status_before_spouse" value="Never married" %}Never married</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="marital_status_before_spouse" value="Divorced" %}Divorced</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="marital_status_before_spouse" value="Widowed" %}Widowed</label></div>
                 </div>
                 <div style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '03_respondent' %}">
+                    <form action="{% url 'question_steps' '03_respondent' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '05_reason' %}">
+                    <form action="{% url 'question_steps' '05_reason' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/05_reason.html b/edivorce/apps/core/templates/question/05_reason.html
similarity index 86%
rename from edivorce/apps/core/templates/f1/05_reason.html
rename to edivorce/apps/core/templates/question/05_reason.html
index ba7245e1..145e3b6b 100644
--- a/edivorce/apps/core/templates/f1/05_reason.html
+++ b/edivorce/apps/core/templates/question/05_reason.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Reason For Divorce{% endblock %}
 
@@ -12,10 +12,10 @@
                 <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_option type="radio" name="try_reconcile_after_separated" %}
+                    <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_option type="radio" name="try_reconcile_after_separated" %}
+                    <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>
@@ -34,8 +34,8 @@
                         By selecting "I agree" this shows the court that you and your spouse have thoroughly thought out your request for divorce.
                     </p>
                     <h3>There is no possibility my spouse and I will get back together (reconciliation).</h3>
-                    <div class="radio"><label>{% input_option type="radio" name="no_reconciliation_possible" value="agree" %}I agree</label></div>
-                    <div class="radio"><label>{% input_option type="radio" name="no_reconciliation_possible" value="disagree" %}I disagree</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="no_reconciliation_possible" value="agree" %}I agree</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="no_reconciliation_possible" value="disagree" %}I disagree</label></div>
                 </div>
             </div>
         </div>
@@ -64,18 +64,18 @@
                        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_option type="radio" name="no_collusion" value="agree" %}I agree</label></div>
-                    <div class="radio"><label>{% input_option type="radio" name="no_collusion" value="disagree" %}I disagree</label></div>
+                    <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 style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '04_marriage' %}">
+                    <form action="{% url 'question_steps' '04_marriage' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '06_support' %}">
+                    <form action="{% url 'question_steps' '06_support' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/06_support.html b/edivorce/apps/core/templates/question/06_support.html
similarity index 94%
rename from edivorce/apps/core/templates/f1/06_support.html
rename to edivorce/apps/core/templates/question/06_support.html
index 0665ba60..2d4ae31d 100644
--- a/edivorce/apps/core/templates/f1/06_support.html
+++ b/edivorce/apps/core/templates/question/06_support.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Declarations{% endblock %}
 
@@ -12,7 +12,7 @@
 
                 <div>
                     <h3>You and your spouse are asking for an order for spousal support as follows:</h3>
-                    {% input_option type="textarea" name="spouse_support_details" rows="8" cols="65" class="response-textarea" %}
+                    {% 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">
                         <div>
@@ -82,8 +82,8 @@
             <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_option 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_option 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="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="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_support_act" aria-controls="collapse_support_act">
                         <div>
@@ -107,13 +107,13 @@
                     </div>
                 </div>
                 <div style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '06_proof' %}">
+                    <form action="{% url 'question_steps' '05_reason' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '07_property' %}">
+                    <form action="{% url 'question_steps' '07_property' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/07_property.html b/edivorce/apps/core/templates/question/07_property.html
similarity index 93%
rename from edivorce/apps/core/templates/f1/07_property.html
rename to edivorce/apps/core/templates/question/07_property.html
index 01a45502..64a8b1d0 100644
--- a/edivorce/apps/core/templates/f1/07_property.html
+++ b/edivorce/apps/core/templates/question/07_property.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Application Location{% endblock %}
 
@@ -47,8 +47,8 @@
 
                 <div>
                     <h3>How have you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} agreed to deal with your property and debt?</h3>
-                    <div class="radio"><label>{% input_option type="radio" name="deal_with_property_debt" value="equal division" %}<b>Equal division</b> of family property and debt</label></div>
-                    <div class="radio"><label>{% input_option type="radio" name="deal_with_property_debt" value="unequal division" %}<b>Unequal division</b> of family property and family debt</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="equal division" %}<b>Equal division</b> of family property and debt</label></div>
+                    <div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="unequal division" %}<b>Unequal division</b> of family property and family debt</label></div>
                     <p><em>Note: the court will only order an unequal division when an equal division is significantly unfair.</em></p>
 
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_unequal_division" aria-controls="collapse_unequal_division">
@@ -120,22 +120,22 @@
                                 <a href="http://www.familylaw.lss.bc.ca/guides/separation/debt.php" target="_blank">debt</a>.</p>
                         </div>
                     </div>
-                    {% input_option type="textarea" name="how_to_divide_property_debt" rows="8" cols="65" class="response-textarea" %}
+                    {% input_field type="textarea" name="how_to_divide_property_debt" rows="8" cols="65" class="response-textarea" %}
                 </div>
 
                 <div>
                     <h3>Other Property Claims</h3>
                     <p>This section is about excluded property - e.g. property owned by the respondent at the time you moved in together, and gifts or inheritances the respondent received. Compensation is cash instead of ownership of your share of the property.</p>
-                    {% input_option type="textarea" name="other_property_claims" rows="8" cols="65" class="response-textarea" %}
+                    {% input_field type="textarea" name="other_property_claims" rows="8" cols="65" class="response-textarea" %}
                 </div>
                 <div style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '06_support' %}">
+                    <form action="{% url 'question_steps' '06_support' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '08_other_orders' %}">
+                    <form action="{% url 'question_steps' '08_other_orders' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/08_other_orders.html b/edivorce/apps/core/templates/question/08_other_orders.html
similarity index 76%
rename from edivorce/apps/core/templates/f1/08_other_orders.html
rename to edivorce/apps/core/templates/question/08_other_orders.html
index 1660dd88..8a94a768 100644
--- a/edivorce/apps/core/templates/f1/08_other_orders.html
+++ b/edivorce/apps/core/templates/question/08_other_orders.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}{% load input_option %}
+{% extends 'base.html' %}{% load input_field %}
 
 {% block title %}{{ block.super }}: Other Orders{% endblock %}
 
@@ -9,13 +9,13 @@
             <div class="col-md-8 col-md-offset-2">
                 <h1>Step 8. Other Orders</h1>
                  <div style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '07_property' %}">
+                    <form action="{% url 'question_steps' '07_property' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '09_other_questions' %}">
+                    <form action="{% url 'question_steps' '09_other_questions' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/09_other_questions.html b/edivorce/apps/core/templates/question/09_other_questions.html
similarity index 80%
rename from edivorce/apps/core/templates/f1/09_other_questions.html
rename to edivorce/apps/core/templates/question/09_other_questions.html
index 51e44182..e7759b54 100644
--- a/edivorce/apps/core/templates/f1/09_other_questions.html
+++ b/edivorce/apps/core/templates/question/09_other_questions.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Spousal Support{% endblock %}
 
@@ -10,13 +10,13 @@
             <div class="col-md-8 col-md-offset-2">
                 <h1>Step 9. Other Questions</h1>
                 <div style="display: flex">
-                    <form action="{% url 'form_steps' 'f1' '08_other_orders' %}">
+                    <form action="{% url 'question_steps' '08_other_orders' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '10_location' %}">
+                    <form action="{% url 'question_steps' '10_location' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/10_location.html b/edivorce/apps/core/templates/question/10_location.html
similarity index 57%
rename from edivorce/apps/core/templates/f1/10_location.html
rename to edivorce/apps/core/templates/question/10_location.html
index 81c5a98a..fbbc1072 100644
--- a/edivorce/apps/core/templates/f1/10_location.html
+++ b/edivorce/apps/core/templates/question/10_location.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load input_option %}
+{% load input_field %}
 
 {% block title %}{{ block.super }}: Property And Debts{% endblock %}
 
@@ -33,17 +33,17 @@
                         <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_option type="text" name="address_to_send_official_document_street_you" class="form-block input-wide response-textbox" %}
+                        {% 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_option type="text" name="address_to_send_official_document_city_you" class="form-block input-wide response-textbox" %}
+                        {% 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_option type="text" name="address_to_send_official_document_prov_you" class="form-block input-narrow response-textbox" %}
+                        {% 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_option type="radio" class="radio-with-other" name="address_to_send_official_document_country_you" value="Canada" %}Canada</label></div>
-                        <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="address_to_send_official_document_country_you" value="USA" %}USA</label></div>
-                        <div class="radio"><label>{% input_option type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_you" value="Other" %}Other {% input_option type="text" name="address_to_send_official_document_other_country_you" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
+                        <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>
                     </div>
 
                     <div>
@@ -52,9 +52,9 @@
                             an address that’s not a PO box.</em></p>
 
                         <p><em>Fax number (optional)</em></p>
-                        {% input_option type="text" name="address_to_send_official_document_fax_you" class="form-block input-wide response-textbox" %}
+                        {% 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_option type="text" id="email_textbox" name="address_to_send_official_document_email_you" class="form-block input-wide response-textbox" %}
+                        {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_you" class="form-block input-wide response-textbox" %}
                     </div>
                 </div>
 
@@ -63,17 +63,17 @@
                         <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_option type="text" name="address_to_send_official_document_street_spouse" class="form-block input-wide response-textbox" %}
+                        {% 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_option type="text" name="address_to_send_official_document_city_spouse" class="form-block input-wide response-textbox" %}
+                        {% 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_option type="text" name="address_to_send_official_document_prov_spouse" class="form-block input-narrow response-textbox" %}
+                        {% 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_option type="radio" class="radio-with-other" name="address_to_send_official_document_country_spouse" value="Canada" %}Canada</label></div>
-                        <div class="radio"><label>{% input_option type="radio" class="radio-with-other" name="address_to_send_official_document_country_spouse" value="USA" %}USA</label></div>
-                        <div class="radio"><label>{% input_option type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_spouse" value="Other" %}Other {% input_option type="text" name="address_to_send_official_document_other_country_spouse" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
+                        <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>
                     </div>
 
                     <div>
@@ -82,20 +82,20 @@
                             an address that’s not a PO box.</em></p>
 
                         <p><em>Fax number (optional)</em></p>
-                        {% input_option type="text" name="address_to_send_official_document_fax_spouse" class="form-block input-wide response-textbox" %}
+                        {% 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_option type="text" id="email_textbox" name="address_to_send_official_document_email_spouse" class="form-block input-wide response-textbox" %}
+                        {% 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 'form_steps' 'f1' '09_other_questions' %}">
+                    <form action="{% url 'question_steps' '09_other_questions' %}">
                         <input type="submit" value="Back"/>
                     </form>
                     <form action="#">
                         <input type="submit" value="Save"/>
                     </form>
-                    <form action="{% url 'form_steps' 'f1' '11_review' %}">
+                    <form action="{% url 'question_steps' '11_review' %}">
                         <input type="submit" value="Next"/>
                     </form>
                 </div>
diff --git a/edivorce/apps/core/templates/f1/11_review.html b/edivorce/apps/core/templates/question/11_review.html
similarity index 58%
rename from edivorce/apps/core/templates/f1/11_review.html
rename to edivorce/apps/core/templates/question/11_review.html
index d507037f..82673420 100644
--- a/edivorce/apps/core/templates/f1/11_review.html
+++ b/edivorce/apps/core/templates/question/11_review.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}{% load input_option %}
+{% extends 'base.html' %}{% load input_field %}
 
 {% block title %}{{ block.super }}: Review{% endblock %}
 
@@ -11,47 +11,47 @@
                 <ul>
                     <li>
                         <h4>Pre-qualification questions</h4>
-                        {% include "chunks/review_user_responses.html" with questions=prequalification %}
+                        {% include "partials/review_user_responses.html" with questions=prequalification %}
                     </li>
                     <li>
                         <h4>Step 1: What are you asking for</h4>
-                        {% include "chunks/review_user_responses.html" with questions=which_orders %}
+                        {% include "partials/review_user_responses.html" with questions=which_orders %}
                     </li>
                     <li>
                         <h4>Step 2: Your information</h4>
-                        {% include "chunks/review_user_responses.html" with questions=your_information %}
+                        {% include "partials/review_user_responses.html" with questions=your_information %}
                     </li>
                     <li>
                         <h4>Step 3: Your spouse</h4>
-                        {% include "chunks/review_user_responses.html" with questions=your_spouse %}
+                        {% include "partials/review_user_responses.html" with questions=your_spouse %}
                     </li>
                     <li>
                         <h4>Step 4: Your marriage</h4>
-                        {% include "chunks/review_user_responses.html" with questions=your_marriage %}
+                        {% include "partials/review_user_responses.html" with questions=your_marriage %}
                     </li>
                     <li>
                         <h4>Step 5: Your separation</h4>
-                        {% include "chunks/review_user_responses.html" with questions=your_separation %}
+                        {% include "partials/review_user_responses.html" with questions=your_separation %}
                     </li>
                     <li>
                         <h4>Step 6: Spousal support</h4>
-                        {% include "chunks/review_user_responses.html" with questions=spousal_support %}
+                        {% include "partials/review_user_responses.html" with questions=spousal_support %}
                     </li>
                     <li>
                         <h4>Step 7: Property and debt</h4>
-                        {% include "chunks/review_user_responses.html" with questions=property_and_debt %}
+                        {% include "partials/review_user_responses.html" with questions=property_and_debt %}
                     </li>
                     <li>
                         <h4>Step 8: Other orders</h4>
-                        {% include "chunks/review_user_responses.html" with questions=other_orders %}
+                        {% include "partials/review_user_responses.html" with questions=other_orders %}
                     </li>
                     <li>
                         <h4>Step 9: Other questions</h4>
-                        {% include "chunks/review_user_responses.html" with questions=other_questions %}
+                        {% include "partials/review_user_responses.html" with questions=other_questions %}
                     </li>
                     <li>
                         <h4>Step 10: Filing locations</h4>
-                        {% include "chunks/review_user_responses.html" with questions=filing_locations %}
+                        {% include "partials/review_user_responses.html" with questions=filing_locations %}
                     </li>
                 </ul>
                 <form action="{% url 'overview' %}">
diff --git a/edivorce/apps/core/templates/styleguide/guide.html b/edivorce/apps/core/templates/styleguide/guide.html
index 0e0fcf7f..ad3fb70c 100644
--- a/edivorce/apps/core/templates/styleguide/guide.html
+++ b/edivorce/apps/core/templates/styleguide/guide.html
@@ -147,13 +147,13 @@
     <div class="container">
         <div class="row">
             <div id="form_navigation" class="col-md-8 col-md-offset-2">
-                <form action="{% url 'form_steps' 'f1' '09_other_questions' %}">
+                <form action="{% url 'question_steps' '09_other_questions' %}">
                     <input class="btn-primary" type="submit" value="Back"/>
                 </form>
                 <form action="#">
                     <input class="btn-primary" type="submit" value="Save"/>
                 </form>
-                <form action="{% url 'form_steps' 'f1' '11_review' %}">
+                <form action="{% url 'question_steps' '11_review' %}">
                     <input class="btn-primary" type="submit" value="Next"/>
                 </form>
             </div>
diff --git a/edivorce/apps/core/templates/subdir/index.html b/edivorce/apps/core/templates/subdir/index.html
deleted file mode 100644
index e7bfae77..00000000
--- a/edivorce/apps/core/templates/subdir/index.html
+++ /dev/null
@@ -1 +0,0 @@
-sub index
diff --git a/edivorce/apps/core/templates/subdir/one.html b/edivorce/apps/core/templates/subdir/one.html
deleted file mode 100644
index 5626abf0..00000000
--- a/edivorce/apps/core/templates/subdir/one.html
+++ /dev/null
@@ -1 +0,0 @@
-one
diff --git a/edivorce/apps/core/templatetags/input_option.py b/edivorce/apps/core/templatetags/input_field.py
similarity index 95%
rename from edivorce/apps/core/templatetags/input_option.py
rename to edivorce/apps/core/templatetags/input_field.py
index 4e6d68e8..6f1d0f45 100644
--- a/edivorce/apps/core/templatetags/input_option.py
+++ b/edivorce/apps/core/templatetags/input_field.py
@@ -4,7 +4,7 @@ register = template.Library()
 
 
 @register.simple_tag(takes_context=True)
-def input_option(context, type, name='', value='', **kwargs):
+def input_field(context, type, name='', value='', **kwargs):
     """
     Usage:  when specifying data attributes in templates, use "data_" intead of "data-".
     """
diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py
index 8775f2b1..d155637f 100644
--- a/edivorce/apps/core/urls.py
+++ b/edivorce/apps/core/urls.py
@@ -5,19 +5,16 @@ from .views import main, system, styleguide, pdf, api, localdev
 urlpatterns = [
     url(r'^guide$', styleguide.guide),
     url(r'^f/(?P<path>.*)', main.serve),
-    url(r'^preview/(?P<form>.*)', main.preview),
-    url(r'^prequalification/step_(?P<step>[0-9]{2})$', main.prequalification, name="prequalification"),
     url(r'^api/response$', api.UserResponseHandler.as_view()),
-    url(r'^dashboard', main.dashboard),
     url(r'^login', main.login, name="login"),
     url(r'^bceid', localdev.bceid, name="bceid"),
     url(r'^logout', main.logout, name="logout"),
     url(r'^overview', main.overview, name="overview"),
-    url(r'^intro', main.intro, name="intro"),
     url(r'^health$', system.health),
     url(r'^pdf-form(?P<form_number>[0-9]{1,3})$', pdf.form, name="pdf_form"),
-    url(r'^(?P<form>.*)/(?P<step>.*)', main.form, name="form_steps"),
-    url(r'^', main.index, name="index"),
+    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'^', main.intro, name="intro"),
 ]
 
 
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 49110b5f..0ea681be 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -11,7 +11,7 @@ def serve(request, path):
     if path[0:2] == 'f/':
         path = path[2:0]
     if (len(path) > 4 and path[-5:] != '.html') or len(path) == 0:
-        path += '/index.html'
+        path += '/intro.html'
     if path[:1] == '/':
         path = path[1:]
     return render(request, path)
@@ -21,15 +21,6 @@ def intro(request):
     return render(request, 'intro.html', context={'hide_nav': True})
 
 
-@bceid_required
-def preview(request, form):
-    """
-    View showing template preview of rendered form
-    """
-
-    return render(request, 'preview/%s.html' % form)
-
-
 def login(request):
     if not request.session.get('fake-bceid-guid'):
         return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/bceid')
@@ -50,12 +41,30 @@ def logout(request):
     return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/intro')
 
 
+def prequalification(request, step):
+    """
+    View rendering pre-qualification questions
+     If user is not authenticated with proper BCeID,
+     temporarily store user responses to session
+    """
+    template = 'prequalification/step_%s.html' % step
+
+    if not request.bceid_user.is_authenticated:
+        responses_dict = get_responses_from_session(request)
+    else:
+        user = BceidUser.objects.get(user_guid=request.bceid_user.guid)
+        responses_dict = get_responses_from_db(user)
+
+    return render(request, template_name=template, context=responses_dict)
+
+
 @bceid_required
-def form(request, form, step):
+def form(request, step):
     """
-    View rendering form/step combo
+    View rendering main questions
+    For review page, use response grouped by step to render page
     """
-    template = '%s/%s.html' % (form, step)
+    template = 'question/%s.html' % step
     user = BceidUser.objects.get(user_guid=request.bceid_user.guid)
     if step == "11_review":
         responses_dict = get_responses_from_db_grouped_by_steps(user)
@@ -64,13 +73,13 @@ def form(request, form, step):
     return render(request, template_name=template, context=responses_dict)
 
 
-@bceid_required
-def dashboard(request):
-    return render(request, 'dashboard.html')
-
-
 @bceid_required
 def overview(request):
+    """
+    View rendering process overview page
+    If user responded to questions for certain step,
+    mark that step as "Started" otherwise "Not started"
+    """
     user = BceidUser.objects.get(user_guid=request.bceid_user.guid)
     responses_dict = get_responses_from_db_grouped_by_steps(user)
     # To Show whether user has started to respond questions in each step
@@ -83,18 +92,4 @@ def overview(request):
     return render(request, 'overview.html', context=started_dict)
 
 
-def prequalification(request, step):
-    template = 'prequalification/step_%s.html' % step
-
-    if not request.bceid_user.is_authenticated:
-        responses_dict = get_responses_from_session(request)
-    else:
-        user = BceidUser.objects.get(user_guid=request.bceid_user.guid)
-        responses_dict = get_responses_from_db(user)
-
-    return render(request, template_name=template, context=responses_dict)
-
-
-def index(request):
-    return render(request, 'index.html')