diff --git a/edivorce/apps/core/templates/partials/incomplete.html b/edivorce/apps/core/templates/partials/incomplete.html
new file mode 100644
index 00000000..41eca2c8
--- /dev/null
+++ b/edivorce/apps/core/templates/partials/incomplete.html
@@ -0,0 +1 @@
+<span class="required">Incomplete</span>
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/question/12_review.html b/edivorce/apps/core/templates/question/12_review.html
index 45b92210..a067295d 100644
--- a/edivorce/apps/core/templates/question/12_review.html
+++ b/edivorce/apps/core/templates/question/12_review.html
@@ -31,14 +31,14 @@
     	</div>
     </div>
 </div>
-
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.which_orders != 'Complete' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_1" aria-controls="collapse_changed_name">
 		<div>
 			Step 1: What are you asking for
-		</div>
-	</div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'orders' %}">Edit</a> </p>
+        </div>
+    </div>
+    {% if step_status.which_orders != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'orders' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_1">
 		<div>
@@ -47,12 +47,13 @@
 	</div>
 </div>
 
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.your_information != 'Complete' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_2" aria-controls="collapse_changed_name">
 		<div>
 			Step 2: Your information
-		</div>
+        </div>
 	</div>
+    {% if step_status.your_information != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
 	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'claimant' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_2">
@@ -62,13 +63,14 @@
 	</div>
 </div>
 
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.your_spouse != 'Complete' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_3" aria-controls="collapse_changed_name">
 		<div>
 			Step 3: Your spouse
 		</div>
 	</div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'respondent' %}">Edit</a> </p>
+    {% if step_status.your_spouse != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'respondent' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_3">
 		<div>
@@ -77,13 +79,14 @@
 	</div>
 </div>
 
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.your_marriage != 'Complete' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_4" aria-controls="collapse_changed_name">
 		<div>
 			Step 4: Your marriage
 		</div>
 	</div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'marriage' %}">Edit</a> </p>
+    {% if step_status.your_marriage != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'marriage' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_4">
 		<div>
@@ -92,13 +95,14 @@
 	</div>
 </div>
 
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.your_separation != 'Complete' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_5" aria-controls="collapse_changed_name">
 		<div>
 			Step 5: Your separation
 		</div>
 	</div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'separation' %}">Edit</a> </p>
+    {% if step_status.your_separation != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'separation' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_5">
 		<div>
@@ -108,13 +112,14 @@
 </div>
 
 {% if derived.has_children_of_marriage %}
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.your_children != 'Complete' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_6" aria-controls="collapse_changed_name">
 		<div>
 			Step {% step_order step="children" %}: Your children
 		</div>
 	</div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'children' 'your_children' %}">Edit</a> </p>
+    {% if step_status.your_children != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'children' 'your_children' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_6">
 		<div>
@@ -125,13 +130,14 @@
 {% endif %}
 
 {% if 'Spousal support' in which_orders.0.value|load_json %}
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.spousal_support != 'Complete' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_7" aria-controls="collapse_changed_name">
 		<div>
 			Step {% step_order step="support" %}: Spousal support
 		</div>
 	</div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'support' %}">Edit</a> </p>
+    {% if step_status.spousal_support != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'support' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_7">
 		<div>
@@ -142,13 +148,14 @@
 {% endif %}
 
 {% if 'Division of property and debts' in which_orders.0.value|load_json %}
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.property_and_debt != 'Complete' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_8" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="property" %}: Property and debt
     	</div>
     </div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'property' %}">Edit</a> </p>
+    {% if step_status.property_and_debt != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'property' %}">Edit</a> </p>
     <div class="clearfix"> </div>
     <div class="collapse in" id="review_step_8">
     	<div>
@@ -159,13 +166,14 @@
 {% endif %}
 
 {% if 'Other orders' in which_orders.0.value|load_json %}
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.other_orders != 'Complete' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_9" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="other_orders" %}: Other orders
     	</div>
     </div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_orders' %}">Edit</a> </p>
+    {% if step_status.other_orders != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_orders' %}">Edit</a> </p>
     <div class="clearfix"> </div>
     <div class="collapse in" id="review_step_9">
     	<div>
@@ -175,13 +183,14 @@
 </div>
 {% endif %}
 
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.other_questions != 'Complete' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_10" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="other_questions" %}: Other questions
     	</div>
     </div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_questions' %}">Edit</a> </p>
+    {% if step_status.other_questions != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_questions' %}">Edit</a> </p>
     <div class="clearfix"> </div>
     <div class="collapse in" id="review_step_10">
     	<div>
@@ -190,13 +199,14 @@
     </div>
 </div>
 
-<div class="question-well step-review">
+<div class="question-well step-review {% if step_status.filing_locations != 'Complete' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_11" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="location" %}: Filing location
     	</div>
     </div>
-	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'location' %}">Edit</a> </p>
+    {% if step_status.filing_locations != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'location' %}">Edit</a> </p>
     <div class="clearfix"> </div>
     <div class="collapse in" id="review_step_11">
     	<div>
diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py
index ffa589ff..3cac5e36 100644
--- a/edivorce/apps/core/utils/question_step_mapping.py
+++ b/edivorce/apps/core/utils/question_step_mapping.py
@@ -295,7 +295,7 @@ page_step_mapping = {
     'property': 'property_and_debt',
     'other_orders': 'other_orders',
     'other_questions': 'other_questions',
-    'filing_locations': 'filing_locations',
+    'location': 'filing_locations',
 }
 
 """ List of court registries """