diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index 3bb6861d..c8d81410 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -5,16 +5,15 @@
 {% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
-
-<h1>Review and Print your Divorce Forms</h1>
+<h3>Review and Print your Divorce Forms</h3>
 <p>
     To get divorced, you need to get a divorce order. Only the court has the ability to divorce a married couple.
     To get a court order you have to start a court case. What this means is you will have to print off the forms listed below,
-    and file them (open your court case) at a court registry
-    <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
+    and file them (open your court case) at a
+    <span class="tooltip-link" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
        title="<b>Court Registry</b><br /><br />Registries are located in courthouses around the province. You can file your divorce documents at any
        <a href='http://www.ag.gov.bc.ca/courts/overview/locations/' target='_blank'>Supreme Court registry</a>.
-       Usually, people file their documents at the Supreme Court registry nearest to where they live or work (Supreme Court registry addresses)."aria-hidden="true"></i>.
+       Usually, people file their documents at the Supreme Court registry nearest to where they live or work (Supreme Court registry addresses)."> court registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>.
 </p>
 
 <div class="question-well">
diff --git a/edivorce/apps/core/templates/prequalification/step_01.html b/edivorce/apps/core/templates/prequalification/step_01.html
index 32d3c421..eed47b5e 100644
--- a/edivorce/apps/core/templates/prequalification/step_01.html
+++ b/edivorce/apps/core/templates/prequalification/step_01.html
@@ -31,12 +31,12 @@
 
     <div class="radio"><label>
         {% input_field type="radio"  name="married_marriage_like" value="Living together in a marriage like relationship" class="keep-tooltip-open" %}
-        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;
+        Living together in a <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
+                                     title="<b>MARRIAGE LIKE RELATIONSHIP</b><br /><br />The term &quot;common-law relationship&quot;
                                      is often used to refer to a marriage-like relationship that has lasted a certain length of time,
                                      usually one or two years. Used in some federal laws to refer to a marriage-like relationship of
-                                     a year or longer." aria-hidden="true"></i> (also known as common law) relationship</label>
+                                     a year or longer." >marriage like<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+        (also known as common law) relationship</label>
     </div>
 
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="true" data-target="#collapse_lived_two_years" aria-controls="collapse_lived_two_year">
diff --git a/edivorce/apps/core/templates/prequalification/step_03.html b/edivorce/apps/core/templates/prequalification/step_03.html
index 22c6882b..5357c5b4 100644
--- a/edivorce/apps/core/templates/prequalification/step_03.html
+++ b/edivorce/apps/core/templates/prequalification/step_03.html
@@ -14,12 +14,13 @@
 <h1>Do you qualify for a divorce in B.C.?</h1>
 
 <div class="question-well">
-    <h3>When did you and your spouse separate (legally this is referred to as living separate and apart)
-        <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+    <h3>When did you and your spouse separate (legally this is referred to as
+       <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
        title="<b>Living separate and apart</b><br /><br /><p>You or your spouse have decided to end the marriage. In general one separates by moving out.
        However, it is possible to be separated but still live under the same roof as long as either you or your spouse
        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>?
+        <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>">
+           living separate and apart<i class="fa fa-question-circle" aria-hidden="true"></i></span>)?
     </h3>
     <p>
         <span class="input-group date date-picker-group">
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index 319108d5..15546a89 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -14,15 +14,15 @@
 
 <h1>Do you qualify for a divorce in B.C.?</h1>
 <div class="question-well">
-    <h3>Will you be able to provide proof of your marriage (in the form of an original or certified marriage certificate
-        <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+    <h3>Will you be able to provide proof of your marriage (in the form of an original or certified
+        <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
            title="<b>Original Marriage Certificate</b><br /><br />The marriage certificate you received at the church —
            or any other place where you were married — isn't acceptable in court. You can get a  marriage certificate
            or a certified copy of the registration of marriage from
            <a target='_blank' href='http://www2.gov.bc.ca/gov/content/life-events/marriages/marriage-certificates'>Vital Statistics</a>
-           (an office run by the provincial government)." aria-hidden="true"></i>
-        or registration of marriage
-        <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+           (an office run by the provincial government)." >marriage certificate<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+        or
+        <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
            title="<b>Registration Marriage Certificate</b><br /><br />The Registration of Marriage is the document issued by
            Vital Statistics (an office run by the provincial government) along with the Marriage License. This document
            would have been signed by you and your spouse, the person who married you (the officiant) and your wedding ceremony witnesses.
@@ -30,7 +30,7 @@
            where the registration information becomes a permanent legal record. Vital Statistics cannot issue a marriage certificate
            until the marriage is registered. <br/><br/> For more information, please refer to the
            <a target='_blank' href='http://www2.gov.bc.ca/gov/content/life-events/marriages/marriage-registration/certified-copies-and-certified-electronic-extracts-of-a-marriage-registration'>Marriage Registration page</a>
-           on the  B.C. Government web site." aria-hidden="true"></i>)?</h3>
+           on the  B.C. Government web site." >registration of marriage<i class="fa fa-question-circle" aria-hidden="true"></i></span>)?</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
@@ -86,33 +86,33 @@
         <div class="bg-danger">
             <p>
                 If you can't get your marriage certificate before your case begins, state that on the court forms and explain why.
-                You may be able to file your marriage certificate later if the court registrar
-                <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+                You may be able to file your marriage certificate later if the
+                <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
                 title="<b>Court Registrar</b><br /><br />An officer of the court who has the power to make
-                certain decisions (such as whether or not a divorce application without an original marriage certificate will be accepted).</a>" aria-hidden="true"></i>
+                certain decisions (such as whether or not a divorce application without an original marriage certificate will be accepted).</a>" >court registrar<i class="fa fa-question-circle" aria-hidden="true"></i></span>
                 is satisfied that you had a good reason for not filing this document sooner. If the court registrar is dissatisfied
                 with your reason for not filing your marriage certificate, you will be unable to file your claim for divorce until the document can be produced.
             </p>
         </div>
         <h3>If you will be providing the marriage certificate or registration of marriage at a later date, please let us know why.</h3>
-        <p>Ideally the marriage certificate or registration of marriage is provided to the registry
-           <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+        <p>Ideally the marriage certificate or registration of marriage is provided to the
+           <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
            title="<b>Registry</b><br /><br />A registry is where you file your divorce documents.
-           Registries are located in courthouses <a target='_blank' href='http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx'>around the province</a>." aria-hidden="true"></i>
-            when you file the Notice of Joint Family Claim
-            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+           Registries are located in courthouses <a target='_blank' href='http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx'>around the province</a>." >registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+            when you file the
+            <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
            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>
+           and separation, and about what you're asking the court for.</a>" >Notice of Joint Family Claim<i class="fa fa-question-circle" aria-hidden="true"></i></span>(form F1).</p>
         {% 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"
+        <p>If the
+            <span class="tooltip-link" 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
-           certain decisions (such as whether or not a divorce application without an original marriage certificate will be accepted).</a>" aria-hidden="true"></i>
+           certain decisions (such as whether or not a divorce application without an original marriage certificate will be accepted).</a>" >registrar<i class="fa fa-question-circle" aria-hidden="true"></i></span>
             agrees with the reasons you provide, and accepts the Notice of Joint Family Claim (form F1),
-            you will need to provide proof of marriage before your application for a divorce order
-            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
-           title="<b>order</b><br /><br />A type of court ruling a judge or master makes that sets out what you must do or not do.</a>" aria-hidden="true"></i>
+            you will need to provide proof of marriage before your application for a divorce
+            <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
+           title="<b>order</b><br /><br />A type of court ruling a judge or master makes that sets out what you must do or not do.</a>" >order<i class="fa fa-question-circle" aria-hidden="true"></i></span>
             will be reviewed by the court. Other matters can be pursued in the mean time.</p>
         <p>If the registrar is dissatisfied with the reason (s) you provide, you will not be able to file
             the Notice of Joint Family claim (form F1)  until the proof of marriage can be produced.</p>
@@ -121,10 +121,10 @@
     <div class="information-message" id="reason_not_providing" hidden>
         <div class="bg-danger">
             <p>Since you will not be providing a marriage certificate, or a registration of marriage,  you will need
-            to state why it is impossible for you to obtain this documentation. The court registrar
-            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+            to state why it is impossible for you to obtain this documentation. The
+            <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
            title="<b>Court Registrar</b><br /><br />An officer of the court who has the power to make
-           certain decisions (such as whether or not a divorce application without an original marriage certificate will be accepted).</a>" aria-hidden="true"></i>
+           certain decisions (such as whether or not a divorce application without an original marriage certificate will be accepted).</a>" >court registrar<i class="fa fa-question-circle" aria-hidden="true"></i></span>
             will review and then decide whether or not they will accept your reason (s). You will be asked for this detail later in this online tool.</p>
         </div>
         <h3>Please tell us why it is impossible to obtain a marriage certificate or registration of marriage.
@@ -157,9 +157,9 @@
             You need to get your proof of marriage translated by a certified translator if it is not in English.
             Ask the translator to give you an Affidavit of Translation. You'll then need to file at the court registry
             both the original marriage certificate/registration of marriage and the Affidavit of Translation
-            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+            <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
            title="<b>Affidavit of Translation</b><br /><br />The affidavit of translation is an affidavit sworn by
-           a translator before a notary or commissioner for taking affidavits. " aria-hidden="true"></i>
+           a translator before a notary or commissioner for taking affidavits. " >Affidavit of Translation<i class="fa fa-question-circle" aria-hidden="true"></i></span>
             with the English translation attached as exhibits. A translator can help you do this.</p>
         <p><b>If you were married in Quebec and your marriage certificate is in French</b><br/>
             If your marriage certificate is in French, the registry may require you to get it translated into English. Contact your
diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
index 1b26a41c..e6b717b3 100644
--- a/edivorce/apps/core/templates/question/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -10,10 +10,10 @@
 
 <h1><small>Step 1:</small>What are you asking for?</h1>
 <div class="question-well">
-    <h3>What are you asking for (Orders)
-        <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
+    <h3>What are you asking for
+        <span class="tooltip-link" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
            title="<b>Orders</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>?</h3>
+           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.">(Orders)<i class="fa fa-question-circle" aria-hidden="true"></i></span>?</h3>
     <p><em>With an undefended divorce (aka desk order), you do not need  to appear in court. However, a judge needs to review and approve what you are asking for.  Orders allow you to tell the court what you want (for example parenting support and property division).</em></p>
     <p><em>Please select what you are asking for. Later on you will be asked to provide details for each request.</em></p>
     <div class="checkbox-group">
@@ -28,11 +28,11 @@
             </p>
             <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_common_law" aria-controls="collapse_common_law">
                 <div>
-                    Are you in a common law relationship
-                    <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+                    Are you in a
+                    <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
                     title='<b>Common law relationship</b><br /><br />The term "common-law relationship" is often used to refer to
                     a marriage-like relationship that has lasted a certain length of time, usually one or two years.
-                    Used in some federal laws to refer to a marriage-like relationship of a year or longer.' aria-hidden="true"></i>
+                    Used in some federal laws to refer to a marriage-like relationship of a year or longer.'>common law relationship<i class="fa fa-question-circle" aria-hidden="true"></i></span>
                     (legally known as a "marriage like relationship)"?
                 </div>
             </div>
@@ -89,11 +89,11 @@
                 </div>
 
             <div class="information-message bg-danger" id="spouse_support_alert" hidden>
-                <p>If you and your spouse have already agreed on spousal support (which could be in the form of a separation agreement
-                    <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+                <p>If you and your spouse have already agreed on spousal support (which could be in the form of a
+                    <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
                        title="<b>Separation agreement</b><br /><br /><p>A document that sets out how you and your spouse have agreed to deal with matters
                        like parenting support and property after you separate (Provincial family law calls it an agreement).
-                       There's no official form to use for drafting up a separation agreement.</p>" aria-hidden="true"></i>
+                       There's no official form to use for drafting up a separation agreement.</p>">separation agreement<i class="fa fa-question-circle" aria-hidden="true"></i></span>
                     ) then you do not need to ask for an Order for Spousal Support. However if you want the spousal support agreement to be enforceable (legally binding) you will need to select this option.
                 </p>
             </div>
diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index d03fc029..0891a47d 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -60,10 +60,10 @@
     </div>
     <div class="collapse" id="collapse_other_name">
         <div>
-            <p>The name(s) that you provide will appear on the final court order(s)
-                <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Court Orders</b><br /><br />A record of a decision made by a judge or master that
+            <p>The name(s) that you provide will appear on the final
+                <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Court Orders</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> . Any names you provide will be used on the final court order for the purposes of executing
+                                       your spouse must pay you $250 on a monthly basis to help pay off your combined debt">court order(s)<i class="fa fa-question-circle" aria-hidden="true"></i></span> . Any names you provide will be used on the final court order for the purposes of executing
                 or following up on the orders. For example, if you and your spouse will be dividing property, land titles will likely want to see the name in the court order match what is on the title. This wold also apply to pensions, RRSPs, etc. The
                 order for divorce is also used to create linkages between names.</p>
             <p>You may want to take a look at the names that you have used on any legal and business agreements/contracts to ensure you are providing the courts with all variations of your name.</p>
@@ -131,15 +131,15 @@
     </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" title="<b>Ordinarily resident</b><br /><br />Unfortunately  there is no clear cut definition for the term &quot;ordinarily resident.&quot;<br/><br/>
+    <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
+        <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Ordinarily resident</b><br /><br />Unfortunately  there is no clear cut definition for the term &quot;ordinarily resident.&quot;<br/><br/>
                         &quot;ordinary residence&quot; is not a phrase capable of precise definition. At its simplest level, ordinary residence connotes
                         something more than mere temporary presence in a place. It refers to the place in which a person's lifestyle is centered
                         and to which the person regularly returns if his or her presence is not continuous.<br/><br/>
                         Ordinarily Resident<ul><li>the place where a person resides in the ordinary course of his or her day to day</li>
                         <li>you do not lose your ordinary resident in a place when you leave for a temporary purpose (e.g. go to school in
                         another province)</li></ul><br/>Not an Ordinarily Resident<ul><li>If you have travelled to another place to live and work indefinitely
-                        (even though you ultimately intend to return to the prior home)</li></ul>" aria-hidden="true"></i> ) for at least one year immediately before starting the proceeding.
+                        (even though you ultimately intend to return to the prior home)</li></ul>">ordinarily resident<i class="fa fa-question-circle" aria-hidden="true"></i></span>) for at least one year immediately before starting the proceeding.
     </p>
 
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseExample" aria-controls="collapseExample">
diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
index fd456702..d67efafb 100644
--- a/edivorce/apps/core/templates/question/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -145,15 +145,14 @@
     <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"
-   title="<b>Ordinarily resident</b><br /><br />Unfortunately  there is no clear cut definition for the term &quot;ordinarily resident.&quot;<br/><br/>
-        &quot;ordinary residence&quot; is not a phrase capable of precise definition. At its simplest level, ordinary residence connotes
-        something more than mere temporary presence in a place. It refers to the place in which a person's lifestyle is centered
-        and to which the person regularly returns if his or her presence is not continuous.<br/><br/>
-        Ordinarily Resident<ul><li>the place where a person resides in the ordinary course of his or her day to day</li>
-        <li>you do not lose your ordinary resident in a place when you leave for a temporary purpose (e.g. go to school in
-        another province)</li></ul><br/>Not an Ordinarily Resident<ul><li>If you have travelled to another place to live and work indefinitely
-        (even thought you ultimately intends to return to the prior home)</li></ul>" aria-hidden="true"></i>
+    <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Ordinarily resident</b><br /><br />Unfortunately  there is no clear cut definition for the term &quot;ordinarily resident.&quot;<br/><br/>
+                        &quot;ordinary residence&quot; is not a phrase capable of precise definition. At its simplest level, ordinary residence connotes
+                        something more than mere temporary presence in a place. It refers to the place in which a person's lifestyle is centered
+                        and to which the person regularly returns if his or her presence is not continuous.<br/><br/>
+                        Ordinarily Resident<ul><li>the place where a person resides in the ordinary course of his or her day to day</li>
+                        <li>you do not lose your ordinary resident in a place when you leave for a temporary purpose (e.g. go to school in
+                        another province)</li></ul><br/>Not an Ordinarily Resident<ul><li>If you have travelled to another place to live and work indefinitely
+                        (even though you ultimately intend to return to the prior home)</li></ul>">ordinarily resident<i class="fa fa-question-circle" aria-hidden="true"></i></span>
     ) for at least one year immediately before starting the proceeding.
     </p>
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseExample" aria-controls="collapseExample">
diff --git a/edivorce/apps/core/templates/question/07_property.html b/edivorce/apps/core/templates/question/07_property.html
index e3ed9e9e..885a0fae 100644
--- a/edivorce/apps/core/templates/question/07_property.html
+++ b/edivorce/apps/core/templates/question/07_property.html
@@ -11,13 +11,13 @@
 <h1><small>Step {% step_order step="property" %}:</small>Property and Debt</h1>
 <div class="intro">
     <p>After you separate, the law says that all <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family property</b><br /><br />The assest acquired by either spouse during the course of the relationship,
-   plus any increase in the value of excluded property. The law assumes that you're both entitled to an equal share of family property unless an equal division would be significantly unfair."> family property
-        <i class="fa fa-question-circle" aria-hidden="true"></i></span> and <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family debt</b><br /><br />Money owed to others accumulated during a relationship or to maintain
+   plus any increase in the value of excluded property. The law assumes that you're both entitled to an equal share of family property unless an equal division would be significantly unfair."> family property<i class="fa fa-question-circle" aria-hidden="true"></i></span> and
+        <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family debt</b><br /><br />Money owed to others accumulated during a relationship or to maintain
        family property after separation. The law assumes that both spouses are equally responsible for the debt
-       unless an equal division would be &quot;significantly unfair.&quot;">  family debt
-        <i class="fa fa-question-circle" aria-hidden="true"></i></span> must be divided equally between you and your spouse, unless you have<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>An agreement</b><br /><br />A written document that sets out how you and your spouse have agreed
-       to deal with parenting, support, and/or property." > an agreement
-        <i class="fa fa-question-circle" aria-hidden="true"></i></span> that says you'll divide them differently.
+       unless an equal division would be &quot;significantly unfair.&quot;">  family debt<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+        must be divided equally between you and your spouse, unless you have
+        <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>An agreement</b><br /><br />A written document that sets out how you and your spouse have agreed
+       to deal with parenting, support, and/or property." > an agreement<i class="fa fa-question-circle" aria-hidden="true"></i></span> that says you'll divide them differently.
     </p>
 
     <p>Family property is everything either you or your spouse own together or separately on the date you separate. It includes:</p>
diff --git a/edivorce/apps/core/templates/question/10_location.html b/edivorce/apps/core/templates/question/10_location.html
index 5476629f..b8f946be 100644
--- a/edivorce/apps/core/templates/question/10_location.html
+++ b/edivorce/apps/core/templates/question/10_location.html
@@ -18,10 +18,9 @@
     The only way to obtain an order for divorce is by starting a court proceeding in the B.C. Supreme Court;
     you must sue your spouse if you want to get divorced. To do this you will need to submit (file) your divorce application at a
 
-    <span class="toolip" data-toggle="tooltip" data-placement="right" data-html="true"
+    <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
        title="<b>COURT REGISTRY</b><br /><br />A registry is where you file your divorce documents.
-       Registries are located in courthouses around the province. "> court registry
-    <i class="fa fa-question-circle"  aria-hidden="true"></i></span>.
+       Registries are located in courthouses around the province."> court registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>.
 </p>
 <div class="question-well">
     <h3>Where will you be filing for divorce?</h3>
diff --git a/edivorce/apps/core/templates/question/12_uncategorized.html b/edivorce/apps/core/templates/question/12_uncategorized.html
index 33cd76ac..dd99626a 100644
--- a/edivorce/apps/core/templates/question/12_uncategorized.html
+++ b/edivorce/apps/core/templates/question/12_uncategorized.html
@@ -5,6 +5,8 @@
 {% block progress %}{% include "progress.html" %}{% endblock %}
 
 {% block content %}
+
+{% comment "Not needed anymore" %}
 <div class="question-well">
     <h1>FORM 35</h1>
     <h3>Filed with this requisition are: </h3>
@@ -50,6 +52,7 @@
         </div>
     </div>
 </div>
+{% endcomment %}