diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index 79a1535d..8e14b0e2 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -132,6 +132,10 @@ def view_request_details(request_id=None):
         or request.is_approved
         or request.is_pending_financial_verification_changes
     )
+    requires_fv_action = (
+        request.is_pending_financial_verification
+        or request.is_pending_financial_verification_changes
+    )
 
     data = request.body
     if financial_review and request.task_order:
@@ -140,11 +144,6 @@ def view_request_details(request_id=None):
     return render_template(
         "requests/details.html",
         data=data,
-        request_id=request.id,
-        status=request.status_displayname,
-        pending_ccpo_acceptance=request.is_pending_ccpo_acceptance,
-        pending_ccpo_approval=request.is_pending_ccpo_approval,
-        financial_verification=request.is_pending_financial_verification
-        or request.is_pending_financial_verification_changes,
-        financial_review=financial_review,
+        request=request,
+        requires_fv_action=requires_fv_action,
     )
diff --git a/templates/requests/details.html b/templates/requests/details.html
index 3b18d8c9..89bdd105 100644
--- a/templates/requests/details.html
+++ b/templates/requests/details.html
@@ -5,23 +5,28 @@
 {% block content %}
 <div class="col">
 
-  {% if financial_verification %}
-    {% include 'requests/review_menu.html' %}
-  {% endif %}
+  {% if request.is_pending_ccpo_acceptance %}
 
-  {% if pending_ccpo_acceptance %}
     {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }}
-  {% elif pending_ccpo_approval %}
+
+  {% elif request.is_pending_ccpo_approval %}
+
     {% call Alert('Pending CCPO Approval') %}
       <p>The CCPO will review and respond to your Financial Verification submission in 3 business days. You will be notified via email or phone.</p>
       <p>Once the financial verification is approved you will be invited to create your JEDI Workspace and set-up your projects. Click here for more details.</p>
     {% endcall %}
+
+  {% elif requires_fv_action %}
+
+    {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
+    {% include 'requests/review_menu.html' %}
+
   {% endif %}
 
   <div class="panel">
     <div class="panel__heading">
       <h1>Request Details</h1><br/>
-      <h2>#{{ request_id }} <span class="label label--info">{{ status }}</span></h2>
+      <h2>#{{ request.id }} <span class="label label--info">{{ request.status_displayname }}</span></h2>
     </div>
 
     <div class="panel__content">
diff --git a/templates/requests/review_menu.html b/templates/requests/review_menu.html
index b8546233..f6f36aa0 100644
--- a/templates/requests/review_menu.html
+++ b/templates/requests/review_menu.html
@@ -1,5 +1,5 @@
-{% set pending_url=url_for('requests.view_request_details', request_id=request_id) %}
-{% set financial_url=url_for('requests.financial_verification', request_id=request_id) %}
+{% set pending_url=url_for('requests.view_request_details', request_id=request.id) %}
+{% set financial_url=url_for('requests.financial_verification', request_id=request.id) %}
 <div class="progress-menu progress-menu--four">
   <ul>
     <li class="progress-menu__item progress-menu__item--complete">