diff --git a/templates/components/to_edit_link.html b/templates/components/to_edit_link.html
new file mode 100644
index 00000000..d4918eee
--- /dev/null
+++ b/templates/components/to_edit_link.html
@@ -0,0 +1,9 @@
+{% from "components/edit_link.html" import EditLink %}
+
+{% macro TOEditLink(screen=1, anchor=None) %}
+{% if task_order %}
+  {{ EditLink(url_for("task_orders.new", screen=screen, task_order_id=task_order.id, _anchor=anchor)) }}
+{% else %}
+  {{ EditLink(url_for("task_orders.new", screen=screen, _anchor=anchor)) }}
+{% endif %}
+{% endmacro %}
diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index 6c68e375..657e7976 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -2,7 +2,7 @@
 
 {% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.funding" | translate %}
 
-{% from "components/edit_link.html" import EditLink %}
+{% from "components/to_edit_link.html" import TOEditLink %}
 {% from "components/required_label.html" import RequiredLabel %}
 {% from "components/icon.html" import Icon %}
 {% from "components/date_picker.html" import DatePicker %}
@@ -42,15 +42,23 @@
       </div>
 
       <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 }}
+          {{ TOEditLink(screen=1, anchor="reporting") }}
+        </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 }}
+          {{ TOEditLink(screen=2) }}
+        </div>
         {% include "fragments/task_order_review/funding.html" %}
 
         <div class="form__sub-fields">
@@ -59,7 +67,10 @@
         </div>
         <hr>
 
-        <div class="h2">{{ "task_orders.new.review.oversight"| translate }}</div>
+        <div class="h2">
+          {{ "task_orders.new.review.oversight"| translate }}
+          {{ TOEditLink(screen=3) }}
+        </div>
         {% include "fragments/task_order_review/oversight.html" %}
         <hr>
 
diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html
index 8834da68..eaec89b4 100644
--- a/templates/task_orders/new/review.html
+++ b/templates/task_orders/new/review.html
@@ -1,6 +1,6 @@
 {% extends 'task_orders/_new.html' %}
 
-{% from "components/edit_link.html" import EditLink %}
+{% from "components/to_edit_link.html" import TOEditLink %}
 {% from "components/required_label.html" import RequiredLabel %}
 {% from "components/icon.html" import Icon %}
 {% from "components/review_field.html" import ReviewField %}
@@ -11,14 +11,6 @@
 
 {% block form %}
 
-{% macro TOEditLink(screen=1, anchor=None) %}
-{% if task_order %}
-  {{ EditLink(url_for("task_orders.new", screen=screen, task_order_id=task_order.id, _anchor=anchor)) }}
-{% else %}
-  {{ EditLink(url_for("task_orders.new", screen=screen, _anchor=anchor)) }}
-{% endif %}
-{% endmacro %}
-
 
 <h3 class="subheading">{{ "task_orders.new.review.app_info"| translate }} {{ TOEditLink(screen=1) }}</h3>
 {% include "fragments/task_order_review/app_info.html" %}