diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index 6f93c044..4a9b0425 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -34,48 +34,25 @@
       </div>
 
       <div class="panel">
-        <div class="h2">
-          {{ "task_orders.new.review.app_info"| translate }}
-        </div>
-        {% include "fragments/task_order_review/app_info.html" %}
-        <hr>
-
-        <div class="h2">
-          {{ "task_orders.new.review.reporting"| translate }}
-          {{ EditLink(url_for("task_orders.new", screen=1, task_order_id=task_order.id,  _anchor="reporting", ko_edit=True)) }}
-        </div>
-        {% include "fragments/task_order_review/reporting.html" %}
-        <hr>
-
-        <div class="h2">
-          {{ "task_orders.new.review.funding"| translate }}
-          {{ EditLink(url_for("task_orders.new", screen=2, task_order_id=task_order.id,  _anchor="reporting", ko_edit=True)) }}
-        </div>
-        {% include "fragments/task_order_review/funding.html" %}
-
-        <div class="form__sub-fields">
-          {{ DatePicker(form.start_date) }}
-          {{ DatePicker(form.end_date) }}
-        </div>
-        <hr>
-
-        <div class="h2">
-          {{ "task_orders.new.review.oversight"| translate }}
-          {{ EditLink(url_for("task_orders.new", screen=3, task_order_id=task_order.id,  _anchor="reporting", ko_edit=True)) }}
-        </div>
-        {% include "fragments/task_order_review/oversight.html" %}
-        <hr>
-
         <div class="panel__content">
-          <div class="h2">{{ "task_orders.new.review.app_info"| translate }}</div>
+
+          <div class="h2">
+            {{ "task_orders.new.review.app_info"| translate }}
+          </div>
           {% include "fragments/task_order_review/app_info.html" %}
           <hr>
 
-          <div class="h2">{{ "task_orders.new.review.reporting"| translate }}</div>
+          <div class="h2">
+            {{ "task_orders.new.review.reporting"| translate }}
+            {{ EditLink(url_for("task_orders.new", screen=1, task_order_id=task_order.id,  _anchor="reporting", ko_edit=True)) }}
+          </div>
           {% include "fragments/task_order_review/reporting.html" %}
           <hr>
 
-          <div class="h2">{{ "task_orders.new.review.funding"| translate }}</div>
+          <div class="h2">
+            {{ "task_orders.new.review.funding"| translate }}
+            {{ EditLink(url_for("task_orders.new", screen=2, task_order_id=task_order.id,  _anchor="reporting", ko_edit=True)) }}
+          </div>
           {% include "fragments/task_order_review/funding.html" %}
 
           <div class="form__sub-fields">
@@ -84,7 +61,10 @@
           </div>
           <hr>
 
-          <div class="h2">{{ "task_orders.new.review.oversight"| translate }}</div>
+          <div class="h2">
+            {{ "task_orders.new.review.oversight"| translate }}
+            {{ EditLink(url_for("task_orders.new", screen=3, task_order_id=task_order.id,  _anchor="reporting", ko_edit=True)) }}
+          </div>
           {% include "fragments/task_order_review/oversight.html" %}
           <hr>