diff --git a/docroot/themes/custom/epa_intranet/templates/node--re-delegation.html.twig b/docroot/themes/custom/epa_intranet/templates/node--re-delegation.html.twig
index 647828a78..5110a0c06 100644
--- a/docroot/themes/custom/epa_intranet/templates/node--re-delegation.html.twig
+++ b/docroot/themes/custom/epa_intranet/templates/node--re-delegation.html.twig
@@ -117,45 +117,61 @@
{% endif %}
{# content|without('field_rescind_redelegation','field_rescission_date','field_rescission_notes','field_signed_memo','field_further_redelegation_files') #}
- {{ field_policy_identifier }}
- {{ field_effective_date }}
- {{ field_admin_update_date }}
- {{ field_policy_link }}
- {{ field_policy_upload }}
- {{ field_agency_delegation }}
- {{ field_agency_delegation_link }}
- {{ field_transmittal_notice }}
+ {{ content.field_policy_identifier }}
+ {{ content.field_effective_date }}
+ {{ content.field_admin_update_date }}
+ {{ content.field_policy_link }}
+ {{ content.field_policy_upload }}
+ {{ content.field_agency_delegation }}
+ {{ content.field_agency_delegation_link }}
+ {{ content.field_transmittal_notice }}
- - {{ field_redelegation_authority }}
- - {{ field_to_whom_delegated }}
- -
-
- - {{ field_limitation }}
- - {{ field_limitations }}
-
-
- -
-
- - {{ field_further_redelegation }}
- - {{ field_redelegation_language }}
- - {{ field_re_redelegation_authority }}
- - {{ field_further_redelegation_files }}{{ field_link_to_further_redelegati }}
-
-
- Authority Citations
- {% if field_references %}
- {{ field_references }}
- {% else %}
- None.
- {% endif %}
-
- Related Resources
- {{ field_related_resources }}
-
- Signed Memo
- {{ field_signed_memo }}
-
- - {{ field_topic_area_of_authority }}
+ {% if content.field_redelegation_authority %}
+ - {{ content.field_redelegation_authority }}
+ {% endif %}
+ {% if content.field_to_whom_delegated %}
+ - {{ content.field_to_whom_delegated }}
+ {% endif %}
+ {% if content.field_limitation or content.field_limitations %}
+ -
+
+ - {{ content.field_limitation }}
+ - {{ content.field_limitations }}
+
+
+ {% endif %}
+ {% if content.field_further_redelegation or content.field_redelegation_language or content.field_re_redelegation_authority or content.field_further_redelegation_files or content.field_link_to_further_redelegati %}
+ -
+
+ - {{ content.field_further_redelegation }}
+ - {{ content.field_redelegation_language }}
+ - {{ content.field_re_redelegation_authority }}
+ - {{ content.field_further_redelegation_files }}{{ content.field_link_to_further_redelegati }}
+
+
+ {% endif %}
+ {% if content.field_references %}
+ Authority Citations
+ {% if content.field_references %}
+ {{ content.field_references }}
+ {% else %}
+ None.
+ {% endif %}
+
+ {% endif %}
+ {% if content.field_related_resources %}
+ Related Resources
+ {{ content.field_related_resources }}
+
+ {% endif %}
+ {% if content.field_signed_memo %}
+ Signed Memo
+ {{ content.field_signed_memo }}
+
+ {% endif %} %}
+ {% if content.field_topic_area_of_authority %}
+ - {{ content.field_topic_area_of_authority }}
+ {% endif %}
{% endif %}