diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html
index 929e2910..3df07562 100644
--- a/templates/task_orders/new/review.html
+++ b/templates/task_orders/new/review.html
@@ -19,19 +19,51 @@
 {% endmacro %}
 
 {% if task_order.defense_component %}
-  {% set defense_component_description = task_order.defense_component | normalizeOrder %}
+  {% set defense_component = task_order.defense_component | normalizeOrder %}
 {% endif %}
 
 {% if task_order.app_migration %}
-  {% set app_migration_description = "forms.task_order.app_migration.{}".format(task_order.app_migration) | translate | removeHtml %}
+  {% set app_migration = "forms.task_order.app_migration.{}".format(task_order.app_migration) | translate | removeHtml %}
 {% endif %}
 
 {% if task_order.native_apps %}
-  {% set native_apps_description = "task_orders.new.review.{}_native".format(task_order.native_apps) | translate %}
+  {% set native_apps = "task_orders.new.review.{}_native".format(task_order.native_apps) | translate %}
 {% endif %}
 
 {% if task_order.team_experience %}
-  {% set team_experience_description = "forms.task_order.team_experience.{}".format(task_order.team_experience) | translate %}
+  {% set team_experience = "forms.task_order.team_experience.{}".format(task_order.team_experience) | translate %}
+{% endif %}
+
+{% if task_order.performance_period %}
+  {% set performance_length = task_order.performance_length | translateDuration %}
+{% endif %}
+
+{% if task_order.clin_01 %}
+  {% set clin_01 = '${:,.2f}'.format(task_order.clin_01) %}
+{% endif %}
+
+{% if task_order.clin_02 %}
+  {% set clin_02 = '${:,.2f}'.format(task_order.clin_02) %}
+{% endif %}
+
+{% if task_order.clin_03 %}
+  {% set clin_03 = '${:,.2f}'.format(task_order.clin_03) %}
+{% endif %}
+
+{% if task_order.clin_04 %}
+  {% set clin_04 = '${:,.2f}'.format(task_order.clin_04) %}
+{% endif %}
+
+{% if task_order.ko_phone_number %}
+  {% set ko_phone_number = task_order.ko_phone_number | usPhone %}
+{% endif %}
+
+{% if task_order.cor_phone_number %}
+  {% set cor_phone_number = task_order.cor_phone_number | usPhone %}
+{% endif %}
+
+{% if task_order.so_phone_number %}
+  {% set so_phone_number = task_order.so_phone_number | usPhone %}
 {% endif %}
 
 
@@ -45,7 +77,7 @@
 
   <div class="col col--grow">
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.dod"| translate }}</h4>
-    <p>{{ defense_component_description or RequiredLabel() }}</p>
+    <p>{{ defense_component or RequiredLabel() }}</p>
   </div>
 </div>
 
@@ -61,12 +93,12 @@
 <div class="row">
   <div class="col col--grow">
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.migration"| translate }}</h4>
-    <p>{{ app_migration_description or RequiredLabel() }}</p>
+    <p>{{ app_migration or RequiredLabel() }}</p>
   </div>
 
   <div class="col col--grow">
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.native_apps"| translate }}</h4>
-    <p>{{ native_apps_description or RequiredLabel() }}</p>
+    <p>{{ native_apps or RequiredLabel() }}</p>
   </div>
 </div>
 
@@ -106,7 +138,7 @@
 
   <div class="col col--grow">
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.experience"| translate }}</h4>
-    <p>{{ team_experience_description or RequiredLabel() }}</p>
+    <p>{{ team_experience or RequiredLabel() }}</p>
   </div>
 </div>
 
@@ -117,7 +149,7 @@
 <div class="row">
   <div class="col col--grow">
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.performance_period"| translate }}</h4>
-    {{ task_order.performance_length | translateDuration or RequiredLabel() }}
+    {{ performance_length or RequiredLabel() }}
     <p><a href="#" class='icon-link icon-link--left' download>{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}</a></p>
   </div>
 
@@ -130,7 +162,7 @@
         </tr>
         <tr>
           <td><h4 class='task-order-form__heading funding-summary__td'>{{ "task_orders.new.review.clin_1"| translate }}</h4></td>
-          <td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.clin_01) }}</td>
+          <td class="table-cell--align-right">{{ clin_1 or RequiredLabel() }}</td>
         </tr>
         <tr>
           <td><h4 class="task-order-form__heading funding-summary__td{% if not config.CLASSIFIED %} inactive{% endif %}">
@@ -141,13 +173,13 @@
           </h4></td>
           <td class="table-cell--align-right">
             {% if config.CLASSIFIED %}
-              {{ '${:,.2f}'.format(task_order.clin_02) }}
+              {{ clin_02 or RequiredLabel() }}
             {% endif %}
           </td>
         </tr>
         <tr>
           <td><h4 class='task-order-form__heading funding-summary__td'>{{ "task_orders.new.review.clin_3"| translate }}</h4></td>
-          <td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.clin_03) }}</td>
+          <td class="table-cell--align-right">{{ clin_03 or RequiredLabel() }}</td>
         </tr>
         <tr>
             <td><h4 class="task-order-form__heading funding-summary__td{% if not config.CLASSIFIED %} inactive{% endif %}">
@@ -158,7 +190,7 @@
             </h4></td>
             <td class="table-cell--align-right">
               {% if config.CLASSIFIED %}
-                {{ '${:,.2f}'.format(task_order.clin_04) }}
+                {{ clin_04 or RequiredLabel() }}
               {% endif %}
             </td>
         <tr>
@@ -176,7 +208,7 @@
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.ko"| translate }}</h4>
     {{ task_order.ko_first_name }} {{ task_order.ko_last_name }}<br>
     {{ task_order.ko_email }}<br>
-    {{ task_order.ko_phone_number | usPhone }}<br>
+    {{ ko_phone_number or RequiredLabel() }}<br>
     {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.ko_dod_id}}<br>
     {% if task_order.ko_invite %}
       {{ Icon('ok', classes='icon--green') }} <span class="task-order-invite-message sent">{{ "task_orders.new.review.invited"| translate }}</<span>
@@ -189,7 +221,7 @@
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.cor"| translate }}</h4>
     {{ task_order.cor_first_name }} {{ task_order.cor_last_name }}<br>
     {{ task_order.cor_email }}<br>
-    {{ task_order.cor_phone_number | usPhone }}<br>
+    {{ cor_phone_number or RequiredLabel() }}<br>
     {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.cor_dod_id}}<br>
     {% if task_order.cor_invite %}
       {{ Icon('ok', classes='icon--green') }} <span class="task-order-invite-message sent">{{ "task_orders.new.review.invited"| translate }}</<span>
@@ -203,7 +235,7 @@
     <h4 class='task-order-form__heading'>{{ "task_orders.new.review.so"| translate }}</h4>
     {{ task_order.so_first_name }} {{ task_order.so_last_name }}<br>
     {{ task_order.so_email }}<br>
-    {{ task_order.so_phone_number | usPhone }}<br>
+    {{ so_phone_number or RequiredLabel() }}<br>
     {{ "task_orders.new.review.dod_id"| translate }} {{ task_order.so_dod_id}}<br>
     {% if task_order.so_invite %}
       {{ Icon('ok', classes='icon--green') }} <span class="task-order-invite-message sent">{{ "task_orders.new.review.invited"| translate }}</<span>