diff --git a/edivorce/apps/core/templates/dashboard/check_with_registry.html b/edivorce/apps/core/templates/dashboard/check_with_registry.html
index c0872bab..b43cf073 100644
--- a/edivorce/apps/core/templates/dashboard/check_with_registry.html
+++ b/edivorce/apps/core/templates/dashboard/check_with_registry.html
@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
-{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
+{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/dashboard/file_documents.html b/edivorce/apps/core/templates/dashboard/file_documents.html
index 8a0ef16c..67d0708c 100644
--- a/edivorce/apps/core/templates/dashboard/file_documents.html
+++ b/edivorce/apps/core/templates/dashboard/file_documents.html
@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
-{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
+{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/dashboard/order_certificate.html b/edivorce/apps/core/templates/dashboard/order_certificate.html
index 2fae3955..4aed6398 100644
--- a/edivorce/apps/core/templates/dashboard/order_certificate.html
+++ b/edivorce/apps/core/templates/dashboard/order_certificate.html
@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
-{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
+{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
 <h1>Order a Certificate of Divorce (Optional)</h1>
diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index 2f8a950d..21fc0c08 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
-{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
+{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
 <h1>Review and Print your Divorce Forms</h1>
diff --git a/edivorce/apps/core/templates/dashboard/wait.html b/edivorce/apps/core/templates/dashboard/wait.html
index c7626072..2e4b1530 100644
--- a/edivorce/apps/core/templates/dashboard/wait.html
+++ b/edivorce/apps/core/templates/dashboard/wait.html
@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
-{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
+{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
 <h1>Wait while Judge reviews your request</h1>
diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html
index c9ce7afe..6ec87876 100644
--- a/edivorce/apps/core/templates/overview.html
+++ b/edivorce/apps/core/templates/overview.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
-{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
+{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/dashnav.html b/edivorce/apps/core/templates/partials/dashnav.html
similarity index 100%
rename from edivorce/apps/core/templates/dashnav.html
rename to edivorce/apps/core/templates/partials/dashnav.html
diff --git a/edivorce/apps/core/templates/progress.html b/edivorce/apps/core/templates/partials/progress.html
similarity index 96%
rename from edivorce/apps/core/templates/progress.html
rename to edivorce/apps/core/templates/partials/progress.html
index 29f69097..d54a6beb 100644
--- a/edivorce/apps/core/templates/progress.html
+++ b/edivorce/apps/core/templates/partials/progress.html
@@ -6,7 +6,8 @@
     <a href="{% url 'prequalification' '01' %}" class="progress-question complete {% if active_page == 'prequalification' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-share-alt" aria-hidden="true"></i></span>
         <span class="progress-content">Qualifying Questions</span>
-        <span class="progress-status"><i class="fa fa-check" aria-hidden="true"></i></span>
+        {% if step_status.prequalification == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span>
+        {% elif step_status.prequalification == 'Complete' %}<span class="progress-status"><i class="fa fa-check" aria-hidden="true"></i></span> {% endif %}
     </a>
     <a href="{% url 'question_steps' 'orders' %}" class="progress-question {% if step_status.which_orders == 'Complete' %} complete {% endif %} {% if active_page == 'orders' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
diff --git a/edivorce/apps/core/templates/prequalification/step_01.html b/edivorce/apps/core/templates/prequalification/step_01.html
index 691d1598..42185715 100644
--- a/edivorce/apps/core/templates/prequalification/step_01.html
+++ b/edivorce/apps/core/templates/prequalification/step_01.html
@@ -5,7 +5,7 @@
 
 {% block progress %}
     {% if request.bceid_user.is_authenticated %}
-        {% include "progress.html" %}
+        {% include "partials/progress.html" %}
     {% endif %}
 {% endblock %}
 
diff --git a/edivorce/apps/core/templates/prequalification/step_02.html b/edivorce/apps/core/templates/prequalification/step_02.html
index 644bd0ab..6e7dc2ec 100644
--- a/edivorce/apps/core/templates/prequalification/step_02.html
+++ b/edivorce/apps/core/templates/prequalification/step_02.html
@@ -5,7 +5,7 @@
 
 {% block progress %}
     {% if request.bceid_user.is_authenticated %}
-        {% include "progress.html" %}
+        {% include "partials/progress.html" %}
     {% endif %}
 {% endblock %}
 
diff --git a/edivorce/apps/core/templates/prequalification/step_03.html b/edivorce/apps/core/templates/prequalification/step_03.html
index 62487d2e..e4440f4b 100644
--- a/edivorce/apps/core/templates/prequalification/step_03.html
+++ b/edivorce/apps/core/templates/prequalification/step_03.html
@@ -5,7 +5,7 @@
 
 {% block progress %}
     {% if request.bceid_user.is_authenticated %}
-        {% include "progress.html" %}
+        {% include "partials/progress.html" %}
     {% endif %}
 {% endblock %}
 
diff --git a/edivorce/apps/core/templates/prequalification/step_04.html b/edivorce/apps/core/templates/prequalification/step_04.html
index 2bc284e0..95a9bf6a 100644
--- a/edivorce/apps/core/templates/prequalification/step_04.html
+++ b/edivorce/apps/core/templates/prequalification/step_04.html
@@ -5,7 +5,7 @@
 
 {% block progress %}
     {% if request.bceid_user.is_authenticated %}
-        {% include "progress.html" %}
+        {% include "partials/progress.html" %}
     {% endif %}
 {% endblock %}
 {% block content %}
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index 8b2ed534..fdaaa1f9 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -6,7 +6,7 @@
 
 {% block progress %}
     {% if request.bceid_user.is_authenticated %}
-        {% include "progress.html" %}
+        {% include "partials/progress.html" %}
     {% endif %}
 {% endblock %}
 
diff --git a/edivorce/apps/core/templates/prequalification/step_06.html b/edivorce/apps/core/templates/prequalification/step_06.html
index 8df5c648..9267d8e6 100644
--- a/edivorce/apps/core/templates/prequalification/step_06.html
+++ b/edivorce/apps/core/templates/prequalification/step_06.html
@@ -5,7 +5,7 @@
 
 {% block progress %}
     {% if request.bceid_user.is_authenticated %}
-        {% include "progress.html" %}
+        {% include "partials/progress.html" %}
     {% endif %}
 {% endblock %}
 {% block content %}
diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
index a822bb74..b30aaf07 100644
--- a/edivorce/apps/core/templates/question/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %} {% load input_field %} {% load step_order %} {% block title %}{{ block.super }}: Prequalification{% endblock %} {% block progress %}{% include "progress.html" %}{% endblock %} {% block content %}
+{% extends 'base.html' %} {% load input_field %} {% load step_order %} {% block title %}{{ block.super }}: Prequalification{% endblock %} {% block progress %}{% include "partials/progress.html" %}{% endblock %} {% block content %}
 
 <h1><small>Step 1:</small>What are you asking for
     <span class="tooltip-link" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click"
diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index ed73ce08..cad461d3 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Your Information{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
index 0e8f4f77..51c8496a 100644
--- a/edivorce/apps/core/templates/question/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Your Spouse{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/04_marriage.html b/edivorce/apps/core/templates/question/04_marriage.html
index 5fee6db7..8c946e8a 100644
--- a/edivorce/apps/core/templates/question/04_marriage.html
+++ b/edivorce/apps/core/templates/question/04_marriage.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Your Marriage{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/05_separation.html b/edivorce/apps/core/templates/question/05_separation.html
index 797a8494..92e42503 100644
--- a/edivorce/apps/core/templates/question/05_separation.html
+++ b/edivorce/apps/core/templates/question/05_separation.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Reason For Divorce{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/06_support.html b/edivorce/apps/core/templates/question/06_support.html
index 10bdeeac..8cf59aeb 100644
--- a/edivorce/apps/core/templates/question/06_support.html
+++ b/edivorce/apps/core/templates/question/06_support.html
@@ -5,7 +5,7 @@
 
 {% block title %}{{ block.super }}: Declarations{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/07_property.html b/edivorce/apps/core/templates/question/07_property.html
index 4c87ffea..0f66f873 100644
--- a/edivorce/apps/core/templates/question/07_property.html
+++ b/edivorce/apps/core/templates/question/07_property.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Application Location{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/08_other_orders.html b/edivorce/apps/core/templates/question/08_other_orders.html
index 81fed970..298b1a43 100644
--- a/edivorce/apps/core/templates/question/08_other_orders.html
+++ b/edivorce/apps/core/templates/question/08_other_orders.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Other Orders{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/09_other_questions.html b/edivorce/apps/core/templates/question/09_other_questions.html
index 580be4ad..e329cf7b 100644
--- a/edivorce/apps/core/templates/question/09_other_questions.html
+++ b/edivorce/apps/core/templates/question/09_other_questions.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Spousal Support{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/10_location.html b/edivorce/apps/core/templates/question/10_location.html
index eb41c8a0..bba2ff06 100644
--- a/edivorce/apps/core/templates/question/10_location.html
+++ b/edivorce/apps/core/templates/question/10_location.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ block.super }}: Property And Debts{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 
diff --git a/edivorce/apps/core/templates/question/11_review.html b/edivorce/apps/core/templates/question/11_review.html
index 18ac7e22..f725b800 100644
--- a/edivorce/apps/core/templates/question/11_review.html
+++ b/edivorce/apps/core/templates/question/11_review.html
@@ -5,7 +5,7 @@
 
 {% block title %}{{ block.super }}: Review{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}
 <h1><small>Step {% step_order step="review" %}:</small>Review</h1>
diff --git a/edivorce/apps/core/templates/question/12_uncategorized.html b/edivorce/apps/core/templates/question/12_uncategorized.html
index fcb76f7b..84315a4e 100644
--- a/edivorce/apps/core/templates/question/12_uncategorized.html
+++ b/edivorce/apps/core/templates/question/12_uncategorized.html
@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Review{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "partials/progress.html" %}{% endblock %}
 
 {% block content %}