From f1ae8f3d06ec3ef87fceced128c7fbf76ab39832 Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Wed, 25 Mar 2026 14:48:38 +0545
Subject: [PATCH 1/5] fix(eap): implement feedback changes in eap sections and
 forms

    - update strings throughout the EAP sections and forms
    - add missing required validation in form schema
    - Update total budget in full EAP from NumberInput to TextOutput
---
 .../EapTableActions/i18n.json                 |  4 ++--
 app/src/views/AccountMyFormsLayout/i18n.json  |  4 ++--
 .../EapFullForm/FinanceLogistics/index.tsx    | 12 +++++------
 .../Overview/KeyActorsInput/index.tsx         |  1 +
 .../SelectionActions/OperationInput/index.tsx |  3 +++
 .../views/EapFullForm/TriggerModel/i18n.json  |  2 +-
 app/src/views/EapFullForm/index.tsx           |  7 +++++++
 app/src/views/EapFullForm/schema.ts           | 21 +++++++++++++++----
 .../EapSimplifiedForm/RiskAnalysis/index.tsx  |  2 +-
 app/src/views/EapSimplifiedForm/schema.ts     | 10 ++++++++-
 10 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json b/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json
index b7706a26f5..5af45f3e42 100644
--- a/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json
+++ b/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json
@@ -5,12 +5,12 @@
         "startSimplifiedEapLinkLabel": "Start sEAP",
         "editFullEapLinkLabel": "Edit Full EAP",
         "viewFullEapLinkLabel": "View Full EAP",
-        "exportWithChangesButtonLabel": "Export with changes",
+        "exportWithChangesButtonLabel": "Export with track changes",
         "exportButtonLabel": "Export",
         "exportSummaryButtonLabel": "Export Summary",
         "previewExportLinkLabel": "Preview export",
         "previewSummaryExportLinkLabel": "Preview summary export",
-        "downloadReviewChecklistLinkLabel": "Download review checklist",
+        "downloadReviewChecklistLinkLabel": "Download Review checklist",
         "downloadUpdatedChecklistLinkLabel": "Download updated checklist",
         "editSimplifiedEapLinkLabel": "Edit sEAP",
         "viewSimplifiedEapLinkLabel": "View sEAP",
diff --git a/app/src/views/AccountMyFormsLayout/i18n.json b/app/src/views/AccountMyFormsLayout/i18n.json
index c23cf7ce5b..992e8f5685 100644
--- a/app/src/views/AccountMyFormsLayout/i18n.json
+++ b/app/src/views/AccountMyFormsLayout/i18n.json
@@ -3,8 +3,8 @@
     "strings": {
         "fieldReportTabTitle": "Field Report",
         "perTabTitle": "PER",
-        "drefTabTitle": "DREF",
+        "drefTabTitle": "DREF Applications",
         "threeWTabTitle": "3W",
         "eapApplications": "EAP Applications"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/views/EapFullForm/FinanceLogistics/index.tsx b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
index 89bc8dbc3d..9f38b54319 100644
--- a/app/src/views/EapFullForm/FinanceLogistics/index.tsx
+++ b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
@@ -29,6 +29,7 @@ import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
 
 import i18n from './i18n.json';
+import NonFieldError from '#components/NonFieldError';
 
 interface Props {
     value: PartialEapFullFormType;
@@ -162,15 +163,14 @@ function FinanceLogistics(props: Props) {
                         )}
                         withAsteriskOnTitle
                     >
-                        <NumberInput
+                        <TextOutput
+                            valueType="number"
+                            strongLabel
                             label={strings.financeTotalBudgetLabel}
-                            name="total_budget"
                             value={value.total_budget}
+                        />
+                        <NonFieldError
                             error={error?.total_budget}
-                            onChange={setFieldValue}
-                            disabled={disabled}
-                            readOnly
-                            required
                         />
                         <TextArea
                             label={strings.financeDescriptionLabel}
diff --git a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
index 76f9092a92..6e5d907faf 100644
--- a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
+++ b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
@@ -97,6 +97,7 @@ function KeyActorsInput(props: Props) {
                     />
                     <TextArea
                         label={strings.overviewKeyActorsDescriptionLabel}
+                        error={error?.description}
                         name="description"
                         value={value?.description}
                         onChange={onFieldChange}
diff --git a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
index 34849d3237..340638c391 100644
--- a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
@@ -87,6 +87,7 @@ function OperationsInput(props: Props) {
                     numPreferredGridColumns={3}
                 >
                     <NumberInput
+                        required
                         label={strings.selectionActionsPlannedOperationPeopleTargeted}
                         name="people_targeted"
                         value={value?.people_targeted}
@@ -96,6 +97,7 @@ function OperationsInput(props: Props) {
                         readOnly={readOnly}
                     />
                     <NumberInput
+                        required
                         label={strings.selectionActionsPlannedOperationBudget}
                         name="budget_per_sector"
                         value={value?.budget_per_sector}
@@ -105,6 +107,7 @@ function OperationsInput(props: Props) {
                         readOnly={readOnly}
                     />
                     <NumberInput
+                        required
                         label={strings.selectionActionsPlannedOperationApCode}
                         name="ap_code"
                         value={value?.ap_code}
diff --git a/app/src/views/EapFullForm/TriggerModel/i18n.json b/app/src/views/EapFullForm/TriggerModel/i18n.json
index fc3d1545e7..24c2ad25d1 100644
--- a/app/src/views/EapFullForm/TriggerModel/i18n.json
+++ b/app/src/views/EapFullForm/TriggerModel/i18n.json
@@ -15,7 +15,7 @@
         "sourcesForecastDescription": "Add respective source(s) for the forecast and the link to the website, if applicable.",
         "forecastExplanatoryNote": "In order for the DREF to approve funding when a trigger occurs, there must be a certain probability the extreme event will take place. To safeguard this, it is crucial to select those forecasts that have a certain “skill” level (certain level of confidence). If observations are used, these can also be included in the table. Note that this information does not need to be calculated by the National Society but can be obtained by working with hydro-meteorological services, research institutions, experts etc.",
         "forecastSelectionTitle": "Forecast selection",
-        "downloadForecastTableLabel": "Download Forecast table",
+        "downloadForecastTableLabel": "Download Menu of Forecast",
         "forecastRequiredPoint1": "State clearly which forecast(s) and observations will be used and why they were chosen.",
         "forecastRequiredPoint2": "Include a table with all available forecasts for your hazard. The table must include: Name of forecast, Lead time, Source, False Alarm Ratio, Number of times the forecast has been issued for this hazard in the last 10 years ",
         "forecastSelectionDescription": "State clearly which forecast(s) and observations will be used and why they were chosen. Include a table with all available forecasts for your hazard. The table must include: Name of forecast, Lead time, Source, False Alarm Ratio, Number of times the forecast has been issued for this hazard in the last 10 years.",
diff --git a/app/src/views/EapFullForm/index.tsx b/app/src/views/EapFullForm/index.tsx
index 1a7600de2d..d490883056 100644
--- a/app/src/views/EapFullForm/index.tsx
+++ b/app/src/views/EapFullForm/index.tsx
@@ -343,6 +343,12 @@ export function Component() {
                         return formValue?.cover_image_file?.client_id;
                     }
 
+                    match = matchArray(locations, ['key_actors', NUM]);
+                    if (isDefined(match)) {
+                        const [index] = match;
+                        return formValue?.key_actors?.[index!]?.client_id;
+                    }
+
                     match = matchArray(locations, ['partner_contacts', NUM]);
                     if (isDefined(match)) {
                         const [index] = match;
@@ -1075,6 +1081,7 @@ export function Component() {
                                 name={undefined}
                                 onClick={handleRequestForApprovalButtonClick}
                                 disabled={readOnly}
+                                styleVariant="filled"
                             >
                                 {strings.submitButtonLabel}
                             </Button>
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index 725d10b05c..fba21ceefd 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -6,11 +6,13 @@ import {
 import {
     addCondition,
     emailCondition,
+    lessThanOrEqualToCondition,
     type LiteralSchema,
     nullValue,
     type ObjectSchema,
     type PartialForm,
     type PurgeNull,
+    requiredListCondition,
     requiredStringCondition,
     undefinedValue,
     urlCondition,
@@ -632,6 +634,8 @@ export const formSchema: EapFullFormSchema = {
             },
 
             key_actors: {
+                required: isSubmit,
+                validation: requiredListCondition,
                 keySelector: (item) => item.client_id,
                 member: () => ({
                     fields: (): KeyActorsFormFields => ({
@@ -911,8 +915,12 @@ export const formSchema: EapFullFormSchema = {
                     fields: (): PlannedOperationalFields => ({
                         id: { defaultValue: undefinedValue },
                         sector: {},
-                        budget_per_sector: {},
-                        ap_code: {},
+                        budget_per_sector: {
+                            required: isSubmit,
+                        },
+                        ap_code: {
+                            required: isSubmit,
+                        },
                         indicators: {
                             keySelector: (indicator) => indicator.client_id,
                             member: () => indicatorSchema,
@@ -963,8 +971,12 @@ export const formSchema: EapFullFormSchema = {
                     fields: (): EnableApproachesFields => ({
                         id: { defaultValue: undefinedValue },
                         approach: {},
-                        budget_per_approach: {},
-                        ap_code: {},
+                        budget_per_approach: {
+                            required: isSubmit,
+                        },
+                        ap_code: {
+                            required: isSubmit,
+                        },
                         indicators: {
                             keySelector: (indicator) => indicator.client_id,
                             member: () => indicatorSchema,
@@ -1059,6 +1071,7 @@ export const formSchema: EapFullFormSchema = {
             people_targeted: {
                 required: isSubmit,
                 validations: [
+                    lessThanOrEqualToCondition(10000),
                     positiveIntegerCondition,
                 ],
             },
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
index 89ca23d85f..da1bea9dea 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
@@ -201,7 +201,7 @@ function RiskAnalysis(props: Props) {
                             error={error?.prioritized_hazard_and_impact}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.pre_positioning_budget}
+                            maxLength={charLimits.prioritized_hazard_and_impact}
                         />
                         <MultiImageWithCaptionInput
                             name="hazard_impact_images"
diff --git a/app/src/views/EapSimplifiedForm/schema.ts b/app/src/views/EapSimplifiedForm/schema.ts
index b6e5bcf84a..cfe72afa92 100644
--- a/app/src/views/EapSimplifiedForm/schema.ts
+++ b/app/src/views/EapSimplifiedForm/schema.ts
@@ -5,6 +5,7 @@ import {
 } from '@togglecorp/fujs';
 import {
     emailCondition,
+    lessThanOrEqualToCondition,
     type LiteralSchema,
     type ObjectSchema,
     type PartialForm,
@@ -16,6 +17,7 @@ import {
 import indicatorSchema from '#components/domain/EapIndicatorInput/schema';
 import operationActivitySchema from '#components/domain/EapOperationActivityInput/schema';
 import { lengthSmallerOrEqualToCondition } from '#utils/common';
+import { positiveIntegerCondition } from '#utils/form';
 import { type GoApiBody } from '#utils/restRequest';
 
 import { charLimits } from './common';
@@ -417,7 +419,13 @@ export const formSchema: FormSchema = {
                     charLimits.potential_geographical_high_risk_areas,
                 )],
             },
-            people_targeted: { required: isSubmit },
+            people_targeted: {
+                required: isSubmit,
+                validations: [
+                    positiveIntegerCondition,
+                    lessThanOrEqualToCondition(2000),
+                ],
+            },
             assisted_through_operation: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,

From 537c393fa85ebb1c0f6fc4a77d3c5dff29756e5b Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Fri, 27 Mar 2026 14:24:03 +0545
Subject: [PATCH 2/5] fix(eap-form): add eap forms access according to eap type

---
 app/src/utils/constants.ts                    |   1 -
 .../AccountMyFormsEap/EapStatus/index.tsx     |   4 +-
 .../EapFullForm/FinanceLogistics/index.tsx    |   2 +-
 app/src/views/EapFullForm/i18n.json           |   4 +-
 app/src/views/EapFullForm/index.tsx           | 360 +++++++++---------
 app/src/views/EapSimplifiedForm/i18n.json     |   4 +-
 app/src/views/EapSimplifiedForm/index.tsx     | 306 ++++++++-------
 go-api                                        |   2 +-
 8 files changed, 356 insertions(+), 327 deletions(-)

diff --git a/app/src/utils/constants.ts b/app/src/utils/constants.ts
index 5f3c04dd69..92c3646975 100644
--- a/app/src/utils/constants.ts
+++ b/app/src/utils/constants.ts
@@ -242,4 +242,3 @@ export const EAP_STATUS_NS_ADDRESSING_COMMENTS = 30 satisfies EapStatus;
 export const EAP_STATUS_TECHNICALLY_VALIDATED = 40 satisfies EapStatus;
 export const EAP_STATUS_PENDING_PFA = 50 satisfies EapStatus;
 export const EAP_STATUS_APPROVED = 60 satisfies EapStatus;
-export const EAP_STATUS_ACTIVATED = 70 satisfies EapStatus;
diff --git a/app/src/views/AccountMyFormsEap/EapStatus/index.tsx b/app/src/views/AccountMyFormsEap/EapStatus/index.tsx
index b1367f130e..6ecb4835f5 100644
--- a/app/src/views/AccountMyFormsEap/EapStatus/index.tsx
+++ b/app/src/views/AccountMyFormsEap/EapStatus/index.tsx
@@ -30,7 +30,6 @@ import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import useAlert from '#hooks/useAlert';
 import {
-    EAP_STATUS_ACTIVATED,
     EAP_STATUS_APPROVED,
     EAP_STATUS_NS_ADDRESSING_COMMENTS,
     EAP_STATUS_PENDING_PFA,
@@ -67,8 +66,7 @@ const validStatusTransition: Record<EapStatus, EapStatus[]> = {
         EAP_STATUS_PENDING_PFA,
     ],
     [EAP_STATUS_PENDING_PFA]: [EAP_STATUS_APPROVED],
-    [EAP_STATUS_APPROVED]: [EAP_STATUS_ACTIVATED],
-    [EAP_STATUS_ACTIVATED]: [],
+    [EAP_STATUS_APPROVED]: [],
 };
 
 export interface Props {
diff --git a/app/src/views/EapFullForm/FinanceLogistics/index.tsx b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
index 9f38b54319..653b611024 100644
--- a/app/src/views/EapFullForm/FinanceLogistics/index.tsx
+++ b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
@@ -21,6 +21,7 @@ import {
 
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
 import Link from '#components/Link';
+import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { useRequest } from '#utils/restRequest';
 
@@ -29,7 +30,6 @@ import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
 
 import i18n from './i18n.json';
-import NonFieldError from '#components/NonFieldError';
 
 interface Props {
     value: PartialEapFullFormType;
diff --git a/app/src/views/EapFullForm/i18n.json b/app/src/views/EapFullForm/i18n.json
index 72d73ee45c..5d1844d953 100644
--- a/app/src/views/EapFullForm/i18n.json
+++ b/app/src/views/EapFullForm/i18n.json
@@ -30,6 +30,8 @@
         "submitButtonLabel": "Submit for approval",
         "submitConfirmButtonLabel": "Confirm",
         "submitConfirmHeading": "Submit EAP for approval",
-        "submitConfirmMessage": "Are you sure you want to submit the EAP? Reviewers will be notified and you'll no longer be able to edit the form!"
+        "submitConfirmMessage": "Are you sure you want to submit the EAP? Reviewers will be notified and you'll no longer be able to edit the form!",
+        "formLoadErrorTitle": "Failed to load Full EAP form!",
+        "formLoadErrorHelpText": "Please make sure that the Full EAP form with given id exists and you have the permission to view it"
     }
 }
diff --git a/app/src/views/EapFullForm/index.tsx b/app/src/views/EapFullForm/index.tsx
index d490883056..a4a24593e9 100644
--- a/app/src/views/EapFullForm/index.tsx
+++ b/app/src/views/EapFullForm/index.tsx
@@ -18,6 +18,7 @@ import {
     IconButton,
     InlineLayout,
     ListView,
+    Message,
     Modal,
     Tab,
     TabList,
@@ -53,6 +54,7 @@ import {
     EAP_STATUS_NS_ADDRESSING_COMMENTS,
     EAP_STATUS_UNDER_DEVELOPMENT,
     EAP_STATUS_UNDER_REVIEW,
+    EAP_TYPE_FULL,
 } from '#utils/constants';
 import {
     type GoApiBody,
@@ -604,6 +606,7 @@ export function Component() {
     const {
         pending: fullEapPending,
         response: fullEapResponse,
+        error: fullEapResponseError,
     } = useRequest({
         skip: isNotDefined(latestFullEapId),
         url: '/api/v2/full-eap/{id}/',
@@ -756,6 +759,10 @@ export function Component() {
 
     const isLatestVersion = currentFullEapId === latestFullEapId;
 
+    const fullEapFormAccess = (isNotDefined(eapDetailResponse?.eap_type)
+        || eapDetailResponse?.eap_type === EAP_TYPE_FULL)
+        && isNotDefined(fullEapResponseError);
+
     const isEditable = isLatestVersion
         && (eapDetailResponse?.status === EAP_STATUS_UNDER_DEVELOPMENT
             || eapDetailResponse?.status === EAP_STATUS_NS_ADDRESSING_COMMENTS);
@@ -861,7 +868,7 @@ export function Component() {
                     </TopBanner>
                 )}
                 actions={
-                    isEditable ? (
+                    isEditable && fullEapFormAccess ? (
                         <>
                             <Link
                                 to="accountMyFormsEap"
@@ -898,7 +905,7 @@ export function Component() {
                         </Link>
                     )
                 }
-                info={(
+                info={fullEapFormAccess && (
                     <TabList elementRef={tabListRef}>
                         <Tab
                             name="overview"
@@ -959,183 +966,188 @@ export function Component() {
                     </TabList>
                 )}
             >
-                <TabPanel name="overview">
-                    <Overview
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        eapRegistrationDetail={eapDetailResponse}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="riskAnalysis">
-                    <RiskAnalysis
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="triggerModel">
-                    <TriggerModel
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        eapRegistrationDetail={eapDetailResponse}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="selectionActions">
-                    <SelectionActions
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="eapActivation">
-                    <EapActivationProcess
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="meal">
-                    <Meal
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="nationalSocietyCapacity">
-                    <NationalSocietyCapacity
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
+                {!fullEapFormAccess ? (
+                    <Message
+                        variant="error"
+                        title={strings.formLoadErrorTitle}
+                        description={fullEapResponseError?.value.messageForNotification}
+                        actions={strings.formLoadErrorHelpText}
                     />
-                </TabPanel>
-                <TabPanel name="financeLogistics">
-                    <FinanceLogistics
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        setValue={setValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
-                        isRevision={isRevision}
-                    />
-                </TabPanel>
-                <InlineLayout
-                    after={(
-                        <Button
-                            name={undefined}
-                            onClick={handleSave}
-                        >
-                            {strings.saveButton}
-                        </Button>
-                    )}
-                >
-                    <ListView withCenteredContents>
-                        <Button
-                            name={prevStep ?? activeTab}
-                            onClick={handleTabChange}
-                            disabled={isNotDefined(prevStep)}
+                ) : (
+                    <>
+                        <TabPanel name="overview">
+                            <Overview
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                eapRegistrationDetail={eapDetailResponse}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="riskAnalysis">
+                            <RiskAnalysis
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="triggerModel">
+                            <TriggerModel
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                eapRegistrationDetail={eapDetailResponse}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="selectionActions">
+                            <SelectionActions
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="eapActivation">
+                            <EapActivationProcess
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="meal">
+                            <Meal
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="nationalSocietyCapacity">
+                            <NationalSocietyCapacity
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="financeLogistics">
+                            <FinanceLogistics
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                setValue={setValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                                isRevision={isRevision}
+                            />
+                        </TabPanel>
+                        <InlineLayout
+                            after={(
+                                <Button name={undefined} onClick={handleSave}>
+                                    {strings.saveButton}
+                                </Button>
+                            )}
                         >
-                            {strings.backButton}
-                        </Button>
-                        {isDefined(nextStep) ? (
-                            <Button
-                                name={nextStep ?? activeTab}
-                                onClick={handleTabChange}
-                            >
-                                {strings.nextButton}
-                            </Button>
-                        ) : (
-                            <Button
-                                name={undefined}
-                                onClick={handleRequestForApprovalButtonClick}
-                                disabled={readOnly}
-                                styleVariant="filled"
+                            <ListView withCenteredContents>
+                                <Button
+                                    name={prevStep ?? activeTab}
+                                    onClick={handleTabChange}
+                                    disabled={isNotDefined(prevStep)}
+                                >
+                                    {strings.backButton}
+                                </Button>
+                                {isDefined(nextStep) ? (
+                                    <Button
+                                        name={nextStep ?? activeTab}
+                                        onClick={handleTabChange}
+                                    >
+                                        {strings.nextButton}
+                                    </Button>
+                                ) : (
+                                    <Button
+                                        name={undefined}
+                                        onClick={handleRequestForApprovalButtonClick}
+                                        disabled={readOnly}
+                                        styleVariant="filled"
+                                    >
+                                        {strings.submitButtonLabel}
+                                    </Button>
+                                )}
+                            </ListView>
+                        </InlineLayout>
+                        {shouldSubmit && (
+                            <Modal
+                                heading={strings.submitConfirmHeading}
+                                onClose={handleRequestForApprovalCancel}
+                                pending={createFullEapPending || updateFullFormPending}
+                                pendingMessage={strings.savingPendingMessage}
+                                footerActions={(
+                                    <Button
+                                        name={undefined}
+                                        disabled={hasFormErrors}
+                                        onClick={handleSubmitForApprovalConfirm}
+                                    >
+                                        {strings.submitConfirmButtonLabel}
+                                    </Button>
+                                )}
                             >
-                                {strings.submitButtonLabel}
-                            </Button>
+                                <ListView layout="block" spacing="sm">
+                                    <div>{strings.submitConfirmMessage}</div>
+                                    {hasFormErrors && (
+                                        <Alert
+                                            name="form-error-warning"
+                                            title={strings.submitFormErrorMessage}
+                                            type="warning"
+                                            withLightBackground
+                                            withoutShadow
+                                        />
+                                    )}
+                                </ListView>
+                            </Modal>
                         )}
-                    </ListView>
-                </InlineLayout>
-                {shouldSubmit && (
-                    <Modal
-                        heading={strings.submitConfirmHeading}
-                        onClose={handleRequestForApprovalCancel}
-                        pending={createFullEapPending || updateFullFormPending}
-                        pendingMessage={strings.savingPendingMessage}
-                        footerActions={(
-                            <Button
-                                name={undefined}
-                                disabled={hasFormErrors}
-                                onClick={handleSubmitForApprovalConfirm}
-                            >
-                                {strings.submitConfirmButtonLabel}
-                            </Button>
+                        {showShareModal && isDefined(eapId) && (
+                            <EapShareModal
+                                onCancel={setShowShareModalFalse}
+                                onSuccess={setShowShareModalFalse}
+                                eapId={Number(eapId)}
+                            />
                         )}
-                    >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <div>
-                                {strings.submitConfirmMessage}
-                            </div>
-                            {hasFormErrors && (
-                                <Alert
-                                    name="form-error-warning"
-                                    title={strings.submitFormErrorMessage}
-                                    type="warning"
-                                    withLightBackground
-                                    withoutShadow
-                                />
-                            )}
-                        </ListView>
-                    </Modal>
-                )}
-                {showShareModal && isDefined(eapId) && (
-                    <EapShareModal
-                        onCancel={setShowShareModalFalse}
-                        onSuccess={setShowShareModalFalse}
-                        eapId={Number(eapId)}
-                    />
-                )}
-                {isDefined(latestFullEapId) && showObsoletePayloadModal && (
-                    <EapObsoleteResolutionModal
-                        fullEapId={latestFullEapId}
-                        onOverwriteButtonClick={handleObsoletePayloadOverwriteButtonClick}
-                        onCancelButtonClick={setShowObsoletePayloadModal}
-                    />
+                        {isDefined(latestFullEapId) && showObsoletePayloadModal && (
+                            <EapObsoleteResolutionModal
+                                fullEapId={latestFullEapId}
+                                onOverwriteButtonClick={
+                                    handleObsoletePayloadOverwriteButtonClick
+                                }
+                                onCancelButtonClick={setShowObsoletePayloadModal}
+                            />
+                        )}
+                    </>
                 )}
             </Page>
         </Tabs>
diff --git a/app/src/views/EapSimplifiedForm/i18n.json b/app/src/views/EapSimplifiedForm/i18n.json
index 6f84903f3f..ee3b0115ba 100644
--- a/app/src/views/EapSimplifiedForm/i18n.json
+++ b/app/src/views/EapSimplifiedForm/i18n.json
@@ -28,6 +28,8 @@
         "submitButtonLabel": "Submit for approval",
         "submitConfirmButtonLabel": "Confirm",
         "submitConfirmHeading": "Submit EAP for approval",
-        "submitConfirmMessage": "Are you sure you want to submit the EAP? Reviewers will be notified and you'll no longer be able to edit the form!"
+        "submitConfirmMessage": "Are you sure you want to submit the EAP? Reviewers will be notified and you'll no longer be able to edit the form!",
+        "formLoadErrorTitle": "Failed to load Simplified EAP form!",
+        "formLoadErrorHelpText": "Please make sure that the Simplified EAP form with given id exists and you have the permission to view it"
     }
 }
diff --git a/app/src/views/EapSimplifiedForm/index.tsx b/app/src/views/EapSimplifiedForm/index.tsx
index 53efdf960f..3eb7ed0d51 100644
--- a/app/src/views/EapSimplifiedForm/index.tsx
+++ b/app/src/views/EapSimplifiedForm/index.tsx
@@ -17,6 +17,7 @@ import {
     IconButton,
     InlineLayout,
     ListView,
+    Message,
     Modal,
     Tab,
     TabList,
@@ -52,6 +53,7 @@ import {
     EAP_STATUS_NS_ADDRESSING_COMMENTS,
     EAP_STATUS_UNDER_DEVELOPMENT,
     EAP_STATUS_UNDER_REVIEW,
+    EAP_TYPE_SIMPLIFIED,
 } from '#utils/constants';
 import {
     type GoApiBody,
@@ -364,6 +366,7 @@ export function Component() {
     const {
         pending: simplifiedEapPending,
         response: simplifiedEapResponse,
+        error: simplifiedEapResponseError,
     } = useRequest({
         skip: isNotDefined(currentSimplifiedEapId),
         url: '/api/v2/simplified-eap/{id}/',
@@ -430,6 +433,10 @@ export function Component() {
 
     const isLatestVersion = currentSimplifiedEapId === latestSimplifiedEapId;
 
+    const simplifiedEapFormAccess = (isNotDefined(eapRegistrationResponse?.eap_type)
+        || eapRegistrationResponse?.eap_type === EAP_TYPE_SIMPLIFIED)
+        && isNotDefined(simplifiedEapResponseError);
+
     const isEditable = isLatestVersion
         && (eapRegistrationResponse?.status === EAP_STATUS_UNDER_DEVELOPMENT
             || eapRegistrationResponse?.status === EAP_STATUS_NS_ADDRESSING_COMMENTS);
@@ -665,7 +672,7 @@ export function Component() {
                     </TopBanner>
                 )}
                 actions={
-                    isEditable ? (
+                    isEditable && simplifiedEapFormAccess ? (
                         <>
                             <Link
                                 to="accountMyFormsEap"
@@ -702,7 +709,7 @@ export function Component() {
                         </Link>
                     )
                 }
-                info={(
+                info={simplifiedEapFormAccess && (
                     <TabList elementRef={tabListRef}>
                         <Tab
                             name="overview"
@@ -750,154 +757,163 @@ export function Component() {
                 )}
                 withBackgroundColorInMainSection
             >
-                <TabPanel name="overview">
-                    <Overview
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        eapRegistrationDetail={eapRegistrationResponse}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="riskAnalysis">
-                    <RiskAnalysis
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="earlyAction">
-                    <EarlyAction
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        eapRegistrationDetail={eapRegistrationResponse}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="plannedOperations">
-                    <PlannedOperations
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        readOnly={readOnly}
+                {!simplifiedEapFormAccess ? (
+                    <Message
+                        variant="error"
+                        title={strings.formLoadErrorTitle}
+                        description={
+                            simplifiedEapResponseError?.value.messageForNotification
+                        }
+                        actions={strings.formLoadErrorHelpText}
                     />
-                </TabPanel>
-                <TabPanel name="enablingApproaches">
-                    <EnablingApproaches
-                        value={value}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        readOnly={readOnly}
-                    />
-                </TabPanel>
-                <TabPanel name="deliveryAndBudget">
-                    <DeliveryAndBudget
-                        value={value}
-                        setValue={setValue}
-                        setFieldValue={setFieldValue}
-                        error={formError}
-                        disabled={disabled}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        readOnly={readOnly}
-                        isRevision={isRevision}
-                    />
-                </TabPanel>
-                <InlineLayout
-                    after={(
-                        <Button
-                            name={undefined}
-                            onClick={handleSave}
-                        >
-                            {strings.saveButtonLabel}
-                        </Button>
-                    )}
-                >
-                    <ListView withCenteredContents>
-                        <Button
-                            name={prevStep ?? activeTab}
-                            onClick={handleTabChange}
-                            disabled={isNotDefined(prevStep)}
+                ) : (
+                    <>
+                        <TabPanel name="overview">
+                            <Overview
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                eapRegistrationDetail={eapRegistrationResponse}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="riskAnalysis">
+                            <RiskAnalysis
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="earlyAction">
+                            <EarlyAction
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                eapRegistrationDetail={eapRegistrationResponse}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="plannedOperations">
+                            <PlannedOperations
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="enablingApproaches">
+                            <EnablingApproaches
+                                value={value}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                readOnly={readOnly}
+                            />
+                        </TabPanel>
+                        <TabPanel name="deliveryAndBudget">
+                            <DeliveryAndBudget
+                                value={value}
+                                setValue={setValue}
+                                setFieldValue={setFieldValue}
+                                error={formError}
+                                disabled={disabled}
+                                fileIdToUrlMap={fileIdToUrlMap}
+                                setFileIdToUrlMap={setFileIdToUrlMap}
+                                readOnly={readOnly}
+                                isRevision={isRevision}
+                            />
+                        </TabPanel>
+                        <InlineLayout
+                            after={(
+                                <Button name={undefined} onClick={handleSave}>
+                                    {strings.saveButtonLabel}
+                                </Button>
+                            )}
                         >
-                            {strings.backButtonLabel}
-                        </Button>
-                        {isDefined(nextStep) ? (
-                            <Button
-                                name={nextStep ?? activeTab}
-                                onClick={handleTabChange}
-                            >
-                                {strings.nextButtonLabel}
-                            </Button>
-                        ) : (
-                            <Button
-                                name={undefined}
-                                onClick={handleRequestForApprovalButtonClick}
-                                disabled={readOnly}
+                            <ListView withCenteredContents>
+                                <Button
+                                    name={prevStep ?? activeTab}
+                                    onClick={handleTabChange}
+                                    disabled={isNotDefined(prevStep)}
+                                >
+                                    {strings.backButtonLabel}
+                                </Button>
+                                {isDefined(nextStep) ? (
+                                    <Button
+                                        name={nextStep ?? activeTab}
+                                        onClick={handleTabChange}
+                                    >
+                                        {strings.nextButtonLabel}
+                                    </Button>
+                                ) : (
+                                    <Button
+                                        name={undefined}
+                                        onClick={handleRequestForApprovalButtonClick}
+                                        disabled={readOnly}
+                                    >
+                                        {strings.submitButtonLabel}
+                                    </Button>
+                                )}
+                            </ListView>
+                        </InlineLayout>
+                        {shouldSubmit && (
+                            <Modal
+                                heading={strings.submitConfirmHeading}
+                                onClose={handleRequestForApprovalCancel}
+                                pending={
+                                    createSimplifiedEapPending || updateSimplifiedEapPending
+                                }
+                                pendingMessage={strings.savingPendingMessage}
+                                footerActions={(
+                                    <Button
+                                        name={undefined}
+                                        disabled={hasFormErrors}
+                                        onClick={handleSubmitForApprovalConfirm}
+                                    >
+                                        {strings.submitConfirmButtonLabel}
+                                    </Button>
+                                )}
                             >
-                                {strings.submitButtonLabel}
-                            </Button>
+                                <ListView layout="block" spacing="sm">
+                                    <div>{strings.submitConfirmMessage}</div>
+                                    {hasFormErrors && (
+                                        <Alert
+                                            name="form-error-warning"
+                                            title={strings.submitFormErrorMessage}
+                                            type="warning"
+                                            withLightBackground
+                                            withoutShadow
+                                        />
+                                    )}
+                                </ListView>
+                            </Modal>
                         )}
-                    </ListView>
-                </InlineLayout>
-                {shouldSubmit && (
-                    <Modal
-                        heading={strings.submitConfirmHeading}
-                        onClose={handleRequestForApprovalCancel}
-                        pending={createSimplifiedEapPending || updateSimplifiedEapPending}
-                        pendingMessage={strings.savingPendingMessage}
-                        footerActions={(
-                            <Button
-                                name={undefined}
-                                disabled={hasFormErrors}
-                                onClick={handleSubmitForApprovalConfirm}
-                            >
-                                {strings.submitConfirmButtonLabel}
-                            </Button>
+                        {showShareModal && isDefined(eapId) && (
+                            <EapShareModal
+                                onCancel={setShowShareModalFalse}
+                                onSuccess={setShowShareModalFalse}
+                                eapId={Number(eapId)}
+                            />
                         )}
-                    >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <div>
-                                {strings.submitConfirmMessage}
-                            </div>
-                            {hasFormErrors && (
-                                <Alert
-                                    name="form-error-warning"
-                                    title={strings.submitFormErrorMessage}
-                                    type="warning"
-                                    withLightBackground
-                                    withoutShadow
-                                />
-                            )}
-                        </ListView>
-                    </Modal>
-                )}
-                {showShareModal && isDefined(eapId) && (
-                    <EapShareModal
-                        onCancel={setShowShareModalFalse}
-                        onSuccess={setShowShareModalFalse}
-                        eapId={Number(eapId)}
-                    />
-                )}
-                {isDefined(latestSimplifiedEapId) && showObsoletePayloadModal && (
-                    <EapObsoleteResolutionModal
-                        simplifiedEapId={latestSimplifiedEapId}
-                        onOverwriteButtonClick={handleObsoletePayloadOverwriteButtonClick}
-                        onCancelButtonClick={setShowObsoletePayloadModal}
-                    />
+                        {isDefined(latestSimplifiedEapId) && showObsoletePayloadModal && (
+                            <EapObsoleteResolutionModal
+                                simplifiedEapId={latestSimplifiedEapId}
+                                onOverwriteButtonClick={
+                                    handleObsoletePayloadOverwriteButtonClick
+                                }
+                                onCancelButtonClick={setShowObsoletePayloadModal}
+                            />
+                        )}
+                    </>
                 )}
             </Page>
         </Tabs>
diff --git a/go-api b/go-api
index ed61db0df9..77a7bd9326 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit ed61db0df9fc7b180c0fe8852438e4bca9557fa4
+Subproject commit 77a7bd932612a0e37e79805ef5367537b583cc77

From 29ba591c747171fa5a43ee1e6e5aeb31a40109b4 Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Wed, 1 Apr 2026 10:43:50 +0545
Subject: [PATCH 3/5] feat(eap): add ExplanatoryNote components in both EAP
 form replacing tooltip

    - add IconButton in InfoModal
    - hide export button for staging and production
---
 app/src/components/ExplanatoryNote/index.tsx  |  34 +++
 .../ExplanatoryNote/styles.module.css         |   4 +
 .../EapOperationActivityListInput/index.tsx   |  16 +-
 app/src/components/domain/InfoModal/index.tsx |  51 +++-
 .../EapTableActions/index.tsx                 |   5 +-
 .../EapActivationProcess/i18n.json            |  14 +-
 .../EapActivationProcess/index.tsx            | 246 ++++++++++------
 .../EapFullForm/FinanceLogistics/index.tsx    | 206 ++++++++-----
 app/src/views/EapFullForm/Meal/index.tsx      |  65 +++--
 .../NationalSocietyCapacity/i18n.json         |   2 +-
 .../NationalSocietyCapacity/index.tsx         |  61 ++--
 app/src/views/EapFullForm/Overview/index.tsx  |  72 +++--
 .../views/EapFullForm/RiskAnalysis/index.tsx  | 165 ++++++-----
 .../EapFullForm/SelectionActions/index.tsx    | 168 +++++++----
 .../views/EapFullForm/TriggerModel/i18n.json  |  14 +-
 .../views/EapFullForm/TriggerModel/index.tsx  | 222 +++++++++-----
 app/src/views/EapFullForm/schema.ts           |   1 +
 .../DeliveryAndBudget/i18n.json               |   8 +-
 .../DeliveryAndBudget/index.tsx               | 184 +++++++-----
 .../EapSimplifiedForm/EarlyAction/i18n.json   |   8 +-
 .../EapSimplifiedForm/EarlyAction/index.tsx   | 275 +++++++++++-------
 .../EnablingApproaches/index.tsx              |  14 +-
 .../PlannedOperations/index.tsx               |  14 +-
 .../EapSimplifiedForm/RiskAnalysis/i18n.json  |  16 +-
 .../EapSimplifiedForm/RiskAnalysis/index.tsx  | 237 ++++++++-------
 .../ui/src/components/InputSection/index.tsx  |   9 +-
 26 files changed, 1345 insertions(+), 766 deletions(-)
 create mode 100644 app/src/components/ExplanatoryNote/index.tsx
 create mode 100644 app/src/components/ExplanatoryNote/styles.module.css

diff --git a/app/src/components/ExplanatoryNote/index.tsx b/app/src/components/ExplanatoryNote/index.tsx
new file mode 100644
index 0000000000..8fdcfa2bcf
--- /dev/null
+++ b/app/src/components/ExplanatoryNote/index.tsx
@@ -0,0 +1,34 @@
+import { InformationLineIcon } from '@ifrc-go/icons';
+
+import InfoModal from '#components/domain/InfoModal';
+
+import styles from './styles.module.css';
+
+interface Props {
+    content: React.ReactNode;
+    heading: string;
+    ariaLabel: string;
+    title: string;
+}
+
+function ExplanatoryNote(props: Props) {
+    const {
+        content,
+        heading,
+        ariaLabel,
+        title,
+    } = props;
+
+    return (
+        <InfoModal
+            name={undefined}
+            heading={heading}
+            modalContent={content}
+            icon={<InformationLineIcon className={styles.icon} />}
+            ariaLabel={ariaLabel}
+            title={title}
+        />
+    );
+}
+
+export default ExplanatoryNote;
diff --git a/app/src/components/ExplanatoryNote/styles.module.css b/app/src/components/ExplanatoryNote/styles.module.css
new file mode 100644
index 0000000000..a898de748a
--- /dev/null
+++ b/app/src/components/ExplanatoryNote/styles.module.css
@@ -0,0 +1,4 @@
+.icon {
+    /* FIXME: use variables */
+    font-size: 1rem;
+}
diff --git a/app/src/components/domain/EapOperationActivityListInput/index.tsx b/app/src/components/domain/EapOperationActivityListInput/index.tsx
index 3a7553d32a..493139dc95 100644
--- a/app/src/components/domain/EapOperationActivityListInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityListInput/index.tsx
@@ -6,7 +6,7 @@ import { AddLineIcon } from '@ifrc-go/icons';
 import {
     Button,
     Container,
-    InfoPopup,
+    Description,
     ListView,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
@@ -24,6 +24,7 @@ import {
 
 import EapOperationActivityInput from '#components/domain/EapOperationActivityInput';
 import { type OperationActivityFormFields } from '#components/domain/EapOperationActivityInput/schema';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 
@@ -123,9 +124,16 @@ function EapOperationActivityListInput<const NAME extends FormName>(props: Props
             heading={(
                 <ListView spacing="sm">
                     {title}
-                    {description && (
-                        <InfoPopup
-                            description={description}
+                    {(title && description) && (
+                        <ExplanatoryNote
+                            heading={title}
+                            ariaLabel={title}
+                            title={title}
+                            content={(
+                                <Description>
+                                    {description}
+                                </Description>
+                            )}
                         />
                     )}
                 </ListView>
diff --git a/app/src/components/domain/InfoModal/index.tsx b/app/src/components/domain/InfoModal/index.tsx
index d0c4502be8..ddcf1f5383 100644
--- a/app/src/components/domain/InfoModal/index.tsx
+++ b/app/src/components/domain/InfoModal/index.tsx
@@ -1,24 +1,44 @@
 import {
     Button,
     type ButtonProps,
+    IconButton,
     Modal,
 } from '@ifrc-go/ui';
 import { useBooleanState } from '@ifrc-go/ui/hooks';
 
+type IconButtonProps = {
+    icon: React.ReactNode;
+    ariaLabel: string;
+    label?: never;
+    title: string;
+}
+
+type LabelButtonProps = {
+    icon?: never;
+    ariaLabel?: string;
+    label?: string;
+}
+
+type ButtonTypeProps = IconButtonProps | LabelButtonProps;
+
 // FIXME: make the props consistent with other similar components
 // e.g. DropdownMenu
-interface Props extends ButtonProps<undefined> {
+interface BaseProps extends ButtonProps<undefined> {
     heading?: string;
     modalContent: React.ReactNode;
-    label?: string;
 }
 
+type Props = BaseProps & ButtonTypeProps;
+
 // FIXME: this component should be in `/components`
 function InfoModal(props: Props) {
     const {
         heading,
         label,
         modalContent,
+        ariaLabel,
+        title,
+        icon,
         ...otherButtonProps
     } = props;
 
@@ -32,14 +52,25 @@ function InfoModal(props: Props) {
 
     return (
         <>
-            <Button
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...otherButtonProps}
-                name={undefined}
-                onClick={setShowInfoModalTrue}
-            >
-                {label}
-            </Button>
+            {icon ? (
+                <IconButton
+                    name={undefined}
+                    onClick={setShowInfoModalTrue}
+                    ariaLabel={ariaLabel}
+                    title={title}
+                >
+                    {icon}
+                </IconButton>
+            ) : (
+                <Button
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...otherButtonProps}
+                    name={undefined}
+                    onClick={setShowInfoModalTrue}
+                >
+                    {label}
+                </Button>
+            )}
             {showInfoModal && (
                 <Modal
                     onClose={setShowInfoModalFalse}
diff --git a/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx b/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
index fbd8c69ba3..0839c6aa1e 100644
--- a/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
+++ b/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
@@ -19,6 +19,7 @@ import {
 
 import EapExportModal from '#components/domain/EapExportModal';
 import Link from '#components/Link';
+import { environment } from '#config';
 import {
     EAP_STATUS_NS_ADDRESSING_COMMENTS,
     EAP_STATUS_PENDING_PFA,
@@ -151,7 +152,7 @@ function EapTableActions(props: Props) {
             )}
             {type === 'development' && (
                 <>
-                    {eap.eap_type === EAP_TYPE_SIMPLIFIED && isCreated && (
+                    {environment === 'development' && eap.eap_type === EAP_TYPE_SIMPLIFIED && isCreated && (
                         <Link
                             to="eapSimplifiedExport"
                             urlParams={{ eapId: eap.id }}
@@ -164,7 +165,7 @@ function EapTableActions(props: Props) {
                             {strings.previewExportLinkLabel}
                         </Link>
                     )}
-                    {eap.eap_type === EAP_TYPE_FULL && isCreated && (
+                    {environment === 'development' && eap.eap_type === EAP_TYPE_FULL && isCreated && (
                         <Link
                             to="eapFullExport"
                             urlParams={{ eapId: eap.id }}
diff --git a/app/src/views/EapFullForm/EapActivationProcess/i18n.json b/app/src/views/EapFullForm/EapActivationProcess/i18n.json
index f328b0177b..86a443d576 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/i18n.json
+++ b/app/src/views/EapFullForm/EapActivationProcess/i18n.json
@@ -10,10 +10,10 @@
         "activationProcessExplanatoryLabel": "Explanatory Note",
         "activationProcessRequiredPointsLabel": "Required Points",
         "activationImplementationExplanatoryNote": "As a crucial component of the EAP, once the trigger has been reached, everyone involved should be knowledgeable about what will be done, where, when and by whom. The described implementation process shows that each step of the activation has been thought through and considered and that implementation in the lead time available is possible. The set of tasks described in this section should cover all activities from the moment the trigger is reached (Day 1) to the completion of post-impact surveys (Day X).",
-        "activationImplementationRequiredPoint1": "Include a matrix/flowchart for a quick overview of the early action implementation process.",
-        "activationImplementationRequiredPoint2": "Describe the step-by-step process from Day 1 to Day X for the implementation of the selected early actions. Indicate the day when the Stop Mechanism would occur. Include all critical and support tasks that are necessary for each of the steps. Each task should indicate the position of the person responsible (including when cash-based actions are planned liaison with the financial service provider).",
-        "activationImplementationRequiredPoint3": "For each action, include at which level it will take place (HQ, branch, community).",
-        "activationImplementationRequiredPoint4": "Each NS should have a detailed version of this process, including communication flows, for each task and the name of the person responsible with their contact information. This document should be regularly updated.",
+        "activationRequiredPoint1": "Include a matrix/flowchart for a quick overview of the early action implementation process.",
+        "activationRequiredPoint2": "Describe the step-by-step process from Day 1 to Day X for the implementation of the selected early actions. Indicate the day when the Stop Mechanism would occur. Include all critical and support tasks that are necessary for each of the steps. Each task should indicate the position of the person responsible (including when cash-based actions are planned liaison with the financial service provider).",
+        "activationRequiredPoint3": "For each action, include at which level it will take place (HQ, branch, community).",
+        "activationRequiredPoint4": "Each NS should have a detailed version of this process, including communication flows, for each task and the name of the person responsible with their contact information. This document should be regularly updated.",
         "activationProcessUploadLabel": "Upload",
         "activationTriggerTitle": "Trigger activation system",
         "activationTriggerDescription1": "Describe the automatic system used to monitor the forecasts, generate the intervention map and send the alert message when the trigger is reached.",
@@ -31,9 +31,9 @@
         "activationSelectionDescription3": "If  the EAP is intending to use Social Protection systems or other government      beneficiary databases, indicate how the potential number of targeted households be selected",
         "activationSelectionExplanatoryNote": "FbF aims to protect the most vulnerable from the impact of extreme weather events. Based on the analysis on vulnerability and exposure (in section 3) and on the described mechanism for identifying intervention areas/communities (in section 4- Intervention area), it needs to be clear, how vulnerability criteria and impact forecasts will be applied to determine who will be targeted.",
         "activationStopMechanismTitle": "Stop Mechanism",
-        "activationStopMechanismDescription1": "Indicate on which day of activation the stop mechanism is foreseen, and who is responsible to give the signal to stop.",
-        "activationStopMechanismDescription2": "Describe when the stop mechanism begins and whether in-kind/cash distribution would be stopped or not. For cash actions cancelled, how would this be coordinated with the financial service provider? For in-kind distribution, what would happen with the perishable items?",
-        "activationStopMechanismDescription3": "Explain how it would be communicated to communities and stakeholders that the activities are being stopped.",
+        "activationStopDescription1": "Indicate on which day of activation the stop mechanism is foreseen, and who is responsible to give the signal to stop.",
+        "activationStopDescription2": "Describe when the stop mechanism begins and whether in-kind/cash distribution would be stopped or not. For cash actions cancelled, how would this be coordinated with the financial service provider? For in-kind distribution, what would happen with the perishable items?",
+        "activationStopDescription3": "Explain how it would be communicated to communities and stakeholders that the activities are being stopped.",
         "activationStopMechanismExplanatoryNote": "For forecast triggers with a lead time of more than three days, the EAP should include the description of a stop mechanism. This means that if a later forecast – prior to the start of activities (related to the early action(s)) shows that the event is no longer likely to occur, the activation of the EAP will be stopped to avoid generating further use of resources. For example, if the 6-day forecast on Day 1 indicates high risk of heavy rainfall and thereby triggers the activation and the new 6-day-forecast released on Day 3 shows that the risk has significantly lowered, the trigger level is no longer reached. If the start of distributions was planned for Day 4, activation should be stopped. Items that have been purchased based on the trigger being reached and are not distributed due to the stop mechanism should be stored in the warehouse for a future activation. For forecast triggers with a lead time of less than 3 days, the EAP should include the description of what the National Society would do if the forecast changes in strength or location within the last three days before the event.",
         "activationAttachFilesTitle": "Attach Relevant Files",
         "activationAttachFilesDescription": "Attach any additional maps, documentation, files, images, etc.",
diff --git a/app/src/views/EapFullForm/EapActivationProcess/index.tsx b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
index 84c03075ed..7e02ffba95 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/index.tsx
+++ b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
@@ -4,13 +4,11 @@ import {
     Button,
     Container,
     Description,
-    InfoPopup,
     InputSection,
     Label,
     ListView,
     NumberInput,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { randomString } from '@togglecorp/fujs';
@@ -24,6 +22,7 @@ import {
 
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
@@ -130,7 +129,16 @@ function EapActivationProcess(props: Props) {
                 heading={(
                     <ListView spacing="sm">
                         {strings.activationProcessHeading}
-                        <InfoPopup description={strings.activationProcessTooltip} />
+                        <ExplanatoryNote
+                            heading={strings.activationProcessHeading}
+                            ariaLabel={strings.activationProcessHeading}
+                            title={strings.activationProcessHeading}
+                            content={(
+                                <Description>
+                                    {strings.activationProcessTooltip}
+                                </Description>
+                            )}
+                        />
                     </ListView>
                 )}
                 variant="form"
@@ -141,34 +149,45 @@ function EapActivationProcess(props: Props) {
                 >
                     <InputSection
                         title={strings.activationProcessTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessExplanatoryLabel}
-                                    value={strings.activationImplementationExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>
-                                                {strings.activationImplementationRequiredPoint1}
-                                            </li>
-                                            <li>
-                                                {strings.activationImplementationRequiredPoint2}
-                                            </li>
-                                            <li>
-                                                {strings.activationImplementationRequiredPoint3}
-                                            </li>
-                                            <li>
-                                                {strings.activationImplementationRequiredPoint4}
-                                            </li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.activationProcessTitle}
+                                ariaLabel={strings.activationProcessTitle}
+                                title={strings.activationProcessTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessExplanatoryLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.activationImplementationExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.activationRequiredPoint1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.activationRequiredPoint2}
+                                                    </li>
+                                                    <li>
+                                                        {strings.activationRequiredPoint3}
+                                                    </li>
+                                                    <li>
+                                                        {strings.activationRequiredPoint4}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -205,25 +224,42 @@ function EapActivationProcess(props: Props) {
                     <InputSection
                         withAsteriskOnTitle
                         title={strings.activationTriggerTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessExplanatoryLabel}
-                                    value={strings.activationTriggerExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.activationTriggerRequiredPoint1}</li>
-                                            <li>{strings.activationTriggerRequiredPoint2}</li>
-                                            <li>{strings.activationTriggerRequiredPoint3}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.activationTriggerTitle}
+                                ariaLabel={strings.activationTriggerTitle}
+                                title={strings.activationTriggerTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessExplanatoryLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.activationTriggerExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.activationTriggerRequiredPoint1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.activationTriggerRequiredPoint2}
+                                                    </li>
+                                                    <li>
+                                                        {strings.activationTriggerRequiredPoint3}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -274,25 +310,42 @@ function EapActivationProcess(props: Props) {
                     <InputSection
                         withAsteriskOnTitle
                         title={strings.activationSelectionPopulationTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessExplanatoryLabel}
-                                    value={strings.activationSelectionExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.activationSelectionDescription1}</li>
-                                            <li>{strings.activationSelectionDescription2}</li>
-                                            <li>{strings.activationSelectionDescription3}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.activationSelectionPopulationTitle}
+                                ariaLabel={strings.activationSelectionPopulationTitle}
+                                title={strings.activationSelectionPopulationTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessExplanatoryLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.activationSelectionExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.activationSelectionDescription1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.activationSelectionDescription2}
+                                                    </li>
+                                                    <li>
+                                                        {strings.activationSelectionDescription3}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -316,31 +369,42 @@ function EapActivationProcess(props: Props) {
                     <InputSection
                         withAsteriskOnTitle
                         title={strings.activationStopMechanismTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessExplanatoryLabel}
-                                    value={strings.activationStopMechanismExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.activationProcessRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.activationStopMechanismDescription1}</li>
-                                            <li>{strings.activationStopMechanismDescription2}</li>
-                                            <li>{strings.activationStopMechanismDescription3}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.activationStopMechanismTitle}
+                                ariaLabel={strings.activationStopMechanismTitle}
+                                title={strings.activationStopMechanismTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessExplanatoryLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.activationStopMechanismExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.activationProcessRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.activationStopDescription1}</li>
+                                                    <li>{strings.activationStopDescription2}</li>
+                                                    <li>{strings.activationStopDescription3}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
-                                <li>{strings.activationStopMechanismDescription1}</li>
-                                <li>{strings.activationStopMechanismDescription2}</li>
-                                <li>{strings.activationStopMechanismDescription3}</li>
+                                <li>{strings.activationStopDescription1}</li>
+                                <li>{strings.activationStopDescription2}</li>
+                                <li>{strings.activationStopDescription3}</li>
                             </ul>
                         )}
                     >
diff --git a/app/src/views/EapFullForm/FinanceLogistics/index.tsx b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
index 653b611024..fc4e7d39af 100644
--- a/app/src/views/EapFullForm/FinanceLogistics/index.tsx
+++ b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
@@ -20,6 +20,7 @@ import {
 } from '@togglecorp/toggle-form';
 
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
@@ -146,11 +147,21 @@ function FinanceLogistics(props: Props) {
                 <ListView layout="block" spacing="sm">
                     <InputSection
                         title={strings.financeBudgetTitle}
-                        tooltip={(
-                            <TextOutput
-                                strongLabel
-                                label={strings.financeExplanatoryNoteLabel}
-                                value={strings.financeExplanatoryNote}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.financeBudgetTitle}
+                                ariaLabel={strings.financeBudgetTitle}
+                                title={strings.financeBudgetTitle}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Label strong>
+                                            {strings.financeExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.financeExplanatoryNote}
+                                        </Description>
+                                    </ListView>
+                                )}
                             />
                         )}
                         description={(
@@ -211,24 +222,39 @@ function FinanceLogistics(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.financeReadinessCostTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.financeExplanatoryNoteLabel}
-                                    value={strings.financeReadinessCostExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.financeRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.financeReadinessCostDescription1}</li>
-                                            <li>{strings.financeReadinessCostDescription2}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.financeReadinessCostTitle}
+                                ariaLabel={strings.financeReadinessCostTitle}
+                                title={strings.financeReadinessCostTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.financeExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.financeReadinessCostExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.financeRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.financeReadinessCostDescription1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.financeReadinessCostDescription2}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -261,25 +287,42 @@ function FinanceLogistics(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.financePrePositioningTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.financeExplanatoryNoteLabel}
-                                    value={strings.financePrePositioningExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.financeRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.financePrePositioningDescription1}</li>
-                                            <li>{strings.financePrePositioningDescription2}</li>
-                                            <li>{strings.financePrePositioningDescription3}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.financePrePositioningTitle}
+                                ariaLabel={strings.financePrePositioningTitle}
+                                title={strings.financePrePositioningTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.financeExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.financePrePositioningExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.financeRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.financePrePositioningDescription1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.financePrePositioningDescription2}
+                                                    </li>
+                                                    <li>
+                                                        {strings.financePrePositioningDescription3}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -313,26 +356,45 @@ function FinanceLogistics(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.financeEarlyActionCostTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.financeExplanatoryNoteLabel}
-                                    value={strings.financeEarlyActionCostExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.financeRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.financeEarlyActionCostDescription1}</li>
-                                            <li>{strings.financeEarlyActionCostDescription2}</li>
-                                            <li>{strings.financeEarlyActionCostDescription3}</li>
-                                            <li>{strings.financeEarlyActionCostDescription4}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.financeEarlyActionCostTitle}
+                                ariaLabel={strings.financeEarlyActionCostTitle}
+                                title={strings.financeEarlyActionCostTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.financeExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.financeEarlyActionCostExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.financeRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.financeEarlyActionCostDescription1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.financeEarlyActionCostDescription2}
+                                                    </li>
+                                                    <li>
+                                                        {strings.financeEarlyActionCostDescription3}
+                                                    </li>
+                                                    <li>
+                                                        {strings.financeEarlyActionCostDescription4}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -374,11 +436,21 @@ function FinanceLogistics(props: Props) {
                 <ListView layout="block" spacing="sm">
                     <InputSection
                         title={strings.financeEapEndorsementTitle}
-                        tooltip={(
-                            <TextOutput
-                                strongLabel
-                                label={strings.financeExplanatoryNoteLabel}
-                                value={strings.financeEapEndorsementExplanatoryNote}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.financeEapEndorsementTitle}
+                                ariaLabel={strings.financeEapEndorsementTitle}
+                                title={strings.financeEapEndorsementTitle}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Label strong>
+                                            {strings.financeExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.financeEapEndorsementExplanatoryNote}
+                                        </Description>
+                                    </ListView>
+                                )}
                             />
                         )}
                         description={strings.financeEapEndorsementDescription}
diff --git a/app/src/views/EapFullForm/Meal/index.tsx b/app/src/views/EapFullForm/Meal/index.tsx
index 7149160867..09ac37092c 100644
--- a/app/src/views/EapFullForm/Meal/index.tsx
+++ b/app/src/views/EapFullForm/Meal/index.tsx
@@ -8,7 +8,6 @@ import {
     Label,
     ListView,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { randomString } from '@togglecorp/fujs';
@@ -21,6 +20,7 @@ import {
 } from '@togglecorp/toggle-form';
 
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
@@ -114,33 +114,42 @@ function Meal(props: Props) {
                 >
                     <InputSection
                         title={strings.mealTitle}
-                        tooltip={(
-                            <ListView
-                                layout="block"
-                            >
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.mealExplanatoryNoteLabel}
-                                    value={strings.mealExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.mealRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.mealDescription1}</li>
-                                            <ul>
-                                                <li>{strings.mealDescription11}</li>
-                                                <li>{strings.mealDescription12}</li>
-                                                <li>{strings.mealDescription13}</li>
-                                                <li>{strings.mealDescription14}</li>
-                                            </ul>
-                                            <li>{strings.mealDescription2}</li>
-                                            <li>{strings.mealDescription3}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.mealTitle}
+                                ariaLabel={strings.mealTitle}
+                                title={strings.mealTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.mealExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.mealExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.mealRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.mealDescription1}</li>
+                                                    <ul>
+                                                        <li>{strings.mealDescription11}</li>
+                                                        <li>{strings.mealDescription12}</li>
+                                                        <li>{strings.mealDescription13}</li>
+                                                        <li>{strings.mealDescription14}</li>
+                                                    </ul>
+                                                    <li>{strings.mealDescription2}</li>
+                                                    <li>{strings.mealDescription3}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
diff --git a/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json b/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json
index a604458573..5cafa814ab 100644
--- a/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json
+++ b/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json
@@ -15,7 +15,7 @@
         "capacityStrategiesPlansTitle": "Strategies and plans",
         "capacityStrategiesPlansDescription": "Describe how the EAP is aligned with the Disaster Risk Management strategy of the National Society (e.g. in the existing contingency plan, DRR plan etc.).",
         "capacityFinancialCapacityTitle": "Financial capacity to advance funds",
-        "capacityFinancialCapacityDescription": "Indicate whether the NS (and/or PNS in country) has the capacity to advance funds, to start early actions, in the short duration between trigger and funds from the DREF arriving.",
+        "capacityFinancialDescription": "Indicate whether the NS (and/or PNS in country) has the capacity to advance funds, to start early actions, in the short duration between trigger and funds from the DREF arriving.",
         "capacityNationalRelevantFilesTitle": "Attach relevant files",
         "capacityNationalRelevantFilesDescription": "Attach any additional maps, documentation, files, images, etc.",
         "capacityNationalRelevantFilesUploadLabel": "Upload",
diff --git a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
index c3899c1f44..589c7eacb5 100644
--- a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
+++ b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
@@ -4,12 +4,10 @@ import {
     Button,
     Container,
     Description,
-    InfoPopup,
     InputSection,
     Label,
     ListView,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { randomString } from '@togglecorp/fujs';
@@ -22,6 +20,7 @@ import {
 } from '@togglecorp/toggle-form';
 
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
@@ -106,7 +105,16 @@ function NationalSocietyCapacity(props: Props) {
                 heading={(
                     <ListView>
                         {strings.capacityHeading}
-                        <InfoPopup description={strings.capacityHeadingTooltip} />
+                        <ExplanatoryNote
+                            heading={strings.capacityHeading}
+                            ariaLabel={strings.capacityHeading}
+                            title={strings.capacityHeading}
+                            content={(
+                                <Description>
+                                    {strings.capacityHeadingTooltip}
+                                </Description>
+                            )}
+                        />
                     </ListView>
                 )}
                 variant="form"
@@ -156,25 +164,36 @@ function NationalSocietyCapacity(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.capacityFinancialCapacityTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.capacityExplanatoryNoteLabel}
-                                    value={strings.capacityExplanatoryNote}
-                                />
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.capacityRequiredPointsLabel}
-                                    value={(
-                                        <ul>
-                                            <li>{strings.capacityFinancialCapacityDescription}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.capacityFinancialCapacityTitle}
+                                ariaLabel={strings.capacityFinancialCapacityTitle}
+                                title={strings.capacityFinancialCapacityTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.capacityExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.capacityExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.capacityRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.capacityFinancialDescription}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
-                        description={strings.capacityFinancialCapacityDescription}
+                        description={strings.capacityFinancialDescription}
                         withAsteriskOnTitle
                     >
                         <TextArea
diff --git a/app/src/views/EapFullForm/Overview/index.tsx b/app/src/views/EapFullForm/Overview/index.tsx
index a9a369792f..dfd9d842bf 100644
--- a/app/src/views/EapFullForm/Overview/index.tsx
+++ b/app/src/views/EapFullForm/Overview/index.tsx
@@ -7,10 +7,10 @@ import {
     DateInput,
     Description,
     InputSection,
+    Label,
     ListView,
     TextArea,
     TextInput,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { resolveToString } from '@ifrc-go/ui/utils';
@@ -27,6 +27,7 @@ import CountrySelectInput from '#components/domain/CountrySelectInput';
 import DisasterTypeSelectInput from '#components/domain/DisasterTypeSelectInput';
 import ImageWithCaptionInput from '#components/domain/ImageWithCaptionInput';
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type GoApiResponse } from '#utils/restRequest';
@@ -393,11 +394,21 @@ function Overview(props: Props) {
                 >
                     <InputSection
                         title={strings.workWithGovernmentTitle}
-                        tooltip={(
-                            <TextOutput
-                                label={strings.overviewExplanatoryNoteLabel}
-                                strongLabel
-                                value={strings.workExplanatoryNote}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.workWithGovernmentTitle}
+                                ariaLabel={strings.workWithGovernmentTitle}
+                                title={strings.workWithGovernmentTitle}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Label strong>
+                                            {strings.overviewExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.workExplanatoryNote}
+                                        </Description>
+                                    </ListView>
+                                )}
                             />
                         )}
                         description={strings.workWithGovernmentDescription}
@@ -433,25 +444,36 @@ function Overview(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.keyActorsTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    label={strings.overviewExplanatoryNoteLabel}
-                                    strongLabel
-                                    value={strings.actorsExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.overviewRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>{strings.overviewRequiredPoint1}</li>
-                                            <li>{strings.overviewRequiredPoint2}</li>
-                                            <li>{strings.overviewRequiredPoint3}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.keyActorsTitle}
+                                ariaLabel={strings.keyActorsTitle}
+                                title={strings.keyActorsTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.overviewExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.actorsExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.overviewRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.overviewRequiredPoint1}</li>
+                                                    <li>{strings.overviewRequiredPoint2}</li>
+                                                    <li>{strings.overviewRequiredPoint3}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <>
diff --git a/app/src/views/EapFullForm/RiskAnalysis/index.tsx b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
index c6482b1321..aa1e3b13e0 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
@@ -8,7 +8,6 @@ import {
     Label,
     ListView,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
@@ -25,6 +24,7 @@ import {
 
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
@@ -208,39 +208,47 @@ function RiskAnalysis(props: Props) {
                 <ListView layout="block" spacing="sm">
                     <InputSection
                         title={strings.hazardSelectionTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    label={strings.riskExplanatoryNoteLabel}
-                                    strongLabel
-                                    value={strings.hazardSelectionExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.riskRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>
-                                                {strings.hazardSelectionRequiredPoint1}
-                                            </li>
-                                            <li>
-                                                {strings.hazardSelectionRequiredPoint2}
-                                            </li>
-                                            <li>
-                                                {strings.hazardSelectionRequiredPoint3}
-                                                <ul>
-                                                    <li>
-                                                        {strings.hazardSelectionRequiredPoint31}
-                                                    </li>
-                                                </ul>
-                                            </li>
-                                            <li>
-                                                {strings.hazardSelectionRequiredPoint4}
-                                            </li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                ariaLabel={strings.hazardSelectionTitle}
+                                title={strings.hazardSelectionTitle}
+                                heading={strings.hazardSelectionTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <Label strong>
+                                            {strings.riskExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.hazardSelectionExplanatoryNote}
+                                        </Description>
+                                        <Label strong>
+                                            {strings.riskRequiredPointsLabel}
+                                        </Label>
+                                        <Description>
+                                            <ul>
+                                                <li>
+                                                    {strings.hazardSelectionRequiredPoint1}
+                                                </li>
+                                                <li>
+                                                    {strings.hazardSelectionRequiredPoint2}
+                                                </li>
+                                                <li>
+                                                    {strings.hazardSelectionRequiredPoint3}
+                                                    <ul>
+                                                        <li>
+                                                            {strings
+                                                                .hazardSelectionRequiredPoint31}
+                                                        </li>
+                                                    </ul>
+                                                </li>
+                                                <li>
+                                                    {strings.hazardSelectionRequiredPoint4}
+                                                </li>
+                                            </ul>
+                                        </Description>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -278,37 +286,44 @@ function RiskAnalysis(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.exposeElementTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    label={strings.riskExplanatoryNoteLabel}
-                                    strongLabel
-                                    value={strings.exposeElementExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.riskRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>
-                                                {strings.exposeElementRequiredPoint1}
-                                            </li>
-                                            <li>
-                                                {strings.exposeElementRequiredPoint2}
-                                            </li>
-                                            <li>
-                                                {strings.exposeElementRequiredPoint3}
-                                            </li>
-                                            <li>
-                                                {strings.exposeElementRequiredPoint4}
-                                            </li>
-                                            <li>
-                                                {strings.exposeElementRequiredPoint5}
-                                            </li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.exposeElementTitle}
+                                ariaLabel={strings.exposeElementTitle}
+                                title={strings.exposeElementTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <Label strong>
+                                            {strings.riskExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.exposeElementExplanatoryNote}
+                                        </Description>
+                                        <Label strong>
+                                            {strings.riskRequiredPointsLabel}
+                                        </Label>
+                                        <Description>
+                                            <ul>
+                                                <li>
+                                                    {strings.exposeElementRequiredPoint1}
+                                                </li>
+                                                <li>
+                                                    {strings.exposeElementRequiredPoint2}
+                                                </li>
+                                                <li>
+                                                    {strings.exposeElementRequiredPoint3}
+                                                </li>
+                                                <li>
+                                                    {strings.exposeElementRequiredPoint4}
+                                                </li>
+                                                <li>
+                                                    {strings.exposeElementRequiredPoint5}
+                                                </li>
+                                            </ul>
+                                        </Description>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -347,11 +362,21 @@ function RiskAnalysis(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.prioritisedImpactTitle}
-                        tooltip={(
-                            <TextOutput
-                                label={strings.riskExplanatoryNoteLabel}
-                                strongLabel
-                                value={strings.prioritisedImpactExplanatoryNote}
+                        headerActions={(
+                            <ExplanatoryNote
+                                title={strings.prioritisedImpactTitle}
+                                heading={strings.prioritisedImpactTitle}
+                                ariaLabel={strings.prioritisedImpactTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <Label strong>
+                                            {strings.riskExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.prioritisedImpactExplanatoryNote}
+                                        </Description>
+                                    </ListView>
+                                )}
                             />
                         )}
                         description={strings.prioritisedImpactDescription}
diff --git a/app/src/views/EapFullForm/SelectionActions/index.tsx b/app/src/views/EapFullForm/SelectionActions/index.tsx
index 52ea44fcdd..8ea376b883 100644
--- a/app/src/views/EapFullForm/SelectionActions/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/index.tsx
@@ -8,12 +8,10 @@ import {
     Checklist,
     Container,
     Description,
-    InfoPopup,
     InputSection,
     Label,
     ListView,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
@@ -33,6 +31,7 @@ import {
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
 import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
@@ -308,7 +307,16 @@ function SelectionActions(props: Props) {
                 heading={(
                     <ListView spacing="sm">
                         {strings.selectionActionsHeading}
-                        <InfoPopup description={strings.selectionActionsTooltipDescription} />
+                        <ExplanatoryNote
+                            heading={strings.selectionActionsHeading}
+                            ariaLabel={strings.selectionActionsHeading}
+                            title={strings.selectionActionsHeading}
+                            content={(
+                                <Description>
+                                    {strings.selectionActionsTooltipDescription}
+                                </Description>
+                            )}
+                        />
                     </ListView>
                 )}
                 variant="form"
@@ -316,27 +324,48 @@ function SelectionActions(props: Props) {
                 <ListView layout="block">
                     <InputSection
                         title={strings.selectionProcessTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    label={strings.selectionActionExplanatoryNoteLabel}
-                                    strongLabel
-                                    value={strings.selectionProcessExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.selectionActionRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>{strings.selectionProcessRequiredPoint1}</li>
-                                            <li>{strings.selectionProcessRequiredPoint2}</li>
-                                            <li>{strings.selectionProcessRequiredPoint3}</li>
-                                            <li>{strings.selectionProcessRequiredPoint4}</li>
-                                            <li>{strings.selectionProcessRequiredPoint5}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.selectionProcessTitle}
+                                ariaLabel={strings.selectionProcessTitle}
+                                title={strings.selectionProcessTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.selectionActionExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.selectionProcessExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.selectionActionRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.selectionProcessRequiredPoint1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.selectionProcessRequiredPoint2}
+                                                    </li>
+                                                    <li>
+                                                        {strings.selectionProcessRequiredPoint3}
+                                                    </li>
+                                                    <li>
+                                                        {strings.selectionProcessRequiredPoint4}
+                                                    </li>
+                                                    <li>
+                                                        {strings.selectionProcessRequiredPoint5}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -443,11 +472,21 @@ function SelectionActions(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.evidenceBaseTitle}
-                        tooltip={(
-                            <TextOutput
-                                label={strings.selectionActionExplanatoryNoteLabel}
-                                strongLabel
-                                value={strings.evidenceBaseExplanatoryNote}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.evidenceBaseTitle}
+                                title={strings.evidenceBaseTitle}
+                                ariaLabel={strings.evidenceBaseTitle}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Label strong>
+                                            {strings.selectionActionExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.evidenceBaseExplanatoryNote}
+                                        </Description>
+                                    </ListView>
+                                )}
                             />
                         )}
                         description={strings.evidenceBaseDescription}
@@ -590,14 +629,22 @@ function SelectionActions(props: Props) {
                     <InputSection
                         title={strings.useFulnessActionsTitle}
                         description={strings.useFulnessActionsDescription}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.selectionActionExplanatoryNoteLabel}
-                                    value={strings.useFulnessActionsExplanatoryNote}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.useFulnessActionsTitle}
+                                ariaLabel={strings.useFulnessActionsTitle}
+                                title={strings.useFulnessActionsTitle}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Label strong>
+                                            {strings.selectionActionExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.useFulnessActionsExplanatoryNote}
+                                        </Description>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         withAsteriskOnTitle
                     >
@@ -615,24 +662,35 @@ function SelectionActions(props: Props) {
                     <InputSection
                         title={strings.feasibilityTitle}
                         description={strings.feasibilityDescription}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.selectionActionExplanatoryNoteLabel}
-                                    value={strings.feasibilityExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.selectionActionRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>{strings.feasibilityRequiredPoint1}</li>
-                                            <li>{strings.feasibilityRequiredPoint2}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.feasibilityTitle}
+                                ariaLabel={strings.feasibilityTitle}
+                                title={strings.feasibilityTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.selectionActionExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.feasibilityExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.selectionActionRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.feasibilityRequiredPoint1}</li>
+                                                    <li>{strings.feasibilityRequiredPoint2}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         withAsteriskOnTitle
                     >
diff --git a/app/src/views/EapFullForm/TriggerModel/i18n.json b/app/src/views/EapFullForm/TriggerModel/i18n.json
index 24c2ad25d1..47f3935a11 100644
--- a/app/src/views/EapFullForm/TriggerModel/i18n.json
+++ b/app/src/views/EapFullForm/TriggerModel/i18n.json
@@ -26,18 +26,18 @@
         "definitionJustificationDescription4": "Indicate to which return period the selected impact-level corresponds (minimum: 1-in-5 years.)",
         "definitionJustificationDescription5": "Explain how the return period was calculated",
         "definitionJustificationExplanatoryNote": "The DREF provides funding for early action for events of a strength that has caused significant humanitarian impact in the past. Explain how a certain magnitude was selected and how the impact level was defined (see guidance in the FbF manual chapter 4.1 Set the Trigger (particularly Steps 6-8)). Define the relationship between impact (utilizing the prioritized impact/s section 3.3) and hazard magnitude to establish which impact can be expected given specific hazard magnitudes.",
-        "definitionJustificationRequiredPoint1": "Why did you select a certain magnitude of event?",
-        "definitionJustificationRequiredPoint2": "Explain how your impact level was defined. Explain how much impact can be expected based on the strength of the event.",
-        "definitionJustificationRequiredPoint3": "Indicate to which return period the selected impact-level corresponds (minimum: 1-in-5 years.)",
-        "definitionJustificationRequiredPoint4": "Explain how the return period was calculated",
+        "definitionRequiredPoint1": "Why did you select a certain magnitude of event?",
+        "definitionRequiredPoint2": "Explain how your impact level was defined. Explain how much impact can be expected based on the strength of the event.",
+        "definitionRequiredPoint3": "Indicate to which return period the selected impact-level corresponds (minimum: 1-in-5 years.)",
+        "definitionRequiredPoint4": "Explain how the return period was calculated",
         "identificationInterventionTitle": "Identification of the intervention area",
         "identificationInterventionDescription1": "Building on the analysis in Prioritised impact (in the previous section), list the vulnerability and exposure indicators/maps that will be used to identify which are the areas likely to be most impacted. Indicate data source and administrative level for each indicator, as well as state how you will update the data.",
         "identificationInterventionDescription2": "Describe how you will combine the forecast maps with vulnerability/exposure indicators.",
         "identificationInterventionDescription3": "Provide an example using a past event (it could be using a sample intervention map).",
         "identificationInterventionExplanatoryNote": "When an impact level is reached, vulnerability and exposure information is combined with the real-time forecast to identify which areas are likely to be most impacted. In the most advanced form, the forecast would be digitally combined with vulnerability and exposure information, to show which areas are predicted to be most severely impacted. This will provide a map-based tool or a list of prioritized districts villages, municipalities or other geographical areas where the early actions will be activated. Where no digital system is available, the combination of forecast and vulnerability/exposure indicators could also be done manually, e.g. if flooding is forecasted for a certain area, the most vulnerable and exposed communities in that area are selected (for example the poorest if that indicator is used). If different weighted indicators are used to calculate a vulnerability index, check on the index which of the communities in the area for which the event is forecasted scores highest. Ultimately the objective is to know which areas are likely to be impacted and how you will determine which will be targeted.",
-        "identificationInterventionRequiredPoint1": "Building on the analysis in 3.3. list the vulnerability and exposure indicators/maps that will be used to identify which are the areas likely to be most impacted. Indicate data source and administrative level for each indicator, as well as state how you will update the data.",
-        "identificationInterventionRequiredPoint2": "Describe how you will combine the forecast maps with vulnerability/exposure indicators.",
-        "identificationInterventionRequiredPoint3": "Provide an example using past event (it could be using a sample intervention map).",
+        "identificationRequiredPoint1": "Building on the analysis in 3.3. list the vulnerability and exposure indicators/maps that will be used to identify which are the areas likely to be most impacted. Indicate data source and administrative level for each indicator, as well as state how you will update the data.",
+        "identificationRequiredPoint2": "Describe how you will combine the forecast maps with vulnerability/exposure indicators.",
+        "identificationRequiredPoint3": "Provide an example using past event (it could be using a sample intervention map).",
         "attachRelevantFilesTitle": "Attach relevant files",
         "attachRelevantFilesDescription": "Attach any additional maps, documentation, files, images, etc.",
         "attachRelevantFilesUploadLabel": "Upload",
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index 3e17b365e1..ecfc5b38b5 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -4,15 +4,15 @@ import {
     Button,
     Container,
     Description,
-    InfoPopup,
     InputSection,
     Label,
     ListView,
     NumberInput,
+    SelectInput,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
+import { stringValueSelector } from '@ifrc-go/ui/utils';
 import {
     isDefined,
     randomString,
@@ -29,9 +29,12 @@ import Admin2Input from '#components/domain/Admin2Input';
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
 import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
+import { type components } from '#generated/types';
+import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import {
     type GoApiResponse,
     useRequest,
@@ -44,6 +47,12 @@ import SectionQualityCriteria from '../SectionQualityCriteria';
 
 import i18n from './i18n.json';
 
+type TimeframeOption = components['schemas']['EapTimeframeEnum'];
+
+function timeframeKeySelector(option: TimeframeOption) {
+    return option.key;
+}
+
 interface Props {
     value: PartialEapFullFormType;
     setFieldValue: (...entries: EntriesAsList<PartialEapFullFormType>) => void;
@@ -72,6 +81,8 @@ function TriggerModel(props: Props) {
     const error = getErrorObject(formError);
     const strings = useTranslation(i18n);
 
+    const { eap_timeframe } = useGlobalEnums();
+
     const { response: templateUrl } = useRequest({
         url: '/api/v2/eap/global-files/{template_type}/',
         pathVariables: {
@@ -221,7 +232,16 @@ function TriggerModel(props: Props) {
                 heading={(
                     <ListView spacing="sm">
                         {strings.triggerModelHeading}
-                        <InfoPopup description={strings.triggerModelTooltipDescription} />
+                        <ExplanatoryNote
+                            heading={strings.triggerModelHeading}
+                            title={strings.triggerModelHeading}
+                            ariaLabel={strings.triggerModelHeading}
+                            content={(
+                                <Description>
+                                    {strings.triggerModelTooltipDescription}
+                                </Description>
+                            )}
+                        />
                     </ListView>
                 )}
                 variant="form"
@@ -229,11 +249,21 @@ function TriggerModel(props: Props) {
                 <ListView layout="block" spacing="sm">
                     <InputSection
                         title={strings.triggerStatementTitle}
-                        tooltip={(
-                            <TextOutput
-                                label={strings.triggerExplanatoryNoteLabel}
-                                strongLabel
-                                value={strings.triggerStatementExplanatoryNote}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.triggerStatementTitle}
+                                ariaLabel={strings.triggerStatementTitle}
+                                title={strings.triggerStatementTitle}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Label strong>
+                                            {strings.triggerExplanatoryNoteLabel}
+                                        </Label>
+                                        <Description>
+                                            {strings.triggerStatementExplanatoryNote}
+                                        </Description>
+                                    </ListView>
+                                )}
                             />
                         )}
                         description={strings.triggerStatementDescription}
@@ -250,7 +280,11 @@ function TriggerModel(props: Props) {
                             maxLength={charLimits.trigger_statement}
                         />
                     </InputSection>
-                    <InputSection title={strings.triggerLeadTimeTitle} withAsteriskOnTitle>
+                    <InputSection
+                        title={strings.triggerLeadTimeTitle}
+                        withAsteriskOnTitle
+                        numPreferredColumns={2}
+                    >
                         <NumberInput
                             name="lead_time"
                             value={value?.lead_time}
@@ -259,6 +293,17 @@ function TriggerModel(props: Props) {
                             disabled={disabled}
                             readOnly={readOnly}
                         />
+                        <SelectInput
+                            name="lead_timeframe_unit"
+                            value={value?.lead_timeframe_unit}
+                            error={error?.lead_timeframe_unit}
+                            onChange={setFieldValue}
+                            options={eap_timeframe}
+                            keySelector={timeframeKeySelector}
+                            labelSelector={stringValueSelector}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
                     </InputSection>
                     <InputSection
                         title={strings.sourcesForecastTitle}
@@ -296,24 +341,35 @@ function TriggerModel(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.forecastSelectionTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    label={strings.triggerExplanatoryNoteLabel}
-                                    strongLabel
-                                    value={strings.forecastExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.triggerRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>{strings.forecastRequiredPoint1}</li>
-                                            <li>{strings.forecastRequiredPoint2}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.forecastSelectionTitle}
+                                ariaLabel={strings.forecastSelectionTitle}
+                                title={strings.forecastSelectionTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.triggerExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.forecastExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.triggerRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.forecastRequiredPoint1}</li>
+                                                    <li>{strings.forecastRequiredPoint2}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={strings.forecastSelectionDescription}
                         withAsteriskOnTitle
@@ -372,26 +428,37 @@ function TriggerModel(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.definitionJustificationTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    label={strings.triggerExplanatoryNoteLabel}
-                                    strongLabel
-                                    value={strings.definitionJustificationExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.triggerRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>{strings.definitionJustificationRequiredPoint1}</li>
-                                            <li>{strings.definitionJustificationRequiredPoint2}</li>
-                                            <li>{strings.definitionJustificationRequiredPoint3}</li>
-                                            <li>{strings.definitionJustificationRequiredPoint4}</li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.definitionJustificationTitle}
+                                ariaLabel={strings.definitionJustificationTitle}
+                                title={strings.definitionJustificationTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.triggerExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.definitionJustificationExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.triggerRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.definitionRequiredPoint1}</li>
+                                                    <li>{strings.definitionRequiredPoint2}</li>
+                                                    <li>{strings.definitionRequiredPoint3}</li>
+                                                    <li>{strings.definitionRequiredPoint4}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
@@ -432,31 +499,42 @@ function TriggerModel(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.identificationInterventionTitle}
-                        tooltip={(
-                            <ListView layout="block">
-                                <TextOutput
-                                    label={strings.triggerExplanatoryNoteLabel}
-                                    strongLabel
-                                    value={strings.identificationInterventionExplanatoryNote}
-                                />
-                                <TextOutput
-                                    label={strings.triggerRequiredPointsLabel}
-                                    strongLabel
-                                    value={(
-                                        <ul>
-                                            <li>
-                                                {strings.identificationInterventionRequiredPoint1}
-                                            </li>
-                                            <li>
-                                                {strings.identificationInterventionRequiredPoint2}
-                                            </li>
-                                            <li>
-                                                {strings.identificationInterventionRequiredPoint3}
-                                            </li>
-                                        </ul>
-                                    )}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.identificationInterventionTitle}
+                                ariaLabel={strings.identificationInterventionTitle}
+                                title={strings.identificationInterventionTitle}
+                                content={(
+                                    <ListView layout="block">
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.triggerExplanatoryNoteLabel}
+                                            </Label>
+                                            <Description>
+                                                {strings.identificationInterventionExplanatoryNote}
+                                            </Description>
+                                        </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.triggerRequiredPointsLabel}
+                                            </Label>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.identificationRequiredPoint1}
+                                                    </li>
+                                                    <li>
+                                                        {strings.identificationRequiredPoint2}
+                                                    </li>
+                                                    <li>
+                                                        {strings.identificationRequiredPoint3}
+                                                    </li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         description={(
                             <ul>
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index fba21ceefd..360a24c812 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -773,6 +773,7 @@ export const formSchema: EapFullFormSchema = {
                 }),
             },
             lead_time: { required: isSubmit },
+            lead_timeframe_unit: { required: isSubmit },
 
             forecast_selection: {
                 required: isSubmit,
diff --git a/app/src/views/EapSimplifiedForm/DeliveryAndBudget/i18n.json b/app/src/views/EapSimplifiedForm/DeliveryAndBudget/i18n.json
index a690860cf1..e684e6f997 100644
--- a/app/src/views/EapSimplifiedForm/DeliveryAndBudget/i18n.json
+++ b/app/src/views/EapSimplifiedForm/DeliveryAndBudget/i18n.json
@@ -13,10 +13,10 @@
         "deliverInvolvedTooltipDescriptionThree": "With national level partners, including government stakeholders, Met Service, civil society and other national or local experts. Planning for a simplified EAP can be an opportunity to develop these relationships and may be useful to define roles and responsibilities in a Memorandum of Understanding (MoU). This could be defined during the development of the simplified EAP or can be done as part of the kickoff activities, once a simplified EAP has been approved for funding. The Red Cross Red Crescent Climate Centre developed this guide – Collaborating with national climate and weather agencies: {guideLink} The guide includes some useful information, included under section 4, guiding questions and in annex A, a draft MoU, which could potentially be adapted for other partners.",
         "guideLink": "a guide to getting started.",
         "deliverInvolvedTooltipDescriptionFour": "Other general considerations:",
-        "deliverInvolvedTooltipListOne": "The simplified EAP should plan to target events that are forecasted/predicted to have an above average impact and that have caused humanitarian impacts in the past",
-        "deliverInvolvedTooltipListTwo": "The minimum standard for monitoring and evaluation is that each simplified EAP includes a lessons learned workshop.",
-        "deliverInvolvedTooltipListThree": "While not requested as part of the simplified EAP, National Societies should have a draft plan or SOP in place to monitor the forecasts/indicators, to activate the simplified EAP and deliver the early action activities within the lead time.",
-        "deliverInvolvedTooltipListFour": "The roles and responsibilities should be clear, who will do what at what time.",
+        "deliverInvolvedTooltip1": "The simplified EAP should plan to target events that are forecasted/predicted to have an above average impact and that have caused humanitarian impacts in the past",
+        "deliverInvolvedTooltip2": "The minimum standard for monitoring and evaluation is that each simplified EAP includes a lessons learned workshop.",
+        "deliverInvolvedTooltip3": "While not requested as part of the simplified EAP, National Societies should have a draft plan or SOP in place to monitor the forecasts/indicators, to activate the simplified EAP and deliver the early action activities within the lead time.",
+        "deliverInvolvedTooltip4": "The roles and responsibilities should be clear, who will do what at what time.",
         "budgetHeading": "Budget",
         "deliverTotalBudget": "Total budget(CHF)",
         "deliverTotalBudgetTooltip": "The maximum budget available for a National Society under a simplified EAP is CHF 200,000 over two years. In this field, the National Society should reflect the total amount of the budget (which should match the budget template). The total budget includes 65% maximum for readiness activities and prepositioned stock, with the balance funding the early action activities and needs to be inclusive of the IFRC’s indirect costs (6.5%). Additionally, the IFRC Delegation may add 10% of the total budget to support the simplified EAP implementation bringing the final budget to CHF 220,000 over two years. If a National Society has any questions on the budget, please consult the IFRC’s Country or Country Cluster Delegation. Readiness, pre-positioning, early action: These fields should reflect the plan and budget split across the three types of eligible activities and match the total budget.",
diff --git a/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx b/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx
index 71d367a1fb..1de2c920b3 100644
--- a/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx
+++ b/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx
@@ -3,13 +3,11 @@ import {
     Container,
     Description,
     Heading,
-    InfoPopup,
     InputSection,
     Label,
     ListView,
     NumberInput,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
@@ -25,6 +23,7 @@ import {
 } from '@togglecorp/toggle-form';
 
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import TabPage from '#components/TabPage';
 import { useRequest } from '#utils/restRequest';
@@ -172,7 +171,18 @@ function DeliveryAndBudget(props: Props) {
                     <InputSection
                         title={strings.deliverEarlyActions}
                         description={strings.deliverEarlyActionsDescription}
-                        tooltip={strings.deliverEarlyActionsTooltip}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.deliverEarlyActions}
+                                ariaLabel={strings.deliverEarlyActions}
+                                title={strings.deliverEarlyActions}
+                                content={(
+                                    <Description>
+                                        {strings.deliverEarlyActionsTooltip}
+                                    </Description>
+                                )}
+                            />
+                        )}
                         withAsteriskOnTitle
                     >
                         <TextArea
@@ -189,39 +199,52 @@ function DeliveryAndBudget(props: Props) {
                     <InputSection
                         title={strings.deliverInvolved}
                         description={strings.deliverInvolvedDescription}
-                        tooltip={(
-                            <ListView
-                                layout="block"
-                                spacing="3xs"
-                            >
-                                {strings.deliverInvolvedTooltipDescriptionOne}
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.deliverInvolvedTooltipDescriptionTwo}
-                                    value={resolveToComponent(
-                                        strings.deliverInvolvedTooltipDescriptionThree,
-                                        {
-                                            guideLink: (
-                                                <Link
-                                                    href="https://ifrcorg.sharepoint.com/:b:/s/IFRCSharing/EQn1ca51QIBCgok06lTQUFUBdmFAz3k28QkRMzbxMnRv1A?e=uBzYht"
-                                                    styleVariant="action"
-                                                    external
-                                                    withLinkIcon
-                                                >
-                                                    {strings.guideLink}
-                                                </Link>
-                                            ),
-                                        },
-                                    )}
-                                />
-                                {strings.deliverInvolvedTooltipDescriptionFour}
-                                <ul>
-                                    <li>{strings.deliverInvolvedTooltipListOne}</li>
-                                    <li>{strings.deliverInvolvedTooltipListTwo}</li>
-                                    <li>{strings.deliverInvolvedTooltipListThree}</li>
-                                    <li>{strings.deliverInvolvedTooltipListFour}</li>
-                                </ul>
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.deliverInvolved}
+                                ariaLabel={strings.deliverInvolved}
+                                title={strings.deliverInvolved}
+                                content={(
+                                    <ListView layout="block">
+                                        <Description>
+                                            {strings.deliverInvolvedTooltipDescriptionOne}
+                                        </Description>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.deliverInvolvedTooltipDescriptionTwo}
+                                            </Label>
+                                            <Description>
+                                                {resolveToComponent(
+                                                    strings.deliverInvolvedTooltipDescriptionThree,
+                                                    {
+                                                        guideLink: (
+                                                            <Link
+                                                                href="https://ifrcorg.sharepoint.com/:b:/s/IFRCSharing/EQn1ca51QIBCgok06lTQUFUBdmFAz3k28QkRMzbxMnRv1A?e=uBzYht"
+                                                                styleVariant="action"
+                                                                external
+                                                                withLinkIcon
+                                                            >
+                                                                {strings.guideLink}
+                                                            </Link>
+                                                        ),
+                                                    },
+                                                )}
+                                            </Description>
+                                            <Description>
+                                                {strings.deliverInvolvedTooltipDescriptionFour}
+                                            </Description>
+                                            <Description>
+                                                <ul>
+                                                    <li>{strings.deliverInvolvedTooltip1}</li>
+                                                    <li>{strings.deliverInvolvedTooltip2}</li>
+                                                    <li>{strings.deliverInvolvedTooltip3}</li>
+                                                    <li>{strings.deliverInvolvedTooltip4}</li>
+                                                </ul>
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         withAsteriskOnTitle
                     >
@@ -245,13 +268,13 @@ function DeliveryAndBudget(props: Props) {
                         spacing="sm"
                     >
                         {strings.budgetHeading}
-                        <InfoPopup
-                            description={(
-                                <ListView
-                                    layout="block"
-                                    spacing="sm"
-                                >
-                                    <div>
+                        <ExplanatoryNote
+                            heading={strings.budgetHeading}
+                            ariaLabel={strings.budgetHeading}
+                            title={strings.budgetHeading}
+                            content={(
+                                <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                    <Description>
                                         {resolveToComponent(
                                             strings.deliverTotalBudgetTooltipDescription,
                                             {
@@ -267,36 +290,38 @@ function DeliveryAndBudget(props: Props) {
                                                 ),
                                             },
                                         )}
-                                    </div>
-                                    <ul>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListOne}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListTwo}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListThree}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListFour}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListFive}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListSix}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListSeven}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListEight}
-                                        </li>
-                                        <li>
-                                            {strings.deliverTotalBudgetTooltipListNine}
-                                        </li>
-                                    </ul>
+                                    </Description>
+                                    <Description>
+                                        <ul>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListOne}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListTwo}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListThree}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListFour}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListFive}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListSix}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListSeven}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListEight}
+                                            </li>
+                                            <li>
+                                                {strings.deliverTotalBudgetTooltipListNine}
+                                            </li>
+                                        </ul>
+                                    </Description>
                                 </ListView>
                             )}
                         />
@@ -311,7 +336,18 @@ function DeliveryAndBudget(props: Props) {
                     <InputSection
                         title={strings.deliverTotalBudget}
                         description={strings.deliverTotalBudgetDescription}
-                        tooltip={strings.deliverTotalBudgetTooltip}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.deliverTotalBudget}
+                                ariaLabel={strings.deliverTotalBudget}
+                                title={strings.deliverTotalBudget}
+                                content={(
+                                    <Description>
+                                        {strings.deliverTotalBudgetTooltip}
+                                    </Description>
+                                )}
+                            />
+                        )}
                         withAsteriskOnTitle
                     >
                         <ListView
diff --git a/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json b/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json
index 9339cb26ba..01d5cb5369 100644
--- a/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json
+++ b/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json
@@ -4,10 +4,10 @@
         "actionHeading": "Early Action Intervention",
         "intervention": "Overall objective of the intervention",
         "interventionDescription": "Provide an objective statement that describes the main goal of the intervention.",
-        "interventiontooltipDescription": "In a sentence or two, provide an objective statement that describes the main goal of the intervention. For example:",
-        "interventiontooltipDescriptionListOne": "The operation aims to mitigate the impact of severe cold wave on vulnerable subsistence herders by providing cash and animal care kits to maintain animal health in advance of freezing temperatures.",
-        "interventiontooltipDescriptionListTwo": "The operation aims to mitigate the impact of flooding by providing residents in flood-prone coastal regions with early warning messages, evacuation by boat, and water purification material to save lives and prevent the outbreak of waterborne diseases in advance of the peak of flood inundation.",
-        "interventiontooltipDescriptionListThree": "The operation aims to mitigate the impact of the cyclone by providing vulnerable people with early warning messages and shelter strengthening kits and will support female and child headed households and the elderly to strengthen shelters to save lives and protect homes in advance of a more severe than usual cyclone.",
+        "interventionTooltipDescription": "In a sentence or two, provide an objective statement that describes the main goal of the intervention. For example:",
+        "interventionTooltipDescription1": "The operation aims to mitigate the impact of severe cold wave on vulnerable subsistence herders by providing cash and animal care kits to maintain animal health in advance of freezing temperatures.",
+        "interventionTooltipDescription2": "The operation aims to mitigate the impact of flooding by providing residents in flood-prone coastal regions with early warning messages, evacuation by boat, and water purification material to save lives and prevent the outbreak of waterborne diseases in advance of the peak of flood inundation.",
+        "interventionTooltipDescription3": "The operation aims to mitigate the impact of the cyclone by providing vulnerable people with early warning messages and shelter strengthening kits and will support female and child headed households and the elderly to strengthen shelters to save lives and protect homes in advance of a more severe than usual cyclone.",
         "geographicalRiskArea": "Potential geographical high-risk areas that the simplified EAP would target",
         "geographicalRiskAreaDescription": "Which high risk regions have been selected for this intervention and why?",
         "geographicalRiskAreaTooltip": "Simplified EAPs should be developed with national coverage in mind but because of the nature of certain hazards there might be geographical areas that are more at risk, for example: coastal districts (for cyclones), river areas (for riverine floods), international border areas (for population movement), etc. Provide an overview of the geographical areas targeted by this simplified EAP, and why these specific geographical areas are high risk. The National Society could also include a map of the most at risk geographical locations. For more guidance on how to select the geographic area of intervention, see the {practitionersManualLink} (Chapter 4.1, Step 3: Who and What is exposed?)",
diff --git a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
index 9caa5357a8..474f92de73 100644
--- a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
@@ -2,7 +2,6 @@ import {
     Container,
     Description,
     Heading,
-    InfoPopup,
     InlineLayout,
     InputSection,
     Label,
@@ -10,7 +9,6 @@ import {
     NumberInput,
     SelectInput,
     TextArea,
-    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
@@ -26,6 +24,7 @@ import {
 } from '@togglecorp/toggle-form';
 
 import Admin2Input from '#components/domain/Admin2Input';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import TabPage from '#components/TabPage';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
@@ -147,24 +146,32 @@ function EarlyAction(props: Props) {
                     <InputSection
                         title={strings.intervention}
                         description={strings.interventionDescription}
-                        tooltip={(
-                            <ListView
-                                layout="block"
-                                spacing="3xs"
-                            >
-                                {strings.interventiontooltipDescription}
-                                <ul>
-                                    <li>
-                                        {strings.interventiontooltipDescriptionListOne}
-                                    </li>
-                                    <li>
-                                        {strings.interventiontooltipDescriptionListTwo}
-                                    </li>
-                                    <li>
-                                        {strings.interventiontooltipDescriptionListThree}
-                                    </li>
-                                </ul>
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.intervention}
+                                ariaLabel={strings.intervention}
+                                title={strings.intervention}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Description>
+                                            {strings.interventionTooltipDescription}
+                                        </Description>
+                                        <Description>
+                                            <ul>
+                                                <li>
+                                                    {strings.interventionTooltipDescription1}
+                                                </li>
+                                                <li>
+                                                    {strings.interventionTooltipDescription2}
+                                                </li>
+                                                <li>
+                                                    {strings.interventionTooltipDescription3}
+                                                </li>
+                                            </ul>
+                                        </Description>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         withAsteriskOnTitle
                     >
@@ -182,21 +189,32 @@ function EarlyAction(props: Props) {
                     <InputSection
                         title={strings.geographicalRiskArea}
                         description={strings.geographicalRiskAreaDescription}
-                        tooltip={(resolveToComponent(
-                            strings.geographicalRiskAreaTooltip,
-                            {
-                                practitionersManualLink: (
-                                    <Link
-                                        href="https://manual.forecast-based-financing.org/en/chapter/set-the-trigger/"
-                                        styleVariant="action"
-                                        external
-                                        withLinkIcon
-                                    >
-                                        {strings.practitionersManualLink}
-                                    </Link>
-                                ),
-                            },
-                        ))}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.geographicalRiskArea}
+                                ariaLabel={strings.geographicalRiskArea}
+                                title={strings.geographicalRiskArea}
+                                content={(
+                                    <Description>
+                                        {resolveToComponent(
+                                            strings.geographicalRiskAreaTooltip,
+                                            {
+                                                practitionersManualLink: (
+                                                    <Link
+                                                        href="https://manual.forecast-based-financing.org/en/chapter/set-the-trigger/"
+                                                        styleVariant="action"
+                                                        external
+                                                        withLinkIcon
+                                                    >
+                                                        {strings.practitionersManualLink}
+                                                    </Link>
+                                                ),
+                                            },
+                                        )}
+                                    </Description>
+                                )}
+                            />
+                        )}
                         withAsteriskOnTitle
                     >
                         {isDefined(eapRegistrationDetail?.country) && (
@@ -223,7 +241,18 @@ function EarlyAction(props: Props) {
                     <InputSection
                         title={strings.actionPeopleTargeted}
                         description={strings.actionPeopleTargetedDescription}
-                        tooltip={strings.actionPeopleTargetedTooltip}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.actionPeopleTargeted}
+                                ariaLabel={strings.actionPeopleTargeted}
+                                title={strings.actionPeopleTargeted}
+                                content={(
+                                    <Description>
+                                        {strings.actionPeopleTargetedTooltip}
+                                    </Description>
+                                )}
+                            />
+                        )}
                         withAsteriskOnTitle
                         numPreferredColumns={2}
                     >
@@ -244,7 +273,18 @@ function EarlyAction(props: Props) {
                         <InputSection
                             title={strings.actionOperation}
                             description={strings.actionOperationDescription}
-                            tooltip={strings.actionOperationTooltip}
+                            headerActions={(
+                                <ExplanatoryNote
+                                    heading={strings.actionOperation}
+                                    ariaLabel={strings.actionOperation}
+                                    title={strings.actionOperation}
+                                    content={(
+                                        <Description>
+                                            {strings.actionOperationTooltip}
+                                        </Description>
+                                    )}
+                                />
+                            )}
                             withAsteriskOnTitle
                             withoutBackground
                         >
@@ -263,8 +303,15 @@ function EarlyAction(props: Props) {
                             description={(
                                 <InlineLayout
                                     after={(
-                                        <InfoPopup
-                                            description={strings.actionCriteriaTooltip}
+                                        <ExplanatoryNote
+                                            heading={strings.actionCriteria}
+                                            ariaLabel={strings.actionCriteria}
+                                            title={strings.actionCriteria}
+                                            content={(
+                                                <Description>
+                                                    {strings.actionCriteriaTooltip}
+                                                </Description>
+                                            )}
                                         />
                                     )}
                                 >
@@ -288,60 +335,71 @@ function EarlyAction(props: Props) {
                     <InputSection
                         title={strings.actionsStatement}
                         description={strings.actionsStatementDescription}
-                        tooltip={(
-                            <ListView
-                                layout="block"
-                                spacing="3xs"
-                            >
-                                {strings.actionsStatementTooltipDescriptionOne}
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.actionsStatementTooltipDescriptionTwo}
-                                    value={strings.actionsStatementTooltipDescriptionThree}
-                                />
-                                <ul>
-                                    <li>
-                                        {strings.actionsStatementTooltipListOne}
-                                    </li>
-                                    <li>
-                                        {strings.actionsStatementTooltipListTwo}
-                                    </li>
-                                    <li>
-                                        {strings.actionsStatementTooltipListThree}
-                                    </li>
-                                    <li>
-                                        {strings.actionsStatementTooltipListFour}
-                                    </li>
-                                </ul>
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.actionsStatementTooltipDescriptionFour}
-                                    value={(
-                                        <ListView
-                                            layout="block"
-                                            spacing="3xs"
-                                        >
-                                            <p>{strings.actionsStatementTooltipDescriptionFive}</p>
-                                            <p>{strings.actionsStatementTooltipDescriptionSix}</p>
-                                            {resolveToComponent(
-                                                strings.actionsStatementTooltipDescriptionSeven,
-                                                {
-                                                    triggerDatabaseLink: (
-                                                        <Link
-                                                            href="https://www.anticipation-hub.org/experience/triggers/trigger-database/trigger-list"
-                                                            styleVariant="action"
-                                                            external
-                                                            withLinkIcon
-                                                        >
-                                                            {strings.triggerDatabaseLink}
-                                                        </Link>
-                                                    ),
-                                                },
-                                            )}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.actionsStatement}
+                                ariaLabel={strings.actionsStatement}
+                                title={strings.actionsStatement}
+                                content={(
+                                    <ListView layout="block">
+                                        <Description>
+                                            {strings.actionsStatementTooltipDescriptionOne}
+                                        </Description>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.actionsStatementTooltipDescriptionTwo}
+                                            </Label>
+                                            <Description>
+                                                {strings.actionsStatementTooltipDescriptionThree}
+                                            </Description>
+                                            <Description>
+                                                <ul>
+                                                    <li>
+                                                        {strings.actionsStatementTooltipListOne}
+                                                    </li>
+                                                    <li>
+                                                        {strings.actionsStatementTooltipListTwo}
+                                                    </li>
+                                                    <li>
+                                                        {strings.actionsStatementTooltipListThree}
+                                                    </li>
+                                                    <li>
+                                                        {strings.actionsStatementTooltipListFour}
+                                                    </li>
+                                                </ul>
+                                            </Description>
                                         </ListView>
-                                    )}
-                                />
-                            </ListView>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.actionsStatementTooltipDescriptionFour}
+                                            </Label>
+                                            <Description>
+                                                {strings.actionsStatementTooltipDescriptionFive}
+                                            </Description>
+                                            <Description>
+                                                {strings.actionsStatementTooltipDescriptionSix}
+                                            </Description>
+                                            <Description>
+                                                {resolveToComponent(
+                                                    strings.actionsStatementTooltipDescriptionSeven,
+                                                    {
+                                                        triggerDatabaseLink: (
+                                                            <Link
+                                                                href="https://www.anticipation-hub.org/experience/triggers/trigger-database/trigger-list"
+                                                                styleVariant="action"
+                                                                external
+                                                                withLinkIcon
+                                                            >
+                                                                {strings.triggerDatabaseLink}
+                                                            </Link>
+                                                        ),
+                                                    },
+                                                )}
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         withAsteriskOnTitle
                     >
@@ -414,18 +472,27 @@ function EarlyAction(props: Props) {
                     <InputSection
                         title={strings.justification}
                         description={strings.justificationDescription}
-                        tooltip={(
-                            <ListView
-                                layout="block"
-                                spacing="3xs"
-                            >
-                                {strings.justificationTooltipDescriptionOne}
-                                <TextOutput
-                                    strongLabel
-                                    label={strings.justificationTooltipDescriptionTwo}
-                                    value={strings.justificationTooltipDescriptionThree}
-                                />
-                            </ListView>
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.justification}
+                                ariaLabel={strings.justification}
+                                title={strings.justification}
+                                content={(
+                                    <ListView layout="block">
+                                        <Description>
+                                            {strings.justificationTooltipDescriptionOne}
+                                        </Description>
+                                        <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                            <Label strong>
+                                                {strings.justificationTooltipDescriptionTwo}
+                                            </Label>
+                                            <Description>
+                                                {strings.justificationTooltipDescriptionThree}
+                                            </Description>
+                                        </ListView>
+                                    </ListView>
+                                )}
+                            />
                         )}
                         withAsteriskOnTitle
                     >
diff --git a/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx b/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
index 528f0924c2..427fdcfc18 100644
--- a/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
@@ -21,6 +21,7 @@ import {
     useFormArray,
 } from '@togglecorp/toggle-form';
 
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
@@ -167,7 +168,18 @@ function EnablingApproaches(props: Props) {
                     <InputSection
                         title={strings.enablingApproachesTitle}
                         description={strings.enablingApproachesDescription}
-                        tooltip={strings.enablingApproachesTooltip}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.enablingApproachesTitle}
+                                ariaLabel={strings.enablingApproachesTitle}
+                                title={strings.enablingApproachesTitle}
+                                content={(
+                                    <Description>
+                                        {strings.enablingApproachesTooltip}
+                                    </Description>
+                                )}
+                            />
+                        )}
                         withAsteriskOnTitle
                     >
                         <NonFieldError error={getErrorObject(error?.enabling_approaches)} />
diff --git a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
index 94f2803f45..a084211926 100644
--- a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
+++ b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
@@ -21,6 +21,7 @@ import {
     useFormArray,
 } from '@togglecorp/toggle-form';
 
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
@@ -165,7 +166,18 @@ function PlannedOperations(props: Props) {
                     <InputSection
                         title={strings.plannedOperationsTitle}
                         description={strings.plannedOperationsDescription}
-                        tooltip={strings.plannedOperationsTooltipDescription}
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.plannedOperationsTitle}
+                                ariaLabel={strings.plannedOperationsTitle}
+                                title={strings.plannedOperationsTitle}
+                                content={(
+                                    <Description>
+                                        {strings.plannedOperationsTooltipDescription}
+                                    </Description>
+                                )}
+                            />
+                        )}
                         withAsteriskOnTitle
                     >
                         <NonFieldError error={getErrorObject(error?.planned_operations)} />
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json b/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
index eb6406f139..1be1374704 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
@@ -18,15 +18,15 @@
         "earlyActionSelection": "Early Action Selection",
         "selectedEarlyAction": "Selected early actions",
         "selectedEarlyActionDescription": "Explain how the early actions were selected and how they will mitigate the prioritized risk and bring about the intended outcome for the most vulnerable, at-risk individuals and communities.",
-        "selectedEarlyActionTooltipDescriptionOne": "The early actions selected by the National Society have to be linked to the hazard’s impact. If ‘loss of key documentation (such as identifications, house deeds, and birth certificates)’ is put forward as one of the prioritized impacts of a flood, then select an early action that will mitigate the risk, e.g,: ‘distribution of dry bags before a flood’. In this section the National Society can explain the connection between the risk they want to mitigate and the early action they plan to implement. This chain of events is also called the ‘theory of change’. For more information on this process, please consult the selection of early actions in {earlyActionsLink}",
+        "selectedEarlyActionDescription1": "The early actions selected by the National Society have to be linked to the hazard’s impact. If ‘loss of key documentation (such as identifications, house deeds, and birth certificates)’ is put forward as one of the prioritized impacts of a flood, then select an early action that will mitigate the risk, e.g,: ‘distribution of dry bags before a flood’. In this section the National Society can explain the connection between the risk they want to mitigate and the early action they plan to implement. This chain of events is also called the ‘theory of change’. For more information on this process, please consult the selection of early actions in {earlyActionsLink}",
         "earlyActionsLink": "the FbF Practitioners Manual.",
-        "selectedEarlyActionTooltipDescriptionTwo": "When deciding on the risk the National Society will prioritize, discuss the following:",
-        "selectedEarlyActionTooltipDescriptionListOne": "Does this risk impact vulnerable people’s lives?",
-        "selectedEarlyActionTooltipDescriptionListTwo": "Is there something we can do to mitigate this risk in the given lead time?",
-        "selectedEarlyActionTooltipDescriptionListThree": "Does this prioritized risk align with the priorities of communities and local actors?",
-        "selectedEarlyActionTooltipDescriptionListFour": "Is it in the National Society mandate to do early actions to mitigate that risk?",
-        "selectedEarlyActionTooltipDescriptionListFive": "Does the National Society have the capacity and systems to conduct early actions within the lead time for the risk they want to prioritize?",
-        "selectedEarlyActionTooltipDescriptionThree": "For example, a major impact of a flood may be the destruction of public infrastructure, such as bridges or roads. However, the National Red Cross, Red Crescent Societies may not have the mandate or the capacity to do early actions for that impact in the short lead time from the forecast to the impact of the hazard.",
+        "selectedEarlyActionDescription2": "When deciding on the risk the National Society will prioritize, discuss the following:",
+        "selectedEarlyActionDescription21": "Does this risk impact vulnerable people’s lives?",
+        "selectedEarlyActionDescription22": "Is there something we can do to mitigate this risk in the given lead time?",
+        "selectedEarlyActionDescription23": "Does this prioritized risk align with the priorities of communities and local actors?",
+        "selectedEarlyActionDescription24": "Is it in the National Society mandate to do early actions to mitigate that risk?",
+        "selectedEarlyActionDescription25": "Does the National Society have the capacity and systems to conduct early actions within the lead time for the risk they want to prioritize?",
+        "selectedEarlyActionDescription3": "For example, a major impact of a flood may be the destruction of public infrastructure, such as bridges or roads. However, the National Red Cross, Red Crescent Societies may not have the mandate or the capacity to do early actions for that impact in the short lead time from the forecast to the impact of the hazard.",
         "earlyActionSectionCriteriaHeading": "Early Actions",
         "riskSectionHeading": "Quality Criteria: Risk Analysis & Early Action Selection",
         "riskSectionCriteriaIntroduction1": "Hazard selection is supported with evidence related to the historical disaster impact.",
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
index da1bea9dea..972611e1de 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
@@ -16,6 +16,7 @@ import {
 } from '@togglecorp/toggle-form';
 
 import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import TabPage from '#components/TabPage';
 
@@ -119,77 +120,83 @@ function RiskAnalysis(props: Props) {
                     <InputSection
                         title={strings.historicalImpact}
                         description={strings.riskDescription}
-                        tooltip={(
-                            <ListView
-                                layout="block"
-                                spacing="3xs"
-                            >
-                                {resolveToComponent(
-                                    strings.riskTooltipDescription,
-                                    {
-                                        drefOperationsLink: (
-                                            <Link
-                                                href="https://www.ifrc.org/appeals"
-                                                styleVariant="action"
-                                                external
-                                                withLinkIcon
-                                            >
-                                                {strings.drefOperationsLink}
-                                            </Link>
-                                        ),
-                                        goPlatformLink: (
-                                            <Link
-                                                href="https://go.ifrc.org/"
-                                                styleVariant="action"
-                                                external
-                                                withLinkIcon
-                                            >
-                                                {strings.goPlatformLink}
-                                            </Link>
-                                        ),
-                                        reliefwebLink: (
-                                            <Link
-                                                href="https://reliefweb.int/countries"
-                                                styleVariant="action"
-                                                external
-                                                withLinkIcon
-                                            >
-                                                {strings.reliefwebLink}
-                                            </Link>
-                                        ),
-                                        desinventarLink: (
-                                            <Link
-                                                href="https://www.desinventar.net/DesInventar/index.jsp"
-                                                styleVariant="action"
-                                                external
-                                                withLinkIcon
-                                            >
-                                                {strings.desinventarLink}
-                                            </Link>
-                                        ),
-                                        eMdATLink: (
-                                            <Link
-                                                href="https://public.emdat.be/"
-                                                styleVariant="action"
-                                                external
-                                                withLinkIcon
-                                            >
-                                                {strings.eMdATLink}
-                                            </Link>
-                                        ),
-                                        idmcLink: (
-                                            <Link
-                                                href="https://www.internal-displacement.org/"
-                                                styleVariant="action"
-                                                external
-                                                withLinkIcon
-                                            >
-                                                {strings.idmcLink}
-                                            </Link>
-                                        ),
-                                    },
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.historicalImpact}
+                                ariaLabel={strings.historicalImpact}
+                                title={strings.historicalImpact}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Description>
+                                            {resolveToComponent(
+                                                strings.riskTooltipDescription,
+                                                {
+                                                    drefOperationsLink: (
+                                                        <Link
+                                                            href="https://www.ifrc.org/appeals"
+                                                            styleVariant="action"
+                                                            external
+                                                            withLinkIcon
+                                                        >
+                                                            {strings.drefOperationsLink}
+                                                        </Link>
+                                                    ),
+                                                    goPlatformLink: (
+                                                        <Link
+                                                            href="https://go.ifrc.org/"
+                                                            styleVariant="action"
+                                                            external
+                                                            withLinkIcon
+                                                        >
+                                                            {strings.goPlatformLink}
+                                                        </Link>
+                                                    ),
+                                                    reliefwebLink: (
+                                                        <Link
+                                                            href="https://reliefweb.int/countries"
+                                                            styleVariant="action"
+                                                            external
+                                                            withLinkIcon
+                                                        >
+                                                            {strings.reliefwebLink}
+                                                        </Link>
+                                                    ),
+                                                    desinventarLink: (
+                                                        <Link
+                                                            href="https://www.desinventar.net/DesInventar/index.jsp"
+                                                            styleVariant="action"
+                                                            external
+                                                            withLinkIcon
+                                                        >
+                                                            {strings.desinventarLink}
+                                                        </Link>
+                                                    ),
+                                                    eMdATLink: (
+                                                        <Link
+                                                            href="https://public.emdat.be/"
+                                                            styleVariant="action"
+                                                            external
+                                                            withLinkIcon
+                                                        >
+                                                            {strings.eMdATLink}
+                                                        </Link>
+                                                    ),
+                                                    idmcLink: (
+                                                        <Link
+                                                            href="https://www.internal-displacement.org/"
+                                                            styleVariant="action"
+                                                            external
+                                                            withLinkIcon
+                                                        >
+                                                            {strings.idmcLink}
+                                                        </Link>
+                                                    ),
+                                                },
+                                            )}
+                                        </Description>
+                                    </ListView>
                                 )}
-                            </ListView>
+                            />
                         )}
                         withAsteriskOnTitle
                     >
@@ -257,46 +264,58 @@ function RiskAnalysis(props: Props) {
                     <InputSection
                         title={strings.selectedEarlyAction}
                         description={strings.selectedEarlyActionDescription}
-                        tooltip={(
-                            <ListView
-                                layout="block"
-                                spacing="3xs"
-                            >
-                                {resolveToComponent(
-                                    strings.selectedEarlyActionTooltipDescriptionOne,
-                                    {
-                                        earlyActionsLink: (
-                                            <Link
-                                                href="https://manual.forecast-based-financing.org/en/chapter/select-early-actions/"
-                                                styleVariant="action"
-                                                external
-                                                withLinkIcon
-                                            >
-                                                {strings.earlyActionsLink}
-                                            </Link>
-                                        ),
-                                    },
+                        headerActions={(
+                            <ExplanatoryNote
+                                heading={strings.selectedEarlyAction}
+                                ariaLabel={strings.selectedEarlyAction}
+                                title={strings.selectedEarlyAction}
+                                content={(
+                                    <ListView spacing="xs" layout="block" withSpacingOpticalCorrection>
+                                        <Description>
+                                            {resolveToComponent(
+                                                strings.selectedEarlyActionDescription1,
+                                                {
+                                                    earlyActionsLink: (
+                                                        <Link
+                                                            href="https://manual.forecast-based-financing.org/en/chapter/select-early-actions/"
+                                                            styleVariant="action"
+                                                            external
+                                                            withLinkIcon
+                                                        >
+                                                            {strings.earlyActionsLink}
+                                                        </Link>
+                                                    ),
+                                                },
+                                            )}
+                                        </Description>
+                                        <Description>
+                                            {strings.selectedEarlyActionDescription2}
+                                        </Description>
+                                        <Description>
+                                            <ul>
+                                                <li>
+                                                    {strings.selectedEarlyActionDescription21}
+                                                </li>
+                                                <li>
+                                                    {strings.selectedEarlyActionDescription22}
+                                                </li>
+                                                <li>
+                                                    {strings.selectedEarlyActionDescription23}
+                                                </li>
+                                                <li>
+                                                    {strings.selectedEarlyActionDescription24}
+                                                </li>
+                                                <li>
+                                                    {strings.selectedEarlyActionDescription25}
+                                                </li>
+                                            </ul>
+                                        </Description>
+                                        <Description>
+                                            {strings.selectedEarlyActionDescription3}
+                                        </Description>
+                                    </ListView>
                                 )}
-                                {strings.selectedEarlyActionTooltipDescriptionTwo}
-                                <ul>
-                                    <li>
-                                        {strings.selectedEarlyActionTooltipDescriptionListOne}
-                                    </li>
-                                    <li>
-                                        {strings.selectedEarlyActionTooltipDescriptionListTwo}
-                                    </li>
-                                    <li>
-                                        {strings.selectedEarlyActionTooltipDescriptionListThree}
-                                    </li>
-                                    <li>
-                                        {strings.selectedEarlyActionTooltipDescriptionListFour}
-                                    </li>
-                                    <li>
-                                        {strings.selectedEarlyActionTooltipDescriptionListFive}
-                                    </li>
-                                </ul>
-                                {strings.selectedEarlyActionTooltipDescriptionThree}
-                            </ListView>
+                            />
                         )}
                         withAsteriskOnTitle
                     >
diff --git a/packages/ui/src/components/InputSection/index.tsx b/packages/ui/src/components/InputSection/index.tsx
index 964e2fc397..963a0b3291 100644
--- a/packages/ui/src/components/InputSection/index.tsx
+++ b/packages/ui/src/components/InputSection/index.tsx
@@ -18,6 +18,7 @@ export interface Props {
     withAsteriskOnTitle?: boolean;
     numPreferredColumns?: NumColumn;
     withShadow?: boolean;
+    headerActions?: React.ReactNode;
 }
 
 function InputSection(props: Props) {
@@ -35,6 +36,7 @@ function InputSection(props: Props) {
         numPreferredColumns = 1,
         withFullWidthContent,
         withShadow,
+        headerActions,
     } = props;
 
     const content = (
@@ -49,7 +51,12 @@ function InputSection(props: Props) {
                             )}
                         </>
                     )}
-                    headerActions={tooltip && <InfoPopup description={tooltip} />}
+                    headerActions={(
+                        <>
+                            {tooltip && <InfoPopup description={tooltip} />}
+                            {headerActions}
+                        </>
+                    )}
                     headingLevel={6}
                 >
                     <Description

From b49f1d438593927147966a2c47bac5836c4e9e06 Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Fri, 3 Apr 2026 14:59:03 +0545
Subject: [PATCH 4/5] feat(go-ui): update type props in DateInput to implement
 month input variant

---
 packages/ui/src/components/DateInput/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/components/DateInput/index.tsx b/packages/ui/src/components/DateInput/index.tsx
index 73666698ce..46317bd2ec 100644
--- a/packages/ui/src/components/DateInput/index.tsx
+++ b/packages/ui/src/components/DateInput/index.tsx
@@ -14,6 +14,7 @@ export interface Props<NAME> extends InheritedProps<NAME> {
     inputClassName?: string;
     withDiffView?: boolean;
     prevValue?: RawInputProps<NAME>['value'];
+    type?: 'date' | 'month';
 }
 
 function DateInput<const T>(props: Props<T>) {
@@ -25,6 +26,7 @@ function DateInput<const T>(props: Props<T>) {
         withDiffView,
         value,
         prevValue,
+        type = 'date',
         ...otherProps
     } = props;
 
@@ -59,7 +61,7 @@ function DateInput<const T>(props: Props<T>) {
                     readOnly={readOnly}
                     disabled={disabled}
                     className={inputClassName}
-                    type="date"
+                    type={type}
                 />
             )}
         />

From 92cb2392fd932f0650bf58b2b4d60d9bd45754b9 Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Fri, 3 Apr 2026 15:00:29 +0545
Subject: [PATCH 5/5] fix(eap): update in whole eap module according feedback

    - add partners field in both eap forms
    - pass type props in every DateInput field
    - remove year option in timeFrame for readiness and prepositioning activities
    - make ap code form fields view only
    - update in translation strings
    - add missing validation for plannedOperations and enablingApproaches form fields
    - add eap apCode options for both forms
    - improve eap table action flow
    - add revise button for creating new version
    - add additional attachments modal in EAP table
    - make lead_timeframe_unit and lead_time field required
    - replace diff library to diff-match-patch
    - new DiffTextOutput components
    - update PrintableDescription and PrintableLabel components
    - add utility function for expected_submission_time field
---
 app/package.json                              |   3 +-
 .../components/domain/Admin2Input/i18n.json   |   8 +
 .../components/domain/Admin2Input/index.tsx   |  35 +-
 .../domain/EapIndicatorInput/index.tsx        |   5 +-
 .../domain/EapIndicatorInput/schema.ts        |   8 +-
 .../domain/EapIndicatorListInput/index.tsx    |   5 +-
 .../EapOperationActivityInput/index.tsx       |  29 +-
 .../EapOperationActivityInput/schema.ts       |   6 +-
 .../EapOperationActivityListInput/index.tsx   |  17 +-
 .../printable/DiffTextOutput/index.tsx        |  91 ++++
 .../styles.module.css                         |   2 +-
 .../printable/PrintableDescription/index.tsx  |  79 +---
 .../printable/PrintableLabel/index.tsx        |  79 +---
 .../PrintableLabel/styles.module.css          |  16 -
 app/src/utils/domain/eap.ts                   |  15 +
 .../EapTableActions/i18n.json                 |  22 +-
 .../EapTableActions/index.tsx                 | 255 +++++++++--
 app/src/views/EapFullExport/index.tsx         |  33 +-
 .../EapActivationProcess/index.tsx            |   2 +-
 .../EapFullForm/FinanceLogistics/i18n.json    |   1 +
 .../EapFullForm/FinanceLogistics/index.tsx    |   2 +
 app/src/views/EapFullForm/Meal/index.tsx      |   2 +-
 .../NationalSocietyCapacity/index.tsx         |   2 +-
 app/src/views/EapFullForm/Overview/i18n.json  |   4 +-
 app/src/views/EapFullForm/Overview/index.tsx  |  31 +-
 .../views/EapFullForm/RiskAnalysis/i18n.json  |  10 +-
 .../views/EapFullForm/RiskAnalysis/index.tsx  |   3 +-
 .../ApproachesInput/index.tsx                 |  29 +-
 .../SelectionActions/OperationInput/index.tsx |  30 +-
 .../EapFullForm/SelectionActions/i18n.json    |   5 +-
 .../EapFullForm/SelectionActions/index.tsx    |  10 +-
 .../views/EapFullForm/TriggerModel/i18n.json  |   3 +-
 .../views/EapFullForm/TriggerModel/index.tsx  |  23 +-
 app/src/views/EapFullForm/common.tsx          |   6 +-
 app/src/views/EapFullForm/i18n.json           |   6 +-
 app/src/views/EapFullForm/index.tsx           |  48 +-
 app/src/views/EapFullForm/schema.ts           |  39 +-
 app/src/views/EapRegistration/index.tsx       |  20 +-
 app/src/views/EapRegistration/schema.ts       |   3 +-
 app/src/views/EapSimplifiedExport/index.tsx   |  32 +-
 .../EapSimplifiedForm/EarlyAction/index.tsx   |   5 +-
 .../ApproachesInput/index.tsx                 |  29 +-
 .../EnablingApproaches/index.tsx              |   5 +
 .../EapSimplifiedForm/Overview/i18n.json      |   2 +
 .../EapSimplifiedForm/Overview/index.tsx      |  17 +-
 .../OperationsInput/index.tsx                 |  30 +-
 .../PlannedOperations/index.tsx               |   6 +
 app/src/views/EapSimplifiedForm/common.tsx    |   6 +-
 app/src/views/EapSimplifiedForm/i18n.json     |   2 +-
 app/src/views/EapSimplifiedForm/index.tsx     |  33 +-
 app/src/views/EapSimplifiedForm/schema.ts     |  37 +-
 app/src/views/EapSummaryExport/index.tsx      | 430 +++++++++---------
 go-api                                        |   2 +-
 pnpm-lock.yaml                                |  25 +-
 54 files changed, 1060 insertions(+), 588 deletions(-)
 create mode 100644 app/src/components/domain/Admin2Input/i18n.json
 create mode 100644 app/src/components/printable/DiffTextOutput/index.tsx
 rename app/src/components/printable/{PrintableDescription => DiffTextOutput}/styles.module.css (95%)
 delete mode 100644 app/src/components/printable/PrintableLabel/styles.module.css
 create mode 100644 app/src/utils/domain/eap.ts

diff --git a/app/package.json b/app/package.json
index ad1cc4220e..be30c223b5 100644
--- a/app/package.json
+++ b/app/package.json
@@ -51,8 +51,9 @@
         "@togglecorp/toggle-request": "^1.0.0-beta.3",
         "@turf/bbox": "^6.5.0",
         "@turf/buffer": "^6.5.0",
+        "@types/diff-match-patch": "^1.0.36",
+        "diff-match-patch": "^1.0.5",
         "exceljs": "^4.4.0",
-        "diff": "^8.0.2",
         "file-saver": "^2.0.5",
         "html-to-image": "^1.11.11",
         "mapbox-gl": "^1.13.0",
diff --git a/app/src/components/domain/Admin2Input/i18n.json b/app/src/components/domain/Admin2Input/i18n.json
new file mode 100644
index 0000000000..813a463a5a
--- /dev/null
+++ b/app/src/components/domain/Admin2Input/i18n.json
@@ -0,0 +1,8 @@
+{
+    "namespace": "admin2Input",
+    "strings": {
+        "heading": "Selected Areas",
+        "buttonLabel": "Select Areas",
+        "emptyMessage": "Admin Level 2 data is not available for this country."
+    }
+}
diff --git a/app/src/components/domain/Admin2Input/index.tsx b/app/src/components/domain/Admin2Input/index.tsx
index 59bcf814db..7af7bc6dd1 100644
--- a/app/src/components/domain/Admin2Input/index.tsx
+++ b/app/src/components/domain/Admin2Input/index.tsx
@@ -13,7 +13,10 @@ import {
     ListView,
     Modal,
 } from '@ifrc-go/ui';
-import { useBooleanState } from '@ifrc-go/ui/hooks';
+import {
+    useBooleanState,
+    useTranslation,
+} from '@ifrc-go/ui/hooks';
 import {
     isDefined,
     isNotDefined,
@@ -53,6 +56,8 @@ import {
 
 import BaseMap from '../BaseMap';
 
+import i18n from './i18n.json';
+
 interface Props<NAME> {
     name: NAME;
     value: number[] | null | undefined;
@@ -72,6 +77,8 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
         readOnly,
     } = props;
 
+    const strings = useTranslation(i18n);
+
     const countryDetails = useCountry({ id: countryId });
     const iso3 = countryDetails?.iso3;
 
@@ -91,6 +98,24 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
         },
     });
 
+    // NOTE: To check if country has admin2 value or not
+    const {
+        response: admin2TestResponse,
+        pending: admin2TestPending,
+    } = useRequest({
+        skip: isNotDefined(iso3),
+        url: '/api/v2/admin2/',
+        query: {
+            admin1__country__iso3: iso3 ?? undefined,
+            // NOTE: we just need 1 value to check
+            limit: 1,
+        },
+    });
+
+    const hasAdmin2 = !admin2TestPending
+        && isDefined(admin2TestResponse)
+        && admin2TestResponse?.results.length > 0;
+
     const { response: admin2Details } = useRequest({
         skip: isNotDefined(selectedCodesDebounced) || selectedCodesDebounced.length === 0,
         url: '/api/v2/admin2/',
@@ -287,20 +312,20 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
     return (
         <ListView layout="block">
             <Container
-                heading="Selected areas"
+                heading={strings.heading}
                 headingLevel={6}
                 footer={(
                     <Button
                         name={undefined}
                         onClick={setShowModalTrue}
-                        disabled={readOnly}
-                        // FIXME: use label from props
+                        disabled={readOnly || !hasAdmin2}
                     >
-                        Select areas
+                        {strings.buttonLabel}
                     </Button>
                 )}
                 withCompactMessage
                 empty={!value || value.length === 0}
+                emptyMessage={!hasAdmin2 ? strings.emptyMessage : undefined}
                 withBorder
                 withPadding
             >
diff --git a/app/src/components/domain/EapIndicatorInput/index.tsx b/app/src/components/domain/EapIndicatorInput/index.tsx
index 857c1a6cb9..5b812cace0 100644
--- a/app/src/components/domain/EapIndicatorInput/index.tsx
+++ b/app/src/components/domain/EapIndicatorInput/index.tsx
@@ -10,6 +10,7 @@ import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
     type ArrayError,
     getErrorObject,
+    type LeafError,
     type PartialForm,
     type SetValueArg,
     useFormObject,
@@ -28,7 +29,7 @@ const defaultIndicatorValue: IndicatorFormFields = {
 
 interface Props {
     value: IndicatorFormFields;
-    error: ArrayError<IndicatorFormFields> | undefined;
+    error: ArrayError<IndicatorFormFields> | LeafError | undefined;
     onChange: (value: SetValueArg<IndicatorFormFields>, index: number) => void;
     onRemove: (index: number) => void;
     index: number;
@@ -52,7 +53,7 @@ function EapIndicatorInput(props: Props) {
     const onFieldChange = useFormObject(index, onChange, defaultIndicatorValue);
 
     const error = value && value.client_id && errorFromProps
-        ? getErrorObject(errorFromProps?.[value.client_id])
+        ? getErrorObject(getErrorObject(errorFromProps)?.[value.client_id])
         : undefined;
 
     return (
diff --git a/app/src/components/domain/EapIndicatorInput/schema.ts b/app/src/components/domain/EapIndicatorInput/schema.ts
index 43bcf4fcac..d502d53249 100644
--- a/app/src/components/domain/EapIndicatorInput/schema.ts
+++ b/app/src/components/domain/EapIndicatorInput/schema.ts
@@ -16,20 +16,20 @@ export type IndicatorFormFields = PartialForm<Indicator> & {
 
 type IndicatorSchema = ObjectSchema<IndicatorFormFields>;
 
-const schema: IndicatorSchema = {
+const schema = (isSubmit: boolean): IndicatorSchema => ({
     fields: (): ReturnType<IndicatorSchema['fields']> => ({
         client_id: {},
         id: { defaultValue: undefinedValue },
         title: {
             // FIXME: add validation for character limit
-            required: true,
+            required: isSubmit,
             requiredValidation: requiredStringCondition,
         },
         target: {
-            required: true,
+            required: isSubmit,
             validations: [positiveNumberCondition],
         },
     }),
-};
+});
 
 export default schema;
diff --git a/app/src/components/domain/EapIndicatorListInput/index.tsx b/app/src/components/domain/EapIndicatorListInput/index.tsx
index a8b4efe4e5..662d07a8eb 100644
--- a/app/src/components/domain/EapIndicatorListInput/index.tsx
+++ b/app/src/components/domain/EapIndicatorListInput/index.tsx
@@ -13,6 +13,7 @@ import {
 import {
     type ArrayError,
     getErrorObject,
+    type LeafError,
     type SetValueArg,
     useFormArray,
 } from '@togglecorp/toggle-form';
@@ -32,7 +33,7 @@ interface Props<NAME> {
     name: NAME,
     value: IndicatorFormFields[] | undefined;
     onChange: (newValue: SetValueArg<IndicatorFormFields[]>, name: NAME) => void;
-    error: ArrayError<IndicatorFormFields> | undefined;
+    error: ArrayError<IndicatorFormFields> | LeafError | undefined;
 }
 
 function EapIndicatorListInput<const NAME extends FormName>(props: Props<NAME>) {
@@ -113,7 +114,7 @@ function EapIndicatorListInput<const NAME extends FormName>(props: Props<NAME>)
                         value={activity}
                         onChange={onReadinessChange}
                         onRemove={onReadinessRemove}
-                        error={getErrorObject(error?.readiness_activities)}
+                        error={getErrorObject(error)?.indicators}
                         disabled={disabled}
                         readOnly={readOnly}
                     />
diff --git a/app/src/components/domain/EapOperationActivityInput/index.tsx b/app/src/components/domain/EapOperationActivityInput/index.tsx
index dc3e04656f..9b6f6da2e2 100644
--- a/app/src/components/domain/EapOperationActivityInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityInput/index.tsx
@@ -1,4 +1,7 @@
-import { useCallback } from 'react';
+import {
+    useCallback,
+    useMemo,
+} from 'react';
 import { DeleteBinTwoLineIcon } from '@ifrc-go/icons';
 import {
     Checklist,
@@ -14,12 +17,14 @@ import {
     type ArrayError,
     getErrorObject,
     getErrorString,
+    type LeafError,
     type SetValueArg,
     useFormObject,
 } from '@togglecorp/toggle-form';
 
 import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
+import { TIMEFRAME_YEAR } from '#utils/constants';
 
 import { type OperationActivityFormFields } from './schema';
 import TimeSpanCheck from './TimeSpanCheck';
@@ -30,6 +35,8 @@ const defaultActivityValue: OperationActivityFormFields = {
     client_id: '-1',
 };
 
+export type ActivityInputType = 'readiness_activities' | 'prepositioning_activities' | 'early_action_activities';
+
 type TimeframeOption = components['schemas']['EapTimeframeEnum'];
 
 function timeframeKeySelector(option: TimeframeOption) {
@@ -42,12 +49,14 @@ const timeValueKeySelector = (
 
 interface Props {
     value: OperationActivityFormFields;
-    error: ArrayError<OperationActivityFormFields> | undefined;
+    error: ArrayError<OperationActivityFormFields> | LeafError | undefined;
     onChange: (value: SetValueArg<OperationActivityFormFields>, index: number) => void;
     onRemove: (index: number) => void;
     index: number;
     disabled?: boolean;
     readOnly?: boolean;
+
+    name: ActivityInputType;
 }
 
 function EapOperationActivityInput(props: Props) {
@@ -59,6 +68,7 @@ function EapOperationActivityInput(props: Props) {
         onRemove,
         disabled,
         readOnly,
+        name,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -73,9 +83,18 @@ function EapOperationActivityInput(props: Props) {
     const onFieldChange = useFormObject(index, onChange, defaultActivityValue);
 
     const error = (value && value.client_id && errorFromProps)
-        ? getErrorObject(errorFromProps?.[value.client_id])
+        ? getErrorObject(getErrorObject(errorFromProps)?.[value.client_id])
         : undefined;
 
+    const eapTimeframeOption = useMemo(() => {
+        if (name === 'early_action_activities') {
+            return eap_timeframe?.filter((item) => item.key !== TIMEFRAME_YEAR);
+        }
+        return eap_timeframe;
+    }, [eap_timeframe, name]);
+
+    const eapTimeFrameReadOnly = name === 'readiness_activities' || name === 'prepositioning_activities';
+
     const getTimeValueOptions = useCallback(
         (timeframe?: number) => {
             switch (timeframe) {
@@ -143,10 +162,10 @@ function EapOperationActivityInput(props: Props) {
                         onChange={handleTimeframeChange}
                         keySelector={timeframeKeySelector}
                         labelSelector={stringValueSelector}
-                        options={eap_timeframe}
+                        options={eapTimeframeOption}
                         disabled={disabled}
                         error={error?.timeframe}
-                        readOnly={readOnly}
+                        readOnly={readOnly || eapTimeFrameReadOnly}
                     />
                     {value?.timeframe && (
                         <Checklist
diff --git a/app/src/components/domain/EapOperationActivityInput/schema.ts b/app/src/components/domain/EapOperationActivityInput/schema.ts
index f812bb46d2..1eb11d29d2 100644
--- a/app/src/components/domain/EapOperationActivityInput/schema.ts
+++ b/app/src/components/domain/EapOperationActivityInput/schema.ts
@@ -15,18 +15,18 @@ export type OperationActivityFormFields = PartialForm<OperationActivity> & {
 
 type OperationActivitySchema = ObjectSchema<OperationActivityFormFields>;
 
-const schema: OperationActivitySchema = {
+const schema = (isSubmit: boolean): OperationActivitySchema => ({
     fields: (): ReturnType<OperationActivitySchema['fields']> => ({
         client_id: {},
         id: { defaultValue: undefinedValue },
         activity: {
             // FIXME: add validation for character limit
-            required: true,
+            required: isSubmit,
             requiredValidation: requiredStringCondition,
         },
         time_value: {},
         timeframe: {},
     }),
-};
+});
 
 export default schema;
diff --git a/app/src/components/domain/EapOperationActivityListInput/index.tsx b/app/src/components/domain/EapOperationActivityListInput/index.tsx
index 493139dc95..0cdd7eb833 100644
--- a/app/src/components/domain/EapOperationActivityListInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityListInput/index.tsx
@@ -18,20 +18,20 @@ import {
 import {
     type ArrayError,
     getErrorObject,
+    type LeafError,
     type SetValueArg,
     useFormArray,
 } from '@togglecorp/toggle-form';
 
-import EapOperationActivityInput from '#components/domain/EapOperationActivityInput';
+import EapOperationActivityInput, { type ActivityInputType } from '#components/domain/EapOperationActivityInput';
 import { type OperationActivityFormFields } from '#components/domain/EapOperationActivityInput/schema';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
+import { TIMEFRAME_YEAR } from '#utils/constants';
 
 import i18n from './i18n.json';
 
-type FormName = 'readiness_activities' | 'prepositioning_activities' | 'early_action_activities';
-
 interface Props<NAME> {
     disabled?: boolean;
     readOnly?: boolean;
@@ -39,10 +39,10 @@ interface Props<NAME> {
     name: NAME,
     value: OperationActivityFormFields[] | undefined;
     onChange: (newValue: SetValueArg<OperationActivityFormFields[]>, name: NAME) => void;
-    error: ArrayError<OperationActivityFormFields> | undefined;
+    error: ArrayError<OperationActivityFormFields> | LeafError | undefined;
 }
 
-function EapOperationActivityListInput<const NAME extends FormName>(props: Props<NAME>) {
+function EapOperationActivityListInput<const NAME extends ActivityInputType>(props: Props<NAME>) {
     const {
         disabled,
         readOnly,
@@ -65,8 +65,12 @@ function EapOperationActivityListInput<const NAME extends FormName>(props: Props
 
     const handleReadinessAddButtonClick = useCallback(
         () => {
+            const timeframeValue = name === 'readiness_activities' || name === 'prepositioning_activities'
+                ? TIMEFRAME_YEAR
+                : undefined;
             const newActionItem: OperationActivityFormFields = {
                 client_id: randomString(),
+                timeframe: timeframeValue,
             };
 
             onChange(
@@ -162,12 +166,13 @@ function EapOperationActivityListInput<const NAME extends FormName>(props: Props
             >
                 {value?.map((activity, i) => (
                     <EapOperationActivityInput
+                        name={name}
                         key={activity.client_id}
                         index={i}
                         value={activity}
                         onChange={onReadinessChange}
                         onRemove={onReadinessRemove}
-                        error={getErrorObject(error?.readiness_activities)}
+                        error={getErrorObject(error)?.[name]}
                         disabled={disabled}
                         readOnly={readOnly}
                     />
diff --git a/app/src/components/printable/DiffTextOutput/index.tsx b/app/src/components/printable/DiffTextOutput/index.tsx
new file mode 100644
index 0000000000..fd5a918947
--- /dev/null
+++ b/app/src/components/printable/DiffTextOutput/index.tsx
@@ -0,0 +1,91 @@
+import {
+    Fragment,
+    useMemo,
+} from 'react';
+import {
+    _cs,
+    isNotDefined,
+} from '@togglecorp/fujs';
+import DiffMatchPatch from 'diff-match-patch';
+
+import styles from './styles.module.css';
+
+const ADDED = 1;
+const REMOVED = -1;
+
+interface Props {
+    value?: string | null;
+    className?: string;
+    withDiff?: boolean;
+    prevValue?: string | null;
+}
+
+function DiffTextOutput(props: Props) {
+    const {
+        className,
+        value,
+        prevValue,
+        withDiff = false,
+    } = props;
+
+    const diff = useMemo(() => {
+        if (!withDiff) {
+            return undefined;
+        }
+        const diffMatch = new DiffMatchPatch();
+        return diffMatch.diff_main(prevValue ?? '', value ?? '');
+    }, [withDiff, value, prevValue]);
+
+    if (isNotDefined(diff)) {
+        return (
+            <div className={_cs(styles.diffTextOutput, className)}>
+                {value}
+            </div>
+        );
+    }
+
+    return (
+        <div
+            className={_cs(
+                styles.diffTextOutput,
+                styles.withDiffView,
+                className,
+            )}
+        >
+            {diff.map(([changeType, content], index) => {
+                if (changeType === ADDED) {
+                    return (
+                        <span
+                            className={styles.added}
+                            // eslint-disable-next-line react/no-array-index-key
+                            key={index}
+                        >
+                            {content}
+                        </span>
+                    );
+                }
+
+                if (changeType === REMOVED) {
+                    return (
+                        <span
+                            className={styles.removed}
+                            // eslint-disable-next-line react/no-array-index-key
+                            key={index}
+                        >
+                            {content}
+                        </span>
+                    );
+                }
+
+                return (
+                    // eslint-disable-next-line react/no-array-index-key
+                    <Fragment key={index}>
+                        {content}
+                    </Fragment>
+                );
+            })}
+        </div>
+    );
+}
+
+export default DiffTextOutput;
diff --git a/app/src/components/printable/PrintableDescription/styles.module.css b/app/src/components/printable/DiffTextOutput/styles.module.css
similarity index 95%
rename from app/src/components/printable/PrintableDescription/styles.module.css
rename to app/src/components/printable/DiffTextOutput/styles.module.css
index a52f405f09..7e9b59945e 100644
--- a/app/src/components/printable/PrintableDescription/styles.module.css
+++ b/app/src/components/printable/DiffTextOutput/styles.module.css
@@ -1,4 +1,4 @@
-.printable-description {
+.diff-text-output {
     text-align: justify;
     white-space: pre-wrap;
     overflow-wrap: break-word;
diff --git a/app/src/components/printable/PrintableDescription/index.tsx b/app/src/components/printable/PrintableDescription/index.tsx
index 230ebaefd8..25a1f86c67 100644
--- a/app/src/components/printable/PrintableDescription/index.tsx
+++ b/app/src/components/printable/PrintableDescription/index.tsx
@@ -1,89 +1,24 @@
-import {
-    Fragment,
-    useMemo,
-} from 'react';
-import {
-    _cs,
-    isNotDefined,
-} from '@togglecorp/fujs';
-import { diffSentences } from 'diff';
-
-import styles from './styles.module.css';
+import DiffTextOutput from '../DiffTextOutput';
 
 interface Props {
     value?: string | null;
-    className?: string;
     withDiff?: boolean;
     prevValue?: string | null;
 }
 
 function PrintableDescription(props: Props) {
     const {
-        className,
         value,
         prevValue,
-        withDiff = false,
+        withDiff,
     } = props;
 
-    const diff = useMemo(() => {
-        if (!withDiff) {
-            return undefined;
-        }
-
-        return diffSentences(prevValue ?? '', value ?? '');
-    }, [withDiff, value, prevValue]);
-
-    if (isNotDefined(diff)) {
-        return (
-            <div className={_cs(styles.printableDescription, className)}>
-                {value}
-            </div>
-        );
-    }
-
     return (
-        <div
-            className={_cs(
-                styles.printableDescription,
-                styles.withDiffView,
-                className,
-            )}
-        >
-            {diff.map((part, index) => {
-                const { added, removed, value: partValue } = part;
-
-                if (added) {
-                    return (
-                        <span
-                            className={styles.added}
-                            // eslint-disable-next-line react/no-array-index-key
-                            key={index}
-                        >
-                            {partValue}
-                        </span>
-                    );
-                }
-
-                if (removed) {
-                    return (
-                        <span
-                            className={styles.removed}
-                            // eslint-disable-next-line react/no-array-index-key
-                            key={index}
-                        >
-                            {partValue}
-                        </span>
-                    );
-                }
-
-                return (
-                    // eslint-disable-next-line react/no-array-index-key
-                    <Fragment key={index}>
-                        {partValue}
-                    </Fragment>
-                );
-            })}
-        </div>
+        <DiffTextOutput
+            value={value}
+            prevValue={prevValue}
+            withDiff={withDiff}
+        />
     );
 }
 
diff --git a/app/src/components/printable/PrintableLabel/index.tsx b/app/src/components/printable/PrintableLabel/index.tsx
index 9917ac5ce7..d0f83a0a42 100644
--- a/app/src/components/printable/PrintableLabel/index.tsx
+++ b/app/src/components/printable/PrintableLabel/index.tsx
@@ -1,89 +1,24 @@
-import {
-    Fragment,
-    useMemo,
-} from 'react';
-import {
-    _cs,
-    isNotDefined,
-} from '@togglecorp/fujs';
-import { diffWordsWithSpace } from 'diff';
-
-import styles from './styles.module.css';
+import DiffTextOutput from '../DiffTextOutput';
 
 interface Props {
     value?: string | null;
-    className?: string;
     withDiff?: boolean;
     prevValue?: string | null;
 }
 
 function PrintableLabel(props: Props) {
     const {
-        className,
         value,
         prevValue,
-        withDiff = false,
+        withDiff,
     } = props;
 
-    const diff = useMemo(() => {
-        if (!withDiff) {
-            return undefined;
-        }
-
-        return diffWordsWithSpace(prevValue ?? '', value ?? '');
-    }, [withDiff, value, prevValue]);
-
-    if (isNotDefined(diff)) {
-        return (
-            <div className={_cs(styles.printableLabel, className)}>
-                {value}
-            </div>
-        );
-    }
-
     return (
-        <div
-            className={_cs(
-                styles.printableLabel,
-                styles.withDiffView,
-                className,
-            )}
-        >
-            {diff.map((part, index) => {
-                const { added, removed, value: partValue } = part;
-
-                if (added) {
-                    return (
-                        <span
-                            className={styles.added}
-                            // eslint-disable-next-line react/no-array-index-key
-                            key={index}
-                        >
-                            {partValue}
-                        </span>
-                    );
-                }
-
-                if (removed) {
-                    return (
-                        <span
-                            className={styles.removed}
-                            // eslint-disable-next-line react/no-array-index-key
-                            key={index}
-                        >
-                            {partValue}
-                        </span>
-                    );
-                }
-
-                return (
-                    // eslint-disable-next-line react/no-array-index-key
-                    <Fragment key={index}>
-                        {partValue}
-                    </Fragment>
-                );
-            })}
-        </div>
+        <DiffTextOutput
+            value={value}
+            prevValue={prevValue}
+            withDiff={withDiff}
+        />
     );
 }
 
diff --git a/app/src/components/printable/PrintableLabel/styles.module.css b/app/src/components/printable/PrintableLabel/styles.module.css
deleted file mode 100644
index 62c8ca20aa..0000000000
--- a/app/src/components/printable/PrintableLabel/styles.module.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.printable-label{
-    overflow-wrap: break-word;
-
-    &.with-diff-view {
-        .added {
-            background-color: color-mix(in srgb, var(--go-ui-color-green) 10%, transparent);
-            color: var(--go-ui-color-green);
-        }
-
-        .removed {
-            background-color: color-mix(in srgb, var(--go-ui-color-red) 10%, transparent);
-            text-decoration: line-through;
-            color: var(--go-ui-color-red);
-        }
-    }
-}
diff --git a/app/src/utils/domain/eap.ts b/app/src/utils/domain/eap.ts
new file mode 100644
index 0000000000..32ec7d334f
--- /dev/null
+++ b/app/src/utils/domain/eap.ts
@@ -0,0 +1,15 @@
+import { isNotDefined } from '@togglecorp/fujs';
+
+export function getFullDateFromYearMonth(val: string | undefined) {
+    if (isNotDefined(val)) {
+        return undefined;
+    }
+    return `${val}-01`;
+}
+
+export function getYearMonthFromFullDate(val: string | undefined) {
+    if (isNotDefined(val)) {
+        return undefined;
+    }
+    return val?.slice(0, 7);
+}
diff --git a/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json b/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json
index 5af45f3e42..1e4f9f11b6 100644
--- a/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json
+++ b/app/src/views/AccountMyFormsEap/EapTableActions/i18n.json
@@ -5,15 +5,25 @@
         "startSimplifiedEapLinkLabel": "Start sEAP",
         "editFullEapLinkLabel": "Edit Full EAP",
         "viewFullEapLinkLabel": "View Full EAP",
-        "exportWithChangesButtonLabel": "Export with track changes",
+        "exportWithChangesButtonLabel": "Export v{version} PDF (with track changes)",
         "exportButtonLabel": "Export",
         "exportSummaryButtonLabel": "Export Summary",
-        "previewExportLinkLabel": "Preview export",
-        "previewSummaryExportLinkLabel": "Preview summary export",
-        "downloadReviewChecklistLinkLabel": "Download Review checklist",
-        "downloadUpdatedChecklistLinkLabel": "Download updated checklist",
+        "previewExportLinkLabel": "Preview Export",
+        "previewSummaryExportLinkLabel": "Preview Summary Export",
+        "downloadReviewChecklistLinkLabel": "Review Checklist v{version} (with IFRC comments)",
+        "downloadUpdatedChecklistLinkLabel": "Review Checklist v{version} (with NS comments)",
+        "downloadBudgetFileLabel": "Budget v{version}",
         "editSimplifiedEapLinkLabel": "Edit sEAP",
         "viewSimplifiedEapLinkLabel": "View sEAP",
-        "downloadValidatedBudgetLinkLabel": "Download validated budget"
+        "reviseEapLabel": "Revise EAP",
+        "reviseEapMessage": "Revising this EAP will create a new version. You can make any necessary changes in the new version.",
+        "downloadValidatedBudgetLinkLabel": "Download Validated Budget",
+        "additionalFilesButtonLabel": "Additional Attachments",
+        "theoryOfChangeTableLinkLabel": "Theory of Change Table",
+        "fullReviseSuccessAlert": "Full EAP revised successfully",
+        "fullReviseFailedAlert": "Full EAP revision failed",
+        "simplifiedReviseSuccessAlert": "Simplified EAP revised successfully",
+        "simplifiedReviseFailedAlert": "Simplified EAP revision failed",
+        "forecastTableLinkLabel": "Forecast Table"
     }
 }
diff --git a/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx b/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
index 0839c6aa1e..811af6c20f 100644
--- a/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
+++ b/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
@@ -9,9 +9,15 @@ import {
 } from '@ifrc-go/icons';
 import {
     Button,
+    ConfirmButton,
     ListView,
+    Modal,
 } from '@ifrc-go/ui';
-import { useTranslation } from '@ifrc-go/ui/hooks';
+import {
+    useBooleanState,
+    useTranslation,
+} from '@ifrc-go/ui/hooks';
+import { resolveToString } from '@ifrc-go/ui/utils';
 import {
     isDefined,
     isNotDefined,
@@ -20,6 +26,8 @@ import {
 import EapExportModal from '#components/domain/EapExportModal';
 import Link from '#components/Link';
 import { environment } from '#config';
+import useAlert from '#hooks/useAlert';
+import useRouting from '#hooks/useRouting';
 import {
     EAP_STATUS_NS_ADDRESSING_COMMENTS,
     EAP_STATUS_PENDING_PFA,
@@ -28,6 +36,7 @@ import {
     EAP_TYPE_FULL,
     EAP_TYPE_SIMPLIFIED,
 } from '#utils/constants';
+import { useLazyRequest } from '#utils/restRequest';
 
 import { type EapExpandedListItem } from '../utils';
 import BudgetFileInput from './BudgetFileInput';
@@ -54,6 +63,16 @@ function EapTableActions(props: Props) {
     const [exportWithDiffView, setExportWithDiffView] = useState(false);
     const [summaryExport, setSummaryExport] = useState(false);
     const [showExportModal, setShowExportModal] = useState(false);
+    const [
+        showAdditionalFileModal,
+        {
+            setTrue: setShowAdditionalFileModalTrue,
+            setFalse: setShowAdditionalFileModalFalse,
+        },
+    ] = useBooleanState(false);
+
+    const alert = useAlert();
+    const { navigate } = useRouting();
 
     const strings = useTranslation(i18n);
 
@@ -83,6 +102,85 @@ function EapTableActions(props: Props) {
         return undefined;
     }, [eap]);
 
+    const {
+        trigger: reviseSEAP,
+        pending: reviseSEAPPending,
+    } = useLazyRequest({
+        method: 'POST',
+        url: '/api/v2/simplified-eap/{id}/revise/',
+        pathVariables: isDefined(latestId) ? { id: latestId } : undefined,
+        body: () => ({} as never),
+        onSuccess: () => {
+            alert.show(
+                strings.simplifiedReviseSuccessAlert,
+                { variant: 'success' },
+            );
+            navigate(
+                'simplifiedEapForm',
+                { params: { eapId: eap.id } },
+            );
+        },
+        onFailure: ({
+            value: { messageForNotification },
+        }) => {
+            alert.show(
+                strings.simplifiedReviseFailedAlert,
+                {
+                    description: messageForNotification,
+                    variant: 'danger',
+                },
+            );
+        },
+    });
+
+    const {
+        trigger: reviseFullEAP,
+        pending: reviseFullEAPPending,
+    } = useLazyRequest({
+        method: 'POST',
+        url: '/api/v2/full-eap/{id}/revise/',
+        pathVariables: isDefined(latestId) ? { id: latestId } : undefined,
+        body: () => ({} as never),
+        onSuccess: () => {
+            alert.show(
+                strings.fullReviseSuccessAlert,
+                { variant: 'success' },
+            );
+            navigate(
+                'fullEapForm',
+                { params: { eapId: eap.id } },
+            );
+        },
+        onFailure: ({
+            value: { messageForNotification },
+        }) => {
+            alert.show(
+                strings.fullReviseFailedAlert,
+                {
+                    description: messageForNotification,
+                    variant: 'danger',
+                },
+            );
+        },
+    });
+
+    const handleReviseClick = useCallback(
+        () => {
+            if (eap.eap_type === EAP_TYPE_SIMPLIFIED) {
+                reviseSEAP(null);
+            }
+
+            if (eap.eap_type === EAP_TYPE_FULL) {
+                reviseFullEAP(null);
+            }
+        },
+        [
+            eap.eap_type,
+            reviseSEAP,
+            reviseFullEAP,
+        ],
+    );
+
     const latestVersion = useMemo(() => {
         if (eap.eap_type === EAP_TYPE_SIMPLIFIED) {
             return eap.simplified_eap_details.find(({ id }) => latestId === id)?.version;
@@ -120,14 +218,26 @@ function EapTableActions(props: Props) {
         }
 
         if (eap.status !== EAP_STATUS_UNDER_DEVELOPMENT
-            && eap.status !== EAP_STATUS_NS_ADDRESSING_COMMENTS
-        ) {
+            && eap.status !== EAP_STATUS_NS_ADDRESSING_COMMENTS) {
             return false;
         }
 
         return true;
     }, [isCreated, isLatestVersion, isLocked, eap]);
 
+    const isRevised = useMemo(() => {
+        if (!isLatestVersion) {
+            return false;
+        }
+        if (!isLocked) {
+            return false;
+        }
+        if (eap.status !== EAP_STATUS_NS_ADDRESSING_COMMENTS) {
+            return false;
+        }
+        return true;
+    }, [eap, isLocked, isLatestVersion]);
+
     return (
         <ListView layout="block">
             {type === 'registration' && isNotDefined(eap.eap_type) && isNotDefined(details) && (
@@ -178,16 +288,21 @@ function EapTableActions(props: Props) {
                             {strings.previewExportLinkLabel}
                         </Link>
                     )}
-                    {isCreated && (
-                        <Button
-                            name={false}
-                            onClick={setShowExportModalTrue}
-                            before={<DownloadTwoLineIcon />}
-                            styleVariant="action"
-                        >
-                            {strings.exportButtonLabel}
-                        </Button>
-                    )}
+                    {details?.eapType === EAP_TYPE_FULL
+                        && (isDefined(details?.data.theory_of_change_table_file_details)
+                        && isDefined(details?.data.forecast_table_file_details))
+                        && (
+                            <Button
+                                name={undefined}
+                                onClick={setShowAdditionalFileModalTrue}
+                                colorVariant="text"
+                                styleVariant="transparent"
+                                before={<DownloadTwoLineIcon />}
+                                withoutPadding
+                            >
+                                {strings.additionalFilesButtonLabel}
+                            </Button>
+                        )}
                     {isDefined(details?.data.version)
                         && details.data.version > 1
                         && (
@@ -197,7 +312,12 @@ function EapTableActions(props: Props) {
                                 before={<DownloadTwoLineIcon />}
                                 styleVariant="action"
                             >
-                                {strings.exportWithChangesButtonLabel}
+                                {resolveToString(
+                                    strings.exportWithChangesButtonLabel,
+                                    {
+                                        version: details.data.version,
+                                    },
+                                )}
                             </Button>
                         )}
                     {isDefined(details?.data?.review_checklist_file) && (
@@ -206,18 +326,54 @@ function EapTableActions(props: Props) {
                             href={details.data.review_checklist_file}
                             before={<DownloadTwoLineIcon />}
                         >
-                            {strings.downloadReviewChecklistLinkLabel}
+                            {resolveToString(
+                                strings.downloadReviewChecklistLinkLabel,
+                                {
+                                    version: details.data.version,
+                                },
+                            )}
                         </Link>
                     )}
-                    {isDefined(details?.data?.updated_checklist_file_details?.file) && (
+                    {isDefined(details?.data?.updated_checklist_file_details?.file)
+                        && isDefined(details.data.version) && (
                         <Link
                             external
                             href={details.data.updated_checklist_file_details.file}
                             before={<DownloadTwoLineIcon />}
                         >
-                            {strings.downloadUpdatedChecklistLinkLabel}
+                            {resolveToString(
+                                strings.downloadUpdatedChecklistLinkLabel,
+                                {
+                                    version: details.data.version - 1,
+                                },
+                            )}
+                        </Link>
+                    )}
+                    {isDefined(details?.data.budget_file_details) && (
+                        <Link
+                            external
+                            href={details?.data.budget_file_details.file}
+                            before={<DownloadTwoLineIcon />}
+                        >
+                            {resolveToString(
+                                strings.downloadBudgetFileLabel,
+                                {
+                                    version: details.data.version,
+                                },
+                            )}
                         </Link>
                     )}
+                    {isRevised && (
+                        <ConfirmButton
+                            name={undefined}
+                            confirmMessage={strings.reviseEapMessage}
+                            confirmHeading={strings.reviseEapLabel}
+                            onConfirm={handleReviseClick}
+                            disabled={reviseFullEAPPending || reviseSEAPPending}
+                        >
+                            {strings.reviseEapLabel}
+                        </ConfirmButton>
+                    )}
                     {eap.eap_type === EAP_TYPE_SIMPLIFIED && isEditable && (
                         <Link
                             to="simplifiedEapForm"
@@ -283,30 +439,42 @@ function EapTableActions(props: Props) {
                     )}
                 </>
             )}
-            {type === 'pending-pfa' && eap.status >= EAP_STATUS_PENDING_PFA && eap.eap_type === EAP_TYPE_FULL && (
+            {type === 'pending-pfa' && eap.status >= EAP_STATUS_PENDING_PFA && (
                 <ListView
                     layout="block"
                     spacing="sm"
                 >
-                    <Link
-                        to="eapSummaryExport"
-                        urlParams={{ eapId: eap.id }}
-                        urlSearch={isDefined(latestVersion)
-                            ? `version=${latestVersion}`
-                            : undefined}
-                        title={strings.previewExportLinkLabel}
-                        before={<DocumentPdfLineIcon fontSize={18} />}
-                    >
-                        {strings.previewSummaryExportLinkLabel}
-                    </Link>
                     <Button
                         name={false}
                         onClick={setShowExportModalTrue}
                         before={<DownloadTwoLineIcon />}
                         styleVariant="action"
                     >
-                        {strings.exportSummaryButtonLabel}
+                        {strings.exportButtonLabel}
                     </Button>
+                    {eap.eap_type === EAP_TYPE_FULL && (
+                        <>
+                            <Link
+                                to="eapSummaryExport"
+                                urlParams={{ eapId: eap.id }}
+                                urlSearch={isDefined(latestVersion)
+                                    ? `version=${latestVersion}`
+                                    : undefined}
+                                title={strings.previewExportLinkLabel}
+                                before={<DocumentPdfLineIcon fontSize={18} />}
+                            >
+                                {strings.previewSummaryExportLinkLabel}
+                            </Link>
+                            <Button
+                                name={false}
+                                onClick={setShowExportModalTrue}
+                                before={<DownloadTwoLineIcon />}
+                                styleVariant="action"
+                            >
+                                {strings.exportSummaryButtonLabel}
+                            </Button>
+                        </>
+                    )}
                 </ListView>
             )}
             {showExportModal && isDefined(eap.eap_type) && (
@@ -321,6 +489,33 @@ function EapTableActions(props: Props) {
                     summary={summaryExport}
                 />
             )}
+            {showAdditionalFileModal && details?.eapType === EAP_TYPE_FULL && (
+                <Modal
+                    heading={strings.additionalFilesButtonLabel}
+                    onClose={setShowAdditionalFileModalFalse}
+                >
+                    <ListView layout="block">
+                        {isDefined(details?.data.theory_of_change_table_file_details) && (
+                            <Link
+                                external
+                                href={details?.data.theory_of_change_table_file_details.file}
+                                before={<DownloadTwoLineIcon />}
+                            >
+                                {strings.theoryOfChangeTableLinkLabel}
+                            </Link>
+                        )}
+                        {isDefined(details?.data.forecast_table_file_details) && (
+                            <Link
+                                external
+                                href={details?.data.forecast_table_file_details.file}
+                                before={<DownloadTwoLineIcon />}
+                            >
+                                {strings.forecastTableLinkLabel}
+                            </Link>
+                        )}
+                    </ListView>
+                </Modal>
+            )}
         </ListView>
     );
 }
diff --git a/app/src/views/EapFullExport/index.tsx b/app/src/views/EapFullExport/index.tsx
index b330b61a4a..7355490d71 100644
--- a/app/src/views/EapFullExport/index.tsx
+++ b/app/src/views/EapFullExport/index.tsx
@@ -96,6 +96,10 @@ export function Component() {
             : undefined,
     });
 
+    const { response: apCodeOptions } = useRequest({
+        url: '/api/v2/eap/options/',
+    });
+
     const { eap_sector, eap_approach } = useGlobalEnums();
 
     const eapSectorTitleMap = listToMap(
@@ -1257,6 +1261,12 @@ export function Component() {
                 {planned_operations?.map((operation) => {
                     const prevOperation = prevPlannedOperationsMapping?.[operation.sector];
 
+                    const apCodeSectorValue = apCodeOptions?.sector_ap_codes
+                        ?.[operation.sector]?.join(', ');
+
+                    const prevApCodeSectorValue = apCodeOptions?.sector_ap_codes
+                        ?.[prevOperation?.sector]?.join(', ');
+
                     const prevOperationIndicatorMap = listToMap(
                         prevOperation?.indicators,
                         ({ id }) => id!,
@@ -1304,11 +1314,10 @@ export function Component() {
                                         withDiff={withDiff}
                                     />
                                     <PrintableDataDisplay
-                                        // FIXME: use strings
-                                        label="AP Code"
-                                        value={operation.ap_code}
-                                        prevValue={prevOperation?.ap_code}
-                                        valueType="number"
+                                        label={strings.apCodeLabel}
+                                        value={apCodeSectorValue}
+                                        prevValue={prevApCodeSectorValue}
+                                        valueType="text"
                                         strongLabel
                                         withDiff={withDiff}
                                     />
@@ -1430,6 +1439,14 @@ export function Component() {
                 {enabling_approaches?.map((approach) => {
                     const prevApproach = prevEnableApproachesMapping?.[approach.approach];
 
+                    const apCodeApproachValue = apCodeOptions?.approach_ap_codes
+                        ?.[approach.approach]?.join(', ');
+
+                    const prevApCodeApproachValue = isDefined(prevApproach)
+                        ? apCodeOptions?.approach_ap_codes
+                            ?.[prevApproach.approach]?.join(', ')
+                        : '-';
+
                     const prevApproachIndicatorMap = listToMap(
                         prevApproach?.indicators,
                         ({ id }) => id!,
@@ -1470,9 +1487,9 @@ export function Component() {
                                     />
                                     <PrintableDataDisplay
                                         label={strings.apCodeLabel}
-                                        value={approach.ap_code}
-                                        prevValue={prevApproach?.ap_code}
-                                        valueType="number"
+                                        value={apCodeApproachValue}
+                                        prevValue={prevApCodeApproachValue}
+                                        valueType="text"
                                         strongLabel
                                         withDiff={withDiff}
                                     />
diff --git a/app/src/views/EapFullForm/EapActivationProcess/index.tsx b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
index 7e02ffba95..66677083ea 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/index.tsx
+++ b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
@@ -425,7 +425,7 @@ function EapActivationProcess(props: Props) {
                     >
                         <GoMultiFileInput
                             name="activation_process_relevant_files"
-                            accept=".pdf, .docx, .pptx"
+                            accept=".pdf, .docx, .pptx, image/*"
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/FinanceLogistics/i18n.json b/app/src/views/EapFullForm/FinanceLogistics/i18n.json
index 4aa6da8846..bfb8159d3d 100644
--- a/app/src/views/EapFullForm/FinanceLogistics/i18n.json
+++ b/app/src/views/EapFullForm/FinanceLogistics/i18n.json
@@ -13,6 +13,7 @@
         "financeRequiredPointsLabel": "Required Points",
         "financeExplanatoryNote": "The EAP budget consists of all the costs linked to the activation of the EAP as well as readiness and pre-positioning costs. The budget cannot include costs for the development of the EAP and the setting up of the FbF system in a country (e.g. initial trainings of volunteers, etc.). This process should be financed by other sources of longer-term funding. The maximum amount of funding available for each EAP from the DREF is 500,000 Swiss francs. The budget will have to include the IFRC indirect costs of 6,5%. The National Society may include administrative costs as well in the EAP which should not be more than 5% of the early action budget. If the 5% rate is not used the National Society will need to list out the each of the admin cost individually. The M&E budget should be maximum 5% of overall the budget.",
         "financeUploadButtonLabel": "Upload",
+        "financeBudgetDetails": "Budget details",
         "financeDownloadDescription": "Download full budget template",
         "financeUploadBudgetLabel": "Upload Budget",
         "financeReadinessCostTitle": "Readiness Cost",
diff --git a/app/src/views/EapFullForm/FinanceLogistics/index.tsx b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
index fc4e7d39af..7aad93333a 100644
--- a/app/src/views/EapFullForm/FinanceLogistics/index.tsx
+++ b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
@@ -195,11 +195,13 @@ function FinanceLogistics(props: Props) {
                         />
                     </InputSection>
                     <InputSection
+                        title={strings.financeBudgetDetails}
                         description={(
                             <Link external href={templateUrl?.url} withUnderline withLinkIcon>
                                 {strings.financeDownloadDescription}
                             </Link>
                         )}
+                        withAsteriskOnTitle
                     >
                         <GoSingleFileInput
                             name="budget_file"
diff --git a/app/src/views/EapFullForm/Meal/index.tsx b/app/src/views/EapFullForm/Meal/index.tsx
index 09ac37092c..254149d12d 100644
--- a/app/src/views/EapFullForm/Meal/index.tsx
+++ b/app/src/views/EapFullForm/Meal/index.tsx
@@ -182,7 +182,7 @@ function Meal(props: Props) {
                     >
                         <GoMultiFileInput
                             name="meal_relevant_files"
-                            accept=".pdf, .docx, .pptx"
+                            accept=".pdf, .docx, .pptx, image/*"
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
index 589c7eacb5..632c1ae1ae 100644
--- a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
+++ b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
@@ -213,7 +213,7 @@ function NationalSocietyCapacity(props: Props) {
                     >
                         <GoMultiFileInput
                             name="capacity_relevant_files"
-                            accept=".pdf, .docx, .pptx"
+                            accept=".pdf, .docx, .pptx, image/*"
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/Overview/i18n.json b/app/src/views/EapFullForm/Overview/i18n.json
index 1d317ad8ae..7e4b295c0b 100644
--- a/app/src/views/EapFullForm/Overview/i18n.json
+++ b/app/src/views/EapFullForm/Overview/i18n.json
@@ -15,6 +15,8 @@
         "formExpectedSubmissionTimeDescription": "Include the propose time of submission, accounting for the time it will take to deliver the application.",
         "objectiveTitle": "Objective",
         "objectiveDescription": "Please provide an objective statement that describes the main goal of the intervention.",
+        "partnersInvolved": "Partners Involved",
+        "partnersInvolvedDescription": "Select from the list the partners involved in this process. Add as many as needed or select not applicable if no partners involved.",
         "formContacts": "Contacts",
         "nationalHeader": "National",
         "delegationHeader": "Delegation",
@@ -43,7 +45,7 @@
         "workExplanatoryNote": "In order to avoid creating parallel systems and to minimize additional discussions on permissions, etc. when a trigger occurs, all relevant key stakeholders in the country should be involved in the development, and when necessary, the approval, of the EAP. If stakeholders other than the National Society are involved in implementation of the EAP, roles and responsibilities should be determined in MoUs or other appropriate documents. It is key to highlight the importance of involving the IFRC at the country, cluster and/ or regional level early in the EAP development process as these offices can provide technical support.",
         "actorsExplanatoryNote": "In order to avoid creating parallel systems and to minimize additional discussions on permissions, etc. when a trigger occurs, all relevant key stakeholders in the country should be involved in the development, and when necessary, the approval, of the EAP. If stakeholders other than the National Society are involved in implementation of the EAP, roles and responsibilities should be determined in MoUs or other appropriate documents. It is key to highlight the importance of involving the IFRC at the country, cluster and/ or regional level early in the EAP development process as these offices can provide technical support. ",
         "workWithGovernmentDescriptionLabel": "Description",
-        "keyActorsTitle": "Key actors",
+        "keyActorsTitle": "Key Actors",
         "keyActorsDescription": "Name the external actors and Movement components that have been involved in the development of this EAP. Include international, national, regional and local actors, if applicable.",
         "keyActorsDescription2": "Use the \"{addNewActorButtonLabel}\" button to list all the actors involved and explain their role.",
         "technicalWorkingGroupsTitle": "Technical working groups in place?",
diff --git a/app/src/views/EapFullForm/Overview/index.tsx b/app/src/views/EapFullForm/Overview/index.tsx
index dfd9d842bf..a88064213a 100644
--- a/app/src/views/EapFullForm/Overview/index.tsx
+++ b/app/src/views/EapFullForm/Overview/index.tsx
@@ -19,6 +19,7 @@ import {
     type EntriesAsList,
     type Error,
     getErrorObject,
+    getErrorString,
     useFormArray,
 } from '@togglecorp/toggle-form';
 
@@ -26,10 +27,15 @@ import ContactInputsSection from '#components/domain/ContactInputsSection';
 import CountrySelectInput from '#components/domain/CountrySelectInput';
 import DisasterTypeSelectInput from '#components/domain/DisasterTypeSelectInput';
 import ImageWithCaptionInput from '#components/domain/ImageWithCaptionInput';
+import NationalSocietyMultiSelectInput from '#components/domain/NationalSocietyMultiSelectInput';
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
+import {
+    getFullDateFromYearMonth,
+    getYearMonthFromFullDate,
+} from '#utils/domain/eap';
 import { type GoApiResponse } from '#utils/restRequest';
 
 import { charLimits } from '../common';
@@ -100,6 +106,13 @@ function Overview(props: Props) {
         );
     }, [setFieldValue]);
 
+    const onExpectedSubmissionTimeChange = useCallback((val: string | undefined) => {
+        if (!val) {
+            return;
+        }
+        setFieldValue(getFullDateFromYearMonth(val), 'expected_submission_time');
+    }, [setFieldValue]);
+
     const { setValue: onKeyActorsChange, removeValue: onKeyActorsRemove } = useFormArray<'key_actors', KeyActorsFormFields>(
         'key_actors',
         setFieldValue,
@@ -214,11 +227,12 @@ function Overview(props: Props) {
                     >
                         <DateInput
                             name="expected_submission_time"
-                            value={value?.expected_submission_time}
+                            value={getYearMonthFromFullDate(value?.expected_submission_time)}
                             error={error?.expected_submission_time}
-                            onChange={setFieldValue}
+                            onChange={onExpectedSubmissionTimeChange}
                             disabled={disabled}
                             readOnly={readOnly}
+                            type="month"
                         />
                     </InputSection>
                     <InputSection
@@ -236,6 +250,19 @@ function Overview(props: Props) {
                             readOnly={readOnly}
                         />
                     </InputSection>
+                    <InputSection
+                        title={strings.partnersInvolved}
+                        description={strings.partnersInvolvedDescription}
+                        withAsteriskOnTitle
+                    >
+                        <NationalSocietyMultiSelectInput
+                            name="partners"
+                            value={value.partners}
+                            error={getErrorString(error?.partners)}
+                            onChange={setFieldValue}
+                            disabled={disabled}
+                        />
+                    </InputSection>
                 </ListView>
             </Container>
             <Container
diff --git a/app/src/views/EapFullForm/RiskAnalysis/i18n.json b/app/src/views/EapFullForm/RiskAnalysis/i18n.json
index d10b4c8a99..3c566ea847 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/i18n.json
+++ b/app/src/views/EapFullForm/RiskAnalysis/i18n.json
@@ -2,7 +2,7 @@
     "namespace": "eapFullForm",
     "strings": {
         "riskAnalysisHeading": "Risk Analysis",
-        "hazardSelectionTitle": "Hazard selection",
+        "hazardSelectionTitle": "Hazard Selection",
         "riskDescriptionLabel": "Description",
         "hazardSelectionDescription1": "Provide a brief rationale about the selection of the hazard for the FbF system.",
         "hazardSelectionDescription2": "Explain the selection of the hazard based on an analysis of historical disaster impacts (using the events registered in the below-mentioned table).",
@@ -26,17 +26,17 @@
         "exposeElementRequiredPoint3": "Based on past impact and exposure, describe the key factors of vulnerability of the specific population, infrastructure, natural resources, assets (others) that are likely to be impacted.",
         "exposeElementRequiredPoint4": "Please explain how specific population groups (e.g elderly, children, people with disabilities, IDPs, Refugees, etc.) are most likely to be affected.",
         "exposeElementRequiredPoint5": "Note: this exposure and vulnerability analysis will be the basis for the selection of indicators used for the trigger model (section 4.4).",
-        "prioritisedImpactTitle": "Prioritised impact",
-        "prioritisedImpactsLabel": "Prioritised impacts",
+        "prioritisedImpactTitle": "Prioritised Impact",
+        "prioritisedImpactsLabel": "Prioritised Impacts",
         "prioritisedImpactDescription": "Add the list of prioritised impacts. Explain which priority impacts the EAP will address and why (e.g mortality of alpacas due to cold waves, Internal Displacement due to floods, malnutrition of children under 5 due to drought etc.).",
         "prioritisedImpactExplanatoryNote": "Recognizing that an FbF system will not be able to address all risks and potential impacts, based on the analysis of past impact, exposure and vulnerability (sections 3.1. to 3.2) and the results of the joint identification conducted with key stakeholders, indicate which disaster impacts were prioritized, explaining how and why they were prioritized. For more guidance see the FbF Manual (Chapters 4.1 Set the Trigger and 4.2 Select Early Actions)",
         "prioritizedImpactsEmptyMessage": "No impacts yet!",
-        "attachFilesTitle": "Attach relevant files",
+        "attachFilesTitle": "Attach Relevant Files",
         "attachFilesDescription": "Attach any additional documentation, files, images, etc.",
         "attachFilesSelectImagesLabel": "Select Images",
         "attachFilesUploadLabel": "Upload",
         "addButtonLabel": "Add",
-        "sourceOfInformationTitle": "Sources of information",
+        "sourceOfInformationTitle": "Sources of Information",
         "sourceOfInformationDescription": "Add the description of the sources one at a time. If the source has a link, add in the second field.",
         "riskExplanatoryNoteLabel": "Explanatory Note",
         "riskAnalysisImagesCountLabel": "5 images max(optional)",
diff --git a/app/src/views/EapFullForm/RiskAnalysis/index.tsx b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
index aa1e3b13e0..3ffbf55650 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
@@ -450,7 +450,7 @@ function RiskAnalysis(props: Props) {
                     >
                         <GoMultiFileInput
                             name="risk_analysis_relevant_files"
-                            accept=".pdf, .docx, .pptx"
+                            accept=".pdf, .docx, .pptx, image/*"
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
@@ -458,6 +458,7 @@ function RiskAnalysis(props: Props) {
                             error={getErrorString(error?.risk_analysis_relevant_files)}
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             clearable
+                            required
                             disabled={disabled}
                             readOnly={readOnly}
                             useCurrentLanguageForMutation
diff --git a/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx b/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx
index e9e306f5ee..cb9ed23d42 100644
--- a/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx
@@ -4,8 +4,10 @@ import {
     ExpandableContainer,
     ListView,
     NumberInput,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
+import { noOp } from '@togglecorp/fujs';
 import {
     type ArrayError,
     getErrorObject,
@@ -15,6 +17,7 @@ import {
 
 import EapIndicatorListInput from '#components/domain/EapIndicatorListInput';
 import EapOperationActivityListInput from '#components/domain/EapOperationActivityListInput';
+import { type GoApiResponse } from '#utils/restRequest';
 
 import { type PartialEapFullFormType } from '../../schema';
 
@@ -22,6 +25,8 @@ import i18n from './i18n.json';
 
 type EnableApproachesFormFields = NonNullable<PartialEapFullFormType['enabling_approaches']>[number];
 
+type EapApproachApCodeOption = NonNullable<GoApiResponse<'/api/v2/eap/options/'>['approach_ap_codes']>;
+
 const defaultApproachValue: EnableApproachesFormFields = {
     approach: 10,
 };
@@ -35,6 +40,7 @@ interface Props {
     disabled?: boolean;
     approachTitle?: React.ReactNode;
     readOnly?: boolean;
+    approachApCodeOption?: EapApproachApCodeOption;
 }
 
 function ApproachesInput(props: Props) {
@@ -47,11 +53,14 @@ function ApproachesInput(props: Props) {
         disabled,
         approachTitle,
         readOnly,
+        approachApCodeOption,
     } = props;
 
     const strings = useTranslation(i18n);
     const onFieldChange = useFormObject(index, onChange, defaultApproachValue);
 
+    const apCodeValue = approachApCodeOption?.[value?.approach]?.join(', ');
+
     const error = (value && value.approach && errorFromProps)
         ? getErrorObject(errorFromProps?.[value.approach])
         : undefined;
@@ -90,14 +99,12 @@ function ApproachesInput(props: Props) {
                         readOnly={readOnly}
                         error={error?.budget_per_approach}
                     />
-                    <NumberInput
+                    <TextInput
+                        name={undefined}
+                        onChange={noOp}
+                        readOnly
                         label={strings.approachApCode}
-                        name="ap_code"
-                        value={value?.ap_code}
-                        onChange={onFieldChange}
-                        disabled={disabled}
-                        readOnly={readOnly}
-                        error={error?.ap_code}
+                        value={apCodeValue}
                     />
                 </ListView>
                 <ListView
@@ -108,25 +115,25 @@ function ApproachesInput(props: Props) {
                         name="indicators"
                         value={value.indicators}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.indicators)}
+                        error={getErrorObject(error)?.indicators}
                     />
                     <EapOperationActivityListInput
                         name="readiness_activities"
                         value={value.readiness_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.readiness_activities)}
+                        error={getErrorObject(error)?.readiness_activities}
                     />
                     <EapOperationActivityListInput
                         name="prepositioning_activities"
                         value={value.prepositioning_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.prepositioning_activities)}
+                        error={getErrorObject(error)?.prepositioning_activities}
                     />
                     <EapOperationActivityListInput
                         name="early_action_activities"
                         value={value.early_action_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.early_action_activities)}
+                        error={getErrorObject(error)?.early_action_activities}
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
index 340638c391..3800052ad3 100644
--- a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
@@ -4,8 +4,10 @@ import {
     ExpandableContainer,
     ListView,
     NumberInput,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
+import { noOp } from '@togglecorp/fujs';
 import {
     type ArrayError,
     getErrorObject,
@@ -15,6 +17,7 @@ import {
 
 import EapIndicatorListInput from '#components/domain/EapIndicatorListInput';
 import EapOperationActivityListInput from '#components/domain/EapOperationActivityListInput';
+import { type GoApiResponse } from '#utils/restRequest';
 
 import { type PartialEapFullFormType } from '../../schema';
 
@@ -24,6 +27,8 @@ type PlannedOperationFormFields = NonNullable<
     PartialEapFullFormType['planned_operations']
 >[number];
 
+type EapSectorApCodeOption = NonNullable<GoApiResponse<'/api/v2/eap/options/'>['sector_ap_codes']>;
+
 const defaultOperationValue: PlannedOperationFormFields = {
     sector: 101,
 };
@@ -40,6 +45,7 @@ interface Props {
     disabled?: boolean;
     operationTitle?: React.ReactNode;
     readOnly?: boolean;
+    sectorApCodeOption?: EapSectorApCodeOption;
 }
 
 function OperationsInput(props: Props) {
@@ -52,11 +58,14 @@ function OperationsInput(props: Props) {
         disabled,
         operationTitle,
         readOnly,
+        sectorApCodeOption,
     } = props;
 
     const strings = useTranslation(i18n);
     const onFieldChange = useFormObject(index, onChange, defaultOperationValue);
 
+    const apCodeValue = sectorApCodeOption?.[value.sector]?.join(', ');
+
     const error = value && value.sector && errorFromProps
         ? getErrorObject(errorFromProps?.[value.sector])
         : undefined;
@@ -106,15 +115,12 @@ function OperationsInput(props: Props) {
                         error={error?.budget_per_sector}
                         readOnly={readOnly}
                     />
-                    <NumberInput
-                        required
+                    <TextInput
+                        name={undefined}
+                        onChange={noOp}
+                        readOnly
                         label={strings.selectionActionsPlannedOperationApCode}
-                        name="ap_code"
-                        value={value?.ap_code}
-                        onChange={onFieldChange}
-                        disabled={disabled}
-                        error={error?.ap_code}
-                        readOnly={readOnly}
+                        value={apCodeValue}
                     />
                 </ListView>
                 <ListView
@@ -125,25 +131,25 @@ function OperationsInput(props: Props) {
                         name="indicators"
                         value={value.indicators}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.indicators)}
+                        error={getErrorObject(error)?.indicators}
                     />
                     <EapOperationActivityListInput
                         name="readiness_activities"
                         value={value.readiness_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.readiness_activities)}
+                        error={getErrorObject(error)?.readiness_activities}
                     />
                     <EapOperationActivityListInput
                         name="prepositioning_activities"
                         value={value.prepositioning_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.prepositioning_activities)}
+                        error={getErrorObject(error)?.prepositioning_activities}
                     />
                     <EapOperationActivityListInput
                         name="early_action_activities"
                         value={value.early_action_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.early_action_activities)}
+                        error={getErrorObject(error)?.early_action_activities}
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapFullForm/SelectionActions/i18n.json b/app/src/views/EapFullForm/SelectionActions/i18n.json
index 23fdbc5ba2..ac5f65b8e9 100644
--- a/app/src/views/EapFullForm/SelectionActions/i18n.json
+++ b/app/src/views/EapFullForm/SelectionActions/i18n.json
@@ -1,9 +1,9 @@
 {
     "namespace": "eapFullForm",
     "strings": {
-        "selectionActionsHeading": "Selection of actions",
+        "selectionActionsHeading": "Selection of Actions",
         "selectionActionsTooltipDescription": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see FbF Manual, Chapter 4.2 Select Early Actions.",
-        "selectionProcessTitle": "Early action selection process",
+        "selectionProcessTitle": "Early Action Selection Process",
         "selectionProcessDescription1": "Add the list of early actions",
         "selectionProcessDescription2": "Based on the prioritized impacts/risks of section 3, provide a brief rationale (e.g. your criteria) for the selection of action(s), also indicating which actions were considered but not chosen.",
         "selectionProcessDescription3": "Describe the process used to select the actions: Who was consulted? Which assessments/research were carried out?",
@@ -23,6 +23,7 @@
         "earlyActionsEmptyMessage": "No actions yet!",
         "selectionActionUploadLabel": "Upload",
         "selectionActionSelectImagesLabel": "Select images",
+        "theoryOfChangeTableTitle": "Theory of Change Table",
         "downloadTableLabel": "Download Theory of Change table",
         "selectionActionUploadTableLabel": "Upload Table",
         "evidenceBaseTitle": "Evidence Base",
diff --git a/app/src/views/EapFullForm/SelectionActions/index.tsx b/app/src/views/EapFullForm/SelectionActions/index.tsx
index 8ea376b883..af71b9f9a0 100644
--- a/app/src/views/EapFullForm/SelectionActions/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/index.tsx
@@ -118,6 +118,10 @@ function SelectionActions(props: Props) {
         },
     });
 
+    const { response: apCodeOptions } = useRequest({
+        url: '/api/v2/eap/options/',
+    });
+
     const { setValue: onOperationChange, removeValue: onOperationRemove } = useFormArray<'planned_operations', PlannedOperationFormFields>(
         'planned_operations',
         setFieldValue,
@@ -441,6 +445,7 @@ function SelectionActions(props: Props) {
                         />
                     </InputSection>
                     <InputSection
+                        title={strings.theoryOfChangeTableTitle}
                         description={(
                             <Link
                                 external
@@ -451,6 +456,7 @@ function SelectionActions(props: Props) {
                                 {strings.downloadTableLabel}
                             </Link>
                         )}
+                        withAsteriskOnTitle
                     >
                         <GoSingleFileInput
                             name="theory_of_change_table_file"
@@ -509,7 +515,7 @@ function SelectionActions(props: Props) {
                     >
                         <GoMultiFileInput
                             name="evidence_base_relevant_files"
-                            accept=".pdf, .docx, .pptx"
+                            accept=".pdf, .docx, .pptx, image/*"
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
@@ -592,6 +598,7 @@ function SelectionActions(props: Props) {
                             error={getErrorObject(error?.planned_operations)}
                             disabled={disabled}
                             readOnly={readOnly}
+                            sectorApCodeOption={apCodeOptions?.sector_ap_codes}
                         />
                     ))}
                     <InputSection
@@ -622,6 +629,7 @@ function SelectionActions(props: Props) {
                             onChange={onApproachChange}
                             onRemove={onApproachRemove}
                             error={getErrorObject(error?.enabling_approaches)}
+                            approachApCodeOption={apCodeOptions?.approach_ap_codes}
                             disabled={disabled}
                             readOnly={readOnly}
                         />
diff --git a/app/src/views/EapFullForm/TriggerModel/i18n.json b/app/src/views/EapFullForm/TriggerModel/i18n.json
index 47f3935a11..4e1b87ff1c 100644
--- a/app/src/views/EapFullForm/TriggerModel/i18n.json
+++ b/app/src/views/EapFullForm/TriggerModel/i18n.json
@@ -14,7 +14,8 @@
         "addNewTriggerButtonLabel": "Add",
         "sourcesForecastDescription": "Add respective source(s) for the forecast and the link to the website, if applicable.",
         "forecastExplanatoryNote": "In order for the DREF to approve funding when a trigger occurs, there must be a certain probability the extreme event will take place. To safeguard this, it is crucial to select those forecasts that have a certain “skill” level (certain level of confidence). If observations are used, these can also be included in the table. Note that this information does not need to be calculated by the National Society but can be obtained by working with hydro-meteorological services, research institutions, experts etc.",
-        "forecastSelectionTitle": "Forecast selection",
+        "forecastSelectionTitle": "Forecast Selection",
+        "forecastTableDetails": "Forecast Table Details",
         "downloadForecastTableLabel": "Download Menu of Forecast",
         "forecastRequiredPoint1": "State clearly which forecast(s) and observations will be used and why they were chosen.",
         "forecastRequiredPoint2": "Include a table with all available forecasts for your hazard. The table must include: Name of forecast, Lead time, Source, False Alarm Ratio, Number of times the forecast has been issued for this hazard in the last 10 years ",
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index ecfc5b38b5..b0cbf9cb61 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -286,6 +286,7 @@ function TriggerModel(props: Props) {
                         numPreferredColumns={2}
                     >
                         <NumberInput
+                            required
                             name="lead_time"
                             value={value?.lead_time}
                             error={error?.lead_time}
@@ -294,6 +295,7 @@ function TriggerModel(props: Props) {
                             readOnly={readOnly}
                         />
                         <SelectInput
+                            required
                             name="lead_timeframe_unit"
                             value={value?.lead_timeframe_unit}
                             error={error?.lead_timeframe_unit}
@@ -399,6 +401,7 @@ function TriggerModel(props: Props) {
                         />
                     </InputSection>
                     <InputSection
+                        title={strings.forecastTableDetails}
                         description={(
                             <Link
                                 external
@@ -409,19 +412,23 @@ function TriggerModel(props: Props) {
                                 {strings.downloadForecastTableLabel}
                             </Link>
                         )}
+                        withAsteriskOnTitle
                     >
                         <GoSingleFileInput
-                            accept=".docx"
                             name="forecast_table_file"
-                            value={value.forecast_table_file}
-                            url="/api/v2/eap-file/"
-                            error={error?.forecast_table_file}
-                            disabled={disabled}
-                            label={strings.attachRelevantFilesUploadLabel}
+                            accept=".docx"
                             fileIdToUrlMap={fileIdToUrlMap}
-                            setFileIdToUrlMap={setFileIdToUrlMap}
                             onChange={setFieldValue}
+                            url="/api/v2/eap-file/"
+                            value={value.forecast_table_file}
+                            error={getErrorString(error?.forecast_table_file)}
+                            setFileIdToUrlMap={setFileIdToUrlMap}
+                            required
+                            clearable
+                            disabled={disabled}
                             readOnly={readOnly}
+                            useCurrentLanguageForMutation
+                            label={strings.attachRelevantFilesUploadLabel}
                         >
                             {strings.triggerUploadTableLabel}
                         </GoSingleFileInput>
@@ -592,7 +599,7 @@ function TriggerModel(props: Props) {
                     >
                         <GoMultiFileInput
                             name="trigger_model_relevant_files"
-                            accept=".pdf, .docx, .pptx"
+                            accept=".pdf, .docx, .pptx, image/*"
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/common.tsx b/app/src/views/EapFullForm/common.tsx
index 4a8ca3780d..df0865aaea 100644
--- a/app/src/views/EapFullForm/common.tsx
+++ b/app/src/views/EapFullForm/common.tsx
@@ -78,6 +78,7 @@ const riskAnalysisTabFields: (keyof PartialEapFullFormType)[] = [
 const triggerModelTabFields: (keyof PartialEapFullFormType)[] = [
     'trigger_statement',
     'lead_time',
+    'lead_timeframe_unit',
     'trigger_statement_source_of_information',
     'forecast_selection',
     'forecast_selection_images',
@@ -174,7 +175,7 @@ export function checkTabErrors(
     return hasErrorOnAnyField;
 }
 
-export const charLimits: { [key in FormKeys]?: number } = {
+export const charLimits = {
     key_actors: 150,
     technical_working_groups_in_place_description: 150,
     hazard_selection: 1000,
@@ -201,4 +202,5 @@ export const charLimits: { [key in FormKeys]?: number } = {
     prepositioning_cost_description: 500,
     early_action_cost_description: 500,
     eap_endorsement: 300,
-};
+    people_targeted: 10000,
+} satisfies { [key in FormKeys]?: number };
diff --git a/app/src/views/EapFullForm/i18n.json b/app/src/views/EapFullForm/i18n.json
index 5d1844d953..894d55ab14 100644
--- a/app/src/views/EapFullForm/i18n.json
+++ b/app/src/views/EapFullForm/i18n.json
@@ -1,7 +1,7 @@
 {
     "namespace": "eapFullForm",
     "strings": {
-        "mainHeading": "Full EAP form",
+        "mainHeading": "{country}: {disaster} - Full EAP",
         "mainDescription": "Use the following form to submit the details of your Early Action Protocols (EAP) submission.",
         "overviewTabLabel": "Overview",
         "riskAnalysisTabLabel": "Risk Analysis",
@@ -27,9 +27,9 @@
         "validationErrorAlertMessage": "Please fix all the errors before continuing!",
         "savingPendingMessage": "Saving data...",
         "submitFormErrorMessage": "Please make sure you've filled in all the required details before proceeding!",
-        "submitButtonLabel": "Submit for approval",
+        "submitButtonLabel": "Submit for Approval",
         "submitConfirmButtonLabel": "Confirm",
-        "submitConfirmHeading": "Submit EAP for approval",
+        "submitConfirmHeading": "Submit EAP for Approval",
         "submitConfirmMessage": "Are you sure you want to submit the EAP? Reviewers will be notified and you'll no longer be able to edit the form!",
         "formLoadErrorTitle": "Failed to load Full EAP form!",
         "formLoadErrorHelpText": "Please make sure that the Full EAP form with given id exists and you have the permission to view it"
diff --git a/app/src/views/EapFullForm/index.tsx b/app/src/views/EapFullForm/index.tsx
index a4a24593e9..e38b16306b 100644
--- a/app/src/views/EapFullForm/index.tsx
+++ b/app/src/views/EapFullForm/index.tsx
@@ -30,7 +30,10 @@ import {
     useBooleanState,
     useTranslation,
 } from '@ifrc-go/ui/hooks';
-import { injectClientId } from '@ifrc-go/ui/utils';
+import {
+    injectClientId,
+    resolveToString,
+} from '@ifrc-go/ui/utils';
 import {
     isDefined,
     isNotDefined,
@@ -125,6 +128,7 @@ export function Component() {
     ] = useState(false);
 
     const { eapId } = useParams<{ eapId: string }>();
+
     const [searchParams] = useSearchParams();
 
     const version = searchParams.get('version') ?? undefined;
@@ -193,7 +197,9 @@ export function Component() {
                 prioritized_impact_images,
                 early_action_implementation_images,
                 budget_file_details,
+                forecast_table_file_details,
                 updated_checklist_file_details,
+                theory_of_change_table_file_details,
             } = response;
             return {
                 ...prevMap,
@@ -210,7 +216,9 @@ export function Component() {
                         ...(prioritized_impact_images ?? []),
                         ...(early_action_implementation_images ?? []),
                         budget_file_details,
+                        forecast_table_file_details,
                         updated_checklist_file_details,
+                        theory_of_change_table_file_details,
                     ]
                         .map((eapFile) => {
                             if (isNotDefined(eapFile)) {
@@ -518,6 +526,16 @@ export function Component() {
                         const [index] = match;
                         return formValue?.trigger_activation_system_images?.[index!]?.client_id;
                     }
+                    match = matchArray(locations, ['planned_operations',
+                        NUM,
+                        'indicators',
+                        NUM,
+                    ]);
+                    if (isDefined(match)) {
+                        const [planned_intervention_index, index] = match;
+                        return formValue?.planned_operations?.[planned_intervention_index!]
+                            ?.indicators?.[index!]?.client_id;
+                    }
                     match = matchArray(locations, [
                         'planned_operations',
                         NUM,
@@ -556,6 +574,16 @@ export function Component() {
                         const [poIndex] = match;
                         return formValue?.planned_operations?.[poIndex!]?.sector;
                     }
+                    match = matchArray(locations, ['enabling_approaches',
+                        NUM,
+                        'indicators',
+                        NUM,
+                    ]);
+                    if (isDefined(match)) {
+                        const [planned_intervention_index, index] = match;
+                        return formValue?.enabling_approaches?.[planned_intervention_index!]
+                            ?.indicators?.[index!]?.client_id;
+                    }
                     match = matchArray(locations, [
                         'enabling_approaches',
                         NUM,
@@ -608,15 +636,15 @@ export function Component() {
         response: fullEapResponse,
         error: fullEapResponseError,
     } = useRequest({
-        skip: isNotDefined(latestFullEapId),
+        skip: isNotDefined(currentFullEapId),
         url: '/api/v2/full-eap/{id}/',
-        pathVariables: isDefined(latestFullEapId)
-            ? { id: latestFullEapId }
+        pathVariables: isDefined(currentFullEapId)
+            ? { id: currentFullEapId }
             : undefined,
         onSuccess: (response) => {
             loadResponseToFormValue(response);
 
-            processServerErrors(state.error, value);
+            processServerErrors(state?.error, value);
 
             // NOTE state was used to pass error through navigation.
             // and cleared here to prevent stale error from reappearing on page refresh
@@ -726,6 +754,7 @@ export function Component() {
 
         const {
             expected_submission_time,
+            partners,
             national_society_contact_email,
             national_society_contact_name,
             national_society_contact_title,
@@ -754,6 +783,7 @@ export function Component() {
             ifrc_head_of_delegation_name: ifrc_contact_name,
             ifrc_head_of_delegation_title: ifrc_contact_title,
             ifrc_head_of_delegation_phone_number: ifrc_contact_phone_number,
+            partners,
         });
     }, [eapDetailResponse, fullEapPending, fullEapResponse, setValue]);
 
@@ -859,7 +889,13 @@ export function Component() {
     return (
         <Tabs value={activeTab} onChange={setActiveTab} styleVariant="step">
             <Page
-                heading={strings.mainHeading}
+                heading={resolveToString(
+                    strings.mainHeading,
+                    {
+                        country: eapDetailResponse?.country_details?.name ?? '--',
+                        disaster: eapDetailResponse?.disaster_type_details?.name ?? '--',
+                    },
+                )}
                 description={strings.mainDescription}
                 withBackgroundColorInMainSection
                 beforeHeaderContent={readOnly && (
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index 360a24c812..d179400181 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -6,7 +6,7 @@ import {
 import {
     addCondition,
     emailCondition,
-    lessThanOrEqualToCondition,
+    greaterThanOrEqualToCondition,
     type LiteralSchema,
     nullValue,
     type ObjectSchema,
@@ -588,7 +588,7 @@ function getContactSchema<KEY extends ValidContactFieldPrefixes>(key: KEY, requi
 
 export const formSchema: EapFullFormSchema = {
     fields: (formValue, __, context): EapFullFormSchemaFields => {
-        const isSubmit = context?.getIsSubmission();
+        const isSubmit = context?.getIsSubmission() ?? false;
         let formFields: EapFullFormSchemaFields = {
             // ------------Overview-----------------
             expected_submission_time: { required: isSubmit },
@@ -603,6 +603,9 @@ export const formSchema: EapFullFormSchema = {
                     },
                 }),
             },
+            partners: {
+                required: isSubmit,
+            },
             partner_contacts: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
@@ -919,15 +922,12 @@ export const formSchema: EapFullFormSchema = {
                         budget_per_sector: {
                             required: isSubmit,
                         },
-                        ap_code: {
-                            required: isSubmit,
-                        },
                         indicators: {
                             keySelector: (indicator) => indicator.client_id,
-                            member: () => indicatorSchema,
+                            member: () => indicatorSchema(isSubmit),
                             validation: (indicators) => {
-                                if (isNotDefined(indicators)
-                                    || indicators.length === 0) {
+                                if (isSubmit && (isNotDefined(indicators)
+                                    || indicators.length === 0)) {
                                     return 'This field is required';
                                 }
 
@@ -942,15 +942,15 @@ export const formSchema: EapFullFormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                     }),
                 }),
@@ -975,15 +975,12 @@ export const formSchema: EapFullFormSchema = {
                         budget_per_approach: {
                             required: isSubmit,
                         },
-                        ap_code: {
-                            required: isSubmit,
-                        },
                         indicators: {
                             keySelector: (indicator) => indicator.client_id,
-                            member: () => indicatorSchema,
+                            member: () => indicatorSchema(isSubmit),
                             validation: (indicators) => {
-                                if (isNotDefined(indicators)
-                                    || indicators.length === 0) {
+                                if (isSubmit && (isNotDefined(indicators)
+                                    || indicators.length === 0)) {
                                     return 'This field is required';
                                 }
 
@@ -992,15 +989,15 @@ export const formSchema: EapFullFormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                     }),
                 }),
@@ -1072,7 +1069,7 @@ export const formSchema: EapFullFormSchema = {
             people_targeted: {
                 required: isSubmit,
                 validations: [
-                    lessThanOrEqualToCondition(10000),
+                    greaterThanOrEqualToCondition(charLimits.people_targeted),
                     positiveIntegerCondition,
                 ],
             },
diff --git a/app/src/views/EapRegistration/index.tsx b/app/src/views/EapRegistration/index.tsx
index faea07076a..c46982c13c 100644
--- a/app/src/views/EapRegistration/index.tsx
+++ b/app/src/views/EapRegistration/index.tsx
@@ -37,6 +37,10 @@ import Page from '#components/Page';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import useAlert from '#hooks/useAlert';
 import useRouting from '#hooks/useRouting';
+import {
+    getFullDateFromYearMonth,
+    getYearMonthFromFullDate,
+} from '#utils/domain/eap';
 import {
     type GoApiResponse,
     useLazyRequest,
@@ -115,12 +119,19 @@ export function Component() {
         },
     });
 
+    const onExpectedSubmissionTimeChange = useCallback((val: string | undefined) => {
+        if (!val) {
+            return;
+        }
+        setFieldValue(getFullDateFromYearMonth(val), 'expected_submission_time');
+    }, [setFieldValue]);
+
     const handleEapTypeNotSureClick = useCallback(() => {
-        setFieldValue(null, 'eap_type');
+        setFieldValue(undefined, 'eap_type');
     }, [setFieldValue]);
 
     const handleSubmissionTimeNotSureClick = useCallback(() => {
-        setFieldValue(null, 'expected_submission_time');
+        setFieldValue(undefined, 'expected_submission_time');
     }, [setFieldValue]);
 
     const handleRegisterFormValidation = useCallback((formValues: EapRegisterFormFields) => {
@@ -272,8 +283,9 @@ export function Component() {
                         >
                             <DateInput
                                 name="expected_submission_time"
-                                onChange={setFieldValue}
-                                value={value?.expected_submission_time}
+                                type="month"
+                                onChange={onExpectedSubmissionTimeChange}
+                                value={getYearMonthFromFullDate(value?.expected_submission_time)}
                                 error={error?.expected_submission_time}
                             />
                             <Radio
diff --git a/app/src/views/EapRegistration/schema.ts b/app/src/views/EapRegistration/schema.ts
index 1335a95ec2..9c86ef5cb5 100644
--- a/app/src/views/EapRegistration/schema.ts
+++ b/app/src/views/EapRegistration/schema.ts
@@ -2,11 +2,12 @@ import {
     emailCondition,
     type ObjectSchema,
     type PartialForm,
+    type PurgeNull,
 } from '@togglecorp/toggle-form';
 
 import { type GoApiBody } from '#utils/restRequest';
 
-export type EapRegisterRequestBody = GoApiBody<'/api/v2/eap-registration/', 'POST'>;
+export type EapRegisterRequestBody = PurgeNull<GoApiBody<'/api/v2/eap-registration/', 'POST'>>;
 
 export const defaultFormValue: EapRegisterFormFields = {
     eap_type: undefined,
diff --git a/app/src/views/EapSimplifiedExport/index.tsx b/app/src/views/EapSimplifiedExport/index.tsx
index 38ecbe6c7e..2c0d5a8290 100644
--- a/app/src/views/EapSimplifiedExport/index.tsx
+++ b/app/src/views/EapSimplifiedExport/index.tsx
@@ -97,6 +97,10 @@ export function Component() {
             : undefined,
     });
 
+    const { response: apCodeOptions } = useRequest({
+        url: '/api/v2/eap/options/',
+    });
+
     const { eap_sector, eap_approach } = useGlobalEnums();
 
     const eapSectorTitleMap = listToMap(
@@ -509,6 +513,14 @@ export function Component() {
                 {planned_operations?.map((operation) => {
                     const prevOperation = prevPlannedOperationMap?.[operation.sector];
 
+                    const apCodeSectorValue = apCodeOptions?.sector_ap_codes
+                        ?.[operation.sector]?.join(', ');
+
+                    const prevApCodeSectorValue = isDefined(prevOperation)
+                        ? apCodeOptions?.sector_ap_codes
+                            ?.[prevOperation?.sector]?.join(', ')
+                        : '-';
+
                     const prevOperationIndicatorMap = listToMap(
                         prevOperation?.indicators,
                         ({ id }) => id!,
@@ -557,9 +569,9 @@ export function Component() {
                                     />
                                     <PrintableDataDisplay
                                         label={strings.apCodeLabel}
-                                        value={operation.ap_code}
-                                        prevValue={prevOperation?.ap_code}
-                                        valueType="number"
+                                        value={apCodeSectorValue}
+                                        prevValue={prevApCodeSectorValue}
+                                        valueType="text"
                                         strongLabel
                                         withDiff={withDiff}
                                     />
@@ -685,6 +697,14 @@ export function Component() {
                 {enabling_approaches?.map((approach) => {
                     const prevApproach = prevEnablingApproachesMap?.[approach.approach];
 
+                    const apCodeApproachValue = apCodeOptions?.approach_ap_codes
+                        ?.[approach.approach]?.join(', ');
+
+                    const prevApCodeApproachValue = isDefined(prevApproach)
+                        ? apCodeOptions?.approach_ap_codes
+                            ?.[prevApproach.approach]?.join(', ')
+                        : '-';
+
                     const prevApproachIndicatorMap = listToMap(
                         prevApproach?.indicators,
                         ({ id }) => id!,
@@ -725,9 +745,9 @@ export function Component() {
                                     />
                                     <PrintableDataDisplay
                                         label={strings.apCodeLabel}
-                                        value={approach.ap_code}
-                                        prevValue={prevApproach?.ap_code}
-                                        valueType="number"
+                                        value={apCodeApproachValue}
+                                        prevValue={prevApCodeApproachValue}
+                                        valueType="text"
                                         strongLabel
                                         withDiff={withDiff}
                                     />
diff --git a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
index 474f92de73..870e848dec 100644
--- a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
@@ -466,7 +466,8 @@ function EarlyAction(props: Props) {
                             labelSelector={stringValueSelector}
                             options={eapTimeframeOption}
                             error={error?.operational_timeframe_unit}
-                            disabled
+                            disabled={disabled}
+                            readOnly
                         />
                     </InputSection>
                     <InputSection
@@ -510,8 +511,10 @@ function EarlyAction(props: Props) {
                     <InputSection
                         title={strings.fullEap}
                         description={strings.fullEapDescription}
+                        withAsteriskOnTitle
                     >
                         <TextArea
+                            required
                             label={strings.actionDescription}
                             name="next_step_towards_full_eap"
                             value={value?.next_step_towards_full_eap}
diff --git a/app/src/views/EapSimplifiedForm/EnablingApproaches/ApproachesInput/index.tsx b/app/src/views/EapSimplifiedForm/EnablingApproaches/ApproachesInput/index.tsx
index 3dd47883dd..191035dacb 100644
--- a/app/src/views/EapSimplifiedForm/EnablingApproaches/ApproachesInput/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EnablingApproaches/ApproachesInput/index.tsx
@@ -4,8 +4,10 @@ import {
     ExpandableContainer,
     ListView,
     NumberInput,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
+import { noOp } from '@togglecorp/fujs';
 import {
     type ArrayError,
     getErrorObject,
@@ -15,12 +17,14 @@ import {
 
 import EapIndicatorListInput from '#components/domain/EapIndicatorListInput';
 import EapOperationActivityListInput from '#components/domain/EapOperationActivityListInput';
+import { type GoApiResponse } from '#utils/restRequest';
 
 import { type PartialSimplifiedEapType } from '../../schema';
 
 import i18n from './i18n.json';
 
 type EnableApproachesFormFields = NonNullable<PartialSimplifiedEapType['enabling_approaches']>[number];
+type EapApproachApCodeOption = NonNullable<GoApiResponse<'/api/v2/eap/options/'>['approach_ap_codes']>;
 
 const defaultApproachValue: EnableApproachesFormFields = {
     approach: 10,
@@ -35,6 +39,7 @@ interface Props {
     disabled?: boolean;
     approachTitle?: React.ReactNode;
     readOnly?: boolean;
+    approachApCodeOption?: EapApproachApCodeOption;
 }
 
 function OperationsBySectorInput(props: Props) {
@@ -47,11 +52,14 @@ function OperationsBySectorInput(props: Props) {
         disabled,
         approachTitle,
         readOnly,
+        approachApCodeOption,
     } = props;
 
     const strings = useTranslation(i18n);
     const onFieldChange = useFormObject(index, onChange, defaultApproachValue);
 
+    const apCodeValue = approachApCodeOption?.[value.approach]?.join(', ');
+
     const error = (value && value.approach && errorFromProps)
         ? getErrorObject(errorFromProps?.[value.approach])
         : undefined;
@@ -90,15 +98,12 @@ function OperationsBySectorInput(props: Props) {
                         readOnly={readOnly}
                         required
                     />
-                    <NumberInput
+                    <TextInput
+                        name={undefined}
+                        onChange={noOp}
+                        readOnly
                         label={strings.approachApCode}
-                        name="ap_code"
-                        value={value?.ap_code}
-                        onChange={onFieldChange}
-                        disabled={disabled}
-                        error={error?.ap_code}
-                        readOnly={readOnly}
-                        required
+                        value={apCodeValue}
                     />
                 </ListView>
                 <ListView
@@ -109,25 +114,25 @@ function OperationsBySectorInput(props: Props) {
                         name="indicators"
                         value={value.indicators}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.indicators)}
+                        error={getErrorObject(error)?.indicators}
                     />
                     <EapOperationActivityListInput
                         name="readiness_activities"
                         value={value.readiness_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.readiness_activities)}
+                        error={getErrorObject(error)?.readiness_activities}
                     />
                     <EapOperationActivityListInput
                         name="prepositioning_activities"
                         value={value.prepositioning_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.prepositioning_activities)}
+                        error={getErrorObject(error)?.prepositioning_activities}
                     />
                     <EapOperationActivityListInput
                         name="early_action_activities"
                         value={value.early_action_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.early_action_activities)}
+                        error={getErrorObject(error)?.early_action_activities}
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx b/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
index 427fdcfc18..54cc0d8e1d 100644
--- a/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
@@ -26,6 +26,7 @@ import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
+import { type GoApiResponse } from '#utils/restRequest';
 
 import GuidanceSeap from '../GuidanceSeap';
 import { type PartialSimplifiedEapType } from '../schema';
@@ -37,6 +38,7 @@ type EapApproach = components['schemas']['EapApproachEnumKey'];
 type EapApproachOption = components['schemas']['EapApproachEnum'];
 
 type EnablingApproachesFormFields = NonNullable<PartialSimplifiedEapType['enabling_approaches']>[number];
+type EapApproachApCodeOption = NonNullable<GoApiResponse<'/api/v2/eap/options/'>['approach_ap_codes']>;
 
 interface Props {
     value: PartialSimplifiedEapType;
@@ -44,6 +46,7 @@ interface Props {
     disabled?: boolean;
     setFieldValue: (...entries: EntriesAsList<PartialSimplifiedEapType>) => void;
     readOnly?: boolean;
+    approachApCodeOption?: EapApproachApCodeOption;
 }
 
 function approachesKeySelector(option: EapApproachOption) {
@@ -57,6 +60,7 @@ function EnablingApproaches(props: Props) {
         disabled,
         setFieldValue,
         readOnly,
+        approachApCodeOption,
     } = props;
 
     const error = getErrorObject(formError);
@@ -207,6 +211,7 @@ function EnablingApproaches(props: Props) {
                             error={getErrorObject(error?.enabling_approaches)}
                             disabled={disabled}
                             readOnly={readOnly}
+                            approachApCodeOption={approachApCodeOption}
                         />
                     ))}
                 </ListView>
diff --git a/app/src/views/EapSimplifiedForm/Overview/i18n.json b/app/src/views/EapSimplifiedForm/Overview/i18n.json
index 223ae00435..ab713f8ea5 100644
--- a/app/src/views/EapSimplifiedForm/Overview/i18n.json
+++ b/app/src/views/EapSimplifiedForm/Overview/i18n.json
@@ -12,6 +12,8 @@
         "uploadCoverImageDescription": "Upload a image for the cover page of the publicly published DREF application.",
         "timeframe": "sEAP Timeframe",
         "timeframeDescription": "A simplified EAP has a timeframe of two years (unless the early actions are activiated)",
+        "partnersInvolved": "Partners Involved",
+        "partnersInvolvedDescription": "Select from the list the partners involved in this process. Add as many as needed or select not applicable if no partners involved.",
         "contacts": "Contacts",
         "nationalHeader": "National",
         "delegationHeader": "Delegation",
diff --git a/app/src/views/EapSimplifiedForm/Overview/index.tsx b/app/src/views/EapSimplifiedForm/Overview/index.tsx
index 733c99ef01..ece39f15f3 100644
--- a/app/src/views/EapSimplifiedForm/Overview/index.tsx
+++ b/app/src/views/EapSimplifiedForm/Overview/index.tsx
@@ -18,6 +18,7 @@ import {
     type EntriesAsList,
     type Error,
     getErrorObject,
+    getErrorString,
     useFormArray,
 } from '@togglecorp/toggle-form';
 
@@ -25,6 +26,7 @@ import ContactInputsSection from '#components/domain/ContactInputsSection';
 import CountrySelectInput from '#components/domain/CountrySelectInput';
 import DisasterTypeSelectInput from '#components/domain/DisasterTypeSelectInput';
 import ImageWithCaptionInput from '#components/domain/ImageWithCaptionInput';
+import NationalSocietyMultiSelectInput from '#components/domain/NationalSocietyMultiSelectInput';
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
@@ -197,7 +199,20 @@ function Overview(props: Props) {
                             onChange={setFieldValue}
                             error={error?.seap_timeframe}
                             disabled={disabled}
-                            readOnly={readOnly}
+                            readOnly
+                        />
+                    </InputSection>
+                    <InputSection
+                        title={strings.partnersInvolved}
+                        description={strings.partnersInvolvedDescription}
+                        withAsteriskOnTitle
+                    >
+                        <NationalSocietyMultiSelectInput
+                            name="partners"
+                            value={value.partners}
+                            error={getErrorString(error?.partners)}
+                            onChange={setFieldValue}
+                            disabled={disabled}
                         />
                     </InputSection>
                 </ListView>
diff --git a/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx b/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx
index f5e4192709..f3c5d32710 100644
--- a/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx
+++ b/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx
@@ -4,8 +4,10 @@ import {
     ExpandableContainer,
     ListView,
     NumberInput,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
+import { noOp } from '@togglecorp/fujs';
 import {
     type ArrayError,
     getErrorObject,
@@ -15,6 +17,7 @@ import {
 
 import EapIndicatorListInput from '#components/domain/EapIndicatorListInput';
 import EapOperationActivityListInput from '#components/domain/EapOperationActivityListInput';
+import { type GoApiResponse } from '#utils/restRequest';
 
 import { type PartialSimplifiedEapType } from '../../schema';
 
@@ -22,6 +25,8 @@ import i18n from './i18n.json';
 
 type PlannedOperationFormFields = NonNullable<PartialSimplifiedEapType['planned_operations']>[number];
 
+type EapSectorApCodeOption = NonNullable<GoApiResponse<'/api/v2/eap/options/'>['sector_ap_codes']>;
+
 const defaultOperationValue: PlannedOperationFormFields = {
     sector: 101,
 };
@@ -35,6 +40,7 @@ interface Props {
     disabled?: boolean;
     operationTitle?: React.ReactNode;
     readOnly?: boolean;
+    sectorApCodeOption?: EapSectorApCodeOption;
 }
 
 function OperationsBySectorInput(props: Props) {
@@ -47,11 +53,14 @@ function OperationsBySectorInput(props: Props) {
         disabled,
         operationTitle,
         readOnly,
+        sectorApCodeOption,
     } = props;
 
     const strings = useTranslation(i18n);
     const onFieldChange = useFormObject(index, onChange, defaultOperationValue);
 
+    const apCodeValue = sectorApCodeOption?.[value.sector]?.join(', ');
+
     const error = (value && value.sector && errorFromProps)
         ? getErrorObject(errorFromProps?.[value.sector])
         : undefined;
@@ -101,15 +110,12 @@ function OperationsBySectorInput(props: Props) {
                         readOnly={readOnly}
                         required
                     />
-                    <NumberInput
+                    <TextInput
+                        name={undefined}
+                        onChange={noOp}
+                        readOnly
                         label={strings.operationApCode}
-                        name="ap_code"
-                        value={value?.ap_code}
-                        onChange={onFieldChange}
-                        disabled={disabled}
-                        error={error?.ap_code}
-                        readOnly={readOnly}
-                        required
+                        value={apCodeValue}
                     />
                 </ListView>
                 <ListView
@@ -120,25 +126,25 @@ function OperationsBySectorInput(props: Props) {
                         name="indicators"
                         value={value.indicators}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.indicators)}
+                        error={getErrorObject(error)?.indicators}
                     />
                     <EapOperationActivityListInput
                         name="readiness_activities"
                         value={value.readiness_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.readiness_activities)}
+                        error={getErrorObject(error)?.readiness_activities}
                     />
                     <EapOperationActivityListInput
                         name="prepositioning_activities"
                         value={value.prepositioning_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.prepositioning_activities)}
+                        error={getErrorObject(error)?.prepositioning_activities}
                     />
                     <EapOperationActivityListInput
                         name="early_action_activities"
                         value={value.early_action_activities}
                         onChange={onFieldChange}
-                        error={getErrorObject(error?.early_action_activities)}
+                        error={getErrorObject(error)?.early_action_activities}
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
index a084211926..8540733ec8 100644
--- a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
+++ b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
@@ -26,6 +26,7 @@ import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
+import { type GoApiResponse } from '#utils/restRequest';
 
 import GuidanceSeap from '../GuidanceSeap';
 import { type PartialSimplifiedEapType } from '../schema';
@@ -37,6 +38,8 @@ type EapSector = components['schemas']['EapSectorEnumKey'];
 type EapSectorOption = components['schemas']['EapSectorEnum'];
 
 type PlannedOperationFormFields = NonNullable<PartialSimplifiedEapType['planned_operations']>[number];
+type EapSectorApCodeOption = NonNullable<GoApiResponse<'/api/v2/eap/options/'>['sector_ap_codes']>;
+
 function sectorKeySelector(option: EapSectorOption) {
     return option.key;
 }
@@ -47,6 +50,7 @@ interface Props {
     disabled?: boolean;
     setFieldValue: (...entries: EntriesAsList<PartialSimplifiedEapType>) => void;
     readOnly?: boolean;
+    sectorApCodeOption?: EapSectorApCodeOption;
 }
 
 function PlannedOperations(props: Props) {
@@ -56,6 +60,7 @@ function PlannedOperations(props: Props) {
         disabled,
         setFieldValue,
         readOnly,
+        sectorApCodeOption,
     } = props;
 
     const error = getErrorObject(formError);
@@ -204,6 +209,7 @@ function PlannedOperations(props: Props) {
                             onChange={onOperationChange}
                             onRemove={onOperationRemove}
                             error={getErrorObject(error?.planned_operations)}
+                            sectorApCodeOption={sectorApCodeOption}
                             disabled={disabled}
                             readOnly={readOnly}
                         />
diff --git a/app/src/views/EapSimplifiedForm/common.tsx b/app/src/views/EapSimplifiedForm/common.tsx
index 51a7fcfff2..9bafe9b795 100644
--- a/app/src/views/EapSimplifiedForm/common.tsx
+++ b/app/src/views/EapSimplifiedForm/common.tsx
@@ -19,6 +19,7 @@ const overviewTabFields = [
     'national_society_contact_title',
     'national_society_contact_email',
     'national_society_contact_phone_number',
+    'partners',
     'partner_contacts',
     'dref_focal_point_name',
     'dref_focal_point_email',
@@ -179,7 +180,7 @@ export function checkTabErrors(
     return hasErrorOnAnyField;
 }
 
-export const charLimits: { [key in FormKeys]?: number } = {
+export const charLimits = {
     prioritized_hazard_and_impact: 500,
     risks_selected_protocols: 150,
     selected_early_actions: 150,
@@ -192,4 +193,5 @@ export const charLimits: { [key in FormKeys]?: number } = {
     next_step_towards_full_eap: 100,
     early_action_capability: 500,
     rcrc_movement_involvement: 150,
-};
+    people_targeted: 2000,
+} satisfies { [key in FormKeys]?: number };
diff --git a/app/src/views/EapSimplifiedForm/i18n.json b/app/src/views/EapSimplifiedForm/i18n.json
index ee3b0115ba..e370d8e91d 100644
--- a/app/src/views/EapSimplifiedForm/i18n.json
+++ b/app/src/views/EapSimplifiedForm/i18n.json
@@ -1,7 +1,7 @@
 {
     "namespace": "form",
     "strings": {
-        "pageHeading": "Simplified EAP form",
+        "pageHeading": "{country}: {disaster} - Simplified EAP",
         "pageDescription": "Use the following form to submit the details of your Simplified Early Action Protocols (sEAP) submission",
         "overviewTabLabel": "Overview",
         "riskAnalysisTabLabel": "Risk Analysis & Early Action Selection",
diff --git a/app/src/views/EapSimplifiedForm/index.tsx b/app/src/views/EapSimplifiedForm/index.tsx
index 3eb7ed0d51..e590419286 100644
--- a/app/src/views/EapSimplifiedForm/index.tsx
+++ b/app/src/views/EapSimplifiedForm/index.tsx
@@ -29,7 +29,10 @@ import {
     useBooleanState,
     useTranslation,
 } from '@ifrc-go/ui/hooks';
-import { injectClientId } from '@ifrc-go/ui/utils';
+import {
+    injectClientId,
+    resolveToString,
+} from '@ifrc-go/ui/utils';
 import {
     isDefined,
     isNotDefined,
@@ -310,6 +313,12 @@ export function Component() {
                     return formValue?.selected_early_actions_images?.[index!]?.client_id;
                 }
 
+                match = matchArray(locations, ['planned_operations', NUM, 'indicators', NUM]);
+                if (isDefined(match)) {
+                    const [poIndex, index] = match;
+                    return formValue?.planned_operations?.[poIndex!]
+                        ?.indicators?.[index!]?.client_id;
+                }
                 match = matchArray(locations, ['planned_operations', NUM, 'early_action_activities', NUM]);
                 if (isDefined(match)) {
                     const [poIndex, index] = match;
@@ -333,6 +342,12 @@ export function Component() {
                     const [poIndex] = match;
                     return formValue?.planned_operations?.[poIndex!]?.sector;
                 }
+                match = matchArray(locations, ['enabling_approaches', NUM, 'indicators', NUM]);
+                if (isDefined(match)) {
+                    const [eaIndex, index] = match;
+                    return formValue?.enabling_approaches?.[eaIndex!]
+                        ?.indicators?.[index!]?.client_id;
+                }
                 match = matchArray(locations, ['enabling_approaches', NUM, 'early_action_activities', NUM]);
                 if (isDefined(match)) {
                     const [eaIndex, index] = match;
@@ -410,10 +425,12 @@ export function Component() {
             ifrc_contact_title,
             ifrc_contact_email,
             ifrc_contact_phone_number,
+            partners,
         } = removeNull(eapRegistrationResponse);
 
         setValue((prevValue) => ({
             ...prevValue,
+            partners,
             national_society_contact_name,
             national_society_contact_title,
             national_society_contact_email,
@@ -557,6 +574,10 @@ export function Component() {
         },
     });
 
+    const { response: apCodeOptions } = useRequest({
+        url: '/api/v2/eap/options/',
+    });
+
     const disabled = createSimplifiedEapPending
         || eapRegistrationPending
         || updateSimplifiedEapPending;
@@ -664,7 +685,13 @@ export function Component() {
             styleVariant="step"
         >
             <Page
-                heading={strings.pageHeading}
+                heading={resolveToString(
+                    strings.pageHeading,
+                    {
+                        country: eapRegistrationResponse?.country_details?.name ?? '--',
+                        disaster: eapRegistrationResponse?.disaster_type_details?.name ?? '--',
+                    },
+                )}
                 description={strings.pageDescription}
                 beforeHeaderContent={readOnly && (
                     <TopBanner variant="warning">
@@ -808,6 +835,7 @@ export function Component() {
                                 error={formError}
                                 disabled={disabled}
                                 readOnly={readOnly}
+                                sectorApCodeOption={apCodeOptions?.sector_ap_codes}
                             />
                         </TabPanel>
                         <TabPanel name="enablingApproaches">
@@ -817,6 +845,7 @@ export function Component() {
                                 error={formError}
                                 disabled={disabled}
                                 readOnly={readOnly}
+                                approachApCodeOption={apCodeOptions?.approach_ap_codes}
                             />
                         </TabPanel>
                         <TabPanel name="deliveryAndBudget">
diff --git a/app/src/views/EapSimplifiedForm/schema.ts b/app/src/views/EapSimplifiedForm/schema.ts
index cfe72afa92..771f381d37 100644
--- a/app/src/views/EapSimplifiedForm/schema.ts
+++ b/app/src/views/EapSimplifiedForm/schema.ts
@@ -5,7 +5,7 @@ import {
 } from '@togglecorp/fujs';
 import {
     emailCondition,
-    lessThanOrEqualToCondition,
+    greaterThanOrEqualToCondition,
     type LiteralSchema,
     type ObjectSchema,
     type PartialForm,
@@ -299,7 +299,7 @@ function getContactSchema<KEY extends ValidContactFieldPrefixes>(key: KEY, requi
 
 export const formSchema: FormSchema = {
     fields: (_, __, context): FormSchemaFields => {
-        const isSubmit = context?.getIsSubmission();
+        const isSubmit = context?.getIsSubmission() ?? false;
         const defaultSchema: FormSchemaFields = {
             // Overview
 
@@ -320,6 +320,9 @@ export const formSchema: FormSchema = {
             seap_timeframe: {
                 required: isSubmit,
             },
+            partners: {
+                required: isSubmit,
+            },
             partner_contacts: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
@@ -423,7 +426,7 @@ export const formSchema: FormSchema = {
                 required: isSubmit,
                 validations: [
                     positiveIntegerCondition,
-                    lessThanOrEqualToCondition(2000),
+                    greaterThanOrEqualToCondition(charLimits.people_targeted),
                 ],
             },
             assisted_through_operation: {
@@ -462,6 +465,7 @@ export const formSchema: FormSchema = {
                 )],
             },
             next_step_towards_full_eap: {
+                required: isSubmit,
                 validations: [lengthSmallerOrEqualToCondition(
                     charLimits.next_step_towards_full_eap,
                 )],
@@ -477,12 +481,12 @@ export const formSchema: FormSchema = {
                         sector: {},
                         people_targeted: { required: isSubmit },
                         budget_per_sector: { required: isSubmit },
-                        ap_code: { required: isSubmit },
                         indicators: {
                             keySelector: (indicator) => indicator.client_id,
-                            member: () => indicatorSchema,
+                            member: () => indicatorSchema(isSubmit),
                             validation: (indicators) => {
-                                if (isNotDefined(indicators) || indicators.length === 0) {
+                                if (isSubmit && (isNotDefined(indicators)
+                                    || indicators.length === 0)) {
                                     return 'This field is required';
                                 }
 
@@ -491,15 +495,15 @@ export const formSchema: FormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                     }),
                 }),
@@ -522,13 +526,14 @@ export const formSchema: FormSchema = {
                     fields: (): EnableApproachesFields => ({
                         id: { defaultValue: undefinedValue },
                         approach: {},
-                        budget_per_approach: {},
-                        ap_code: {},
+                        budget_per_approach: { required: isSubmit },
                         indicators: {
                             keySelector: (indicator) => indicator.client_id,
-                            member: () => indicatorSchema,
+                            member: () => indicatorSchema(isSubmit),
                             validation: (indicators) => {
-                                if (isNotDefined(indicators) || indicators.length === 0) {
+                                if (isSubmit
+                                    && (isNotDefined(indicators)
+                                        || indicators.length === 0)) {
                                     return 'This field is required';
                                 }
 
@@ -537,15 +542,15 @@ export const formSchema: FormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema,
+                            member: () => operationActivitySchema(isSubmit),
                         },
                     }),
                 }),
diff --git a/app/src/views/EapSummaryExport/index.tsx b/app/src/views/EapSummaryExport/index.tsx
index e456c2acc5..a720ff97f8 100644
--- a/app/src/views/EapSummaryExport/index.tsx
+++ b/app/src/views/EapSummaryExport/index.tsx
@@ -69,6 +69,10 @@ export function Component() {
             : undefined,
     });
 
+    const { response: apCodeOptions } = useRequest({
+        url: '/api/v2/eap/options/',
+    });
+
     const previewReady = !eapRegistrationPending && !fullEapPending;
 
     const {
@@ -194,254 +198,264 @@ export function Component() {
                 heading={strings.plannedOperationsHeading}
                 headingLevel={2}
             >
-                {planned_operations?.map((operation) => (
-                    <PrintableContainer
-                        key={operation.id}
-                        heading={eapSectorTitleMap?.[operation.sector]}
-                        headingLevel={3}
-                    >
-                        <PrintableContainer headingLevel={4}>
-                            <ListView layout="grid" numPreferredGridColumns={3} spacing="2xs">
-                                <PrintableDataDisplay
-                                    label={strings.operationBudgetLabel}
-                                    value={operation.budget_per_sector}
-                                    valueType="number"
-                                    prefix="CHF "
-                                    withPadding
-                                    withBackground
-                                    strongLabel
-                                    withDiff={false}
-                                />
-                                <PrintableDataDisplay
-                                    label={strings.operationPeopleTargetedLabel}
-                                    value={operation.people_targeted}
-                                    valueType="number"
-                                    strongLabel
-                                    withPadding
-                                    withBackground
-                                    withDiff={false}
-                                />
-                                <PrintableDataDisplay
-                                    label="AP Code"
-                                    value={operation.ap_code}
-                                    valueType="number"
-                                    strongLabel
-                                    withPadding
-                                    withBackground
-                                    withDiff={false}
-                                />
-                            </ListView>
-                        </PrintableContainer>
+                {planned_operations?.map((operation) => {
+                    const apCodeSectorValue = apCodeOptions?.sector_ap_codes
+                        ?.[operation.sector]?.join(', ');
+
+                    return (
                         <PrintableContainer
-                            heading={strings.indicatorsHeading}
+                            key={operation.id}
+                            heading={eapSectorTitleMap?.[operation.sector]}
                             headingLevel={3}
                         >
-                            <div className={styles.indicatorItems}>
-                                <Label textSize="sm" strong>
-                                    {strings.indicatorTitleLabel}
-                                </Label>
-                                <Label textSize="sm" strong>
-                                    {strings.indicatorTargetLabel}
-                                </Label>
-                                {operation.indicators.map((indicator) => (
+                            <PrintableContainer headingLevel={4}>
+                                <ListView layout="grid" numPreferredGridColumns={3} spacing="2xs">
                                     <PrintableDataDisplay
-                                        key={indicator.id}
-                                        label={indicator.title}
-                                        value={indicator.target}
+                                        label={strings.operationBudgetLabel}
+                                        value={operation.budget_per_sector}
                                         valueType="number"
-                                        variant="contents"
-                                        withBackground
+                                        prefix="CHF "
                                         withPadding
-                                        withoutLabelColon
-                                        withDiff={false}
-                                    />
-                                ))}
-                            </div>
-                        </PrintableContainer>
-                        <PrintableContainer
-                            heading={strings.readinessActivitiesHeading}
-                            headingLevel={3}
-                        >
-                            <div className={styles.indicatorItems}>
-                                {operation.readiness_activities.map((activity, index) => (
-                                    <PrintableDataDisplay
-                                        key={activity.id}
-                                        label={`${index + 1}. ${activity.activity}`}
-                                        value={`${activity.time_value} ${activity.timeframe_display}`}
-                                        valueType="text"
-                                        variant="contents"
                                         withBackground
-                                        withPadding
-                                        withoutLabelColon
+                                        strongLabel
                                         withDiff={false}
                                     />
-                                ))}
-                            </div>
-                        </PrintableContainer>
-                        <PrintableContainer
-                            heading={strings.prepositioningActivitiesHeading}
-                            headingLevel={3}
-                        >
-                            <div className={styles.indicatorItems}>
-                                {operation.prepositioning_activities.map((activity, index) => (
                                     <PrintableDataDisplay
-                                        key={activity.id}
-                                        label={`${index + 1}. ${activity.activity}`}
-                                        value={`${activity.time_value} ${activity.timeframe_display}`}
-                                        valueType="text"
-                                        variant="contents"
-                                        withBackground
+                                        label={strings.operationPeopleTargetedLabel}
+                                        value={operation.people_targeted}
+                                        valueType="number"
+                                        strongLabel
                                         withPadding
-                                        withoutLabelColon
+                                        withBackground
                                         withDiff={false}
                                     />
-                                ))}
-                            </div>
-                        </PrintableContainer>
-                        <PrintableContainer
-                            heading={strings.earlyActionActivitiesHeading}
-                            headingLevel={3}
-                        >
-                            <div className={styles.indicatorItems}>
-                                {operation.early_action_activities.map((activity, index) => (
                                     <PrintableDataDisplay
-                                        key={activity.id}
-                                        label={`${index + 1}. ${activity.activity}`}
-                                        value={`${activity.time_value} ${activity.timeframe_display}`}
+                                        label="AP Code"
+                                        value={apCodeSectorValue}
                                         valueType="text"
-                                        variant="contents"
-                                        withBackground
+                                        strongLabel
                                         withPadding
-                                        withoutLabelColon
+                                        withBackground
                                         withDiff={false}
                                     />
-                                ))}
-                            </div>
+                                </ListView>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.indicatorsHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    <Label textSize="sm" strong>
+                                        {strings.indicatorTitleLabel}
+                                    </Label>
+                                    <Label textSize="sm" strong>
+                                        {strings.indicatorTargetLabel}
+                                    </Label>
+                                    {operation.indicators.map((indicator) => (
+                                        <PrintableDataDisplay
+                                            key={indicator.id}
+                                            label={indicator.title}
+                                            value={indicator.target}
+                                            valueType="number"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.readinessActivitiesHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    {operation.readiness_activities.map((activity, index) => (
+                                        <PrintableDataDisplay
+                                            key={activity.id}
+                                            label={`${index + 1}. ${activity.activity}`}
+                                            value={`${activity.time_value} ${activity.timeframe_display}`}
+                                            valueType="text"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.prepositioningActivitiesHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    {operation.prepositioning_activities.map((activity, index) => (
+                                        <PrintableDataDisplay
+                                            key={activity.id}
+                                            label={`${index + 1}. ${activity.activity}`}
+                                            value={`${activity.time_value} ${activity.timeframe_display}`}
+                                            valueType="text"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.earlyActionActivitiesHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    {operation.early_action_activities.map((activity, index) => (
+                                        <PrintableDataDisplay
+                                            key={activity.id}
+                                            label={`${index + 1}. ${activity.activity}`}
+                                            value={`${activity.time_value} ${activity.timeframe_display}`}
+                                            valueType="text"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
                         </PrintableContainer>
-                    </PrintableContainer>
-                ))}
+                    );
+                })}
             </PrintableContainer>
             <PrintableContainer
                 heading={strings.enablingApproachesLabel}
                 headingLevel={2}
             >
-                {enabling_approaches?.map((approach) => (
-                    <PrintableContainer
-                        key={approach.id}
-                        heading={eapApproachTitleMap?.[approach.approach]}
-                        headingLevel={3}
-                    >
-                        <PrintableContainer headingLevel={4}>
-                            <ListView layout="grid" spacing="2xs">
-                                <PrintableDataDisplay
-                                    label={strings.operationBudgetLabel}
-                                    value={approach.budget_per_approach}
-                                    valueType="number"
-                                    prefix="CHF "
-                                    strongLabel
-                                    withBackground
-                                    withPadding
-                                    withDiff={false}
-                                />
-                                <PrintableDataDisplay
-                                    label="AP Code"
-                                    value={approach.ap_code}
-                                    valueType="number"
-                                    strongLabel
-                                    withBackground
-                                    withPadding
-                                    withDiff={false}
-                                />
-                            </ListView>
-                        </PrintableContainer>
+                {enabling_approaches?.map((approach) => {
+                    const apCodeApproachValue = apCodeOptions?.approach_ap_codes
+                        ?.[approach.approach]?.join(', ');
+
+                    return (
                         <PrintableContainer
-                            heading={strings.indicatorsHeading}
+                            key={approach.id}
+                            heading={eapApproachTitleMap?.[approach.approach]}
                             headingLevel={3}
                         >
-                            <div className={styles.indicatorItems}>
-                                <Label textSize="sm" strong>
-                                    {strings.indicatorTitleLabel}
-                                </Label>
-                                <Label textSize="sm" strong>
-                                    {strings.indicatorTargetLabel}
-                                </Label>
-                                {approach.indicators.map((indicator) => (
+                            <PrintableContainer headingLevel={4}>
+                                <ListView layout="grid" spacing="2xs">
                                     <PrintableDataDisplay
-                                        key={indicator.id}
-                                        label={indicator.title}
-                                        value={indicator.target}
+                                        label={strings.operationBudgetLabel}
+                                        value={approach.budget_per_approach}
                                         valueType="number"
-                                        variant="contents"
-                                        withBackground
-                                        withPadding
-                                        withoutLabelColon
-                                        withDiff={false}
-                                    />
-                                ))}
-                            </div>
-                        </PrintableContainer>
-                        <PrintableContainer
-                            heading={strings.readinessActivitiesHeading}
-                            headingLevel={3}
-                        >
-                            <div className={styles.indicatorItems}>
-                                {approach.readiness_activities.map((activity, index) => (
-                                    <PrintableDataDisplay
-                                        key={activity.id}
-                                        label={`${index + 1}. ${activity.activity}`}
-                                        value={`${activity.time_value} ${activity.timeframe_display}`}
-                                        valueType="text"
-                                        variant="contents"
+                                        prefix="CHF "
+                                        strongLabel
                                         withBackground
                                         withPadding
-                                        withoutLabelColon
                                         withDiff={false}
                                     />
-                                ))}
-                            </div>
-                        </PrintableContainer>
-                        <PrintableContainer
-                            heading={strings.prepositioningActivitiesHeading}
-                            headingLevel={3}
-                        >
-                            <div className={styles.indicatorItems}>
-                                {approach.prepositioning_activities.map((activity, index) => (
                                     <PrintableDataDisplay
-                                        key={activity.id}
-                                        label={`${index + 1}. ${activity.activity}`}
-                                        value={`${activity.time_value} ${activity.timeframe_display}`}
+                                        label="AP Code"
+                                        value={apCodeApproachValue}
                                         valueType="text"
-                                        variant="contents"
+                                        strongLabel
                                         withBackground
                                         withPadding
-                                        withoutLabelColon
                                         withDiff={false}
                                     />
-                                ))}
-                            </div>
+                                </ListView>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.indicatorsHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    <Label textSize="sm" strong>
+                                        {strings.indicatorTitleLabel}
+                                    </Label>
+                                    <Label textSize="sm" strong>
+                                        {strings.indicatorTargetLabel}
+                                    </Label>
+                                    {approach.indicators.map((indicator) => (
+                                        <PrintableDataDisplay
+                                            key={indicator.id}
+                                            label={indicator.title}
+                                            value={indicator.target}
+                                            valueType="number"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.readinessActivitiesHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    {approach.readiness_activities.map((activity, index) => (
+                                        <PrintableDataDisplay
+                                            key={activity.id}
+                                            label={`${index + 1}. ${activity.activity}`}
+                                            value={`${activity.time_value} ${activity.timeframe_display}`}
+                                            valueType="text"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.prepositioningActivitiesHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    {approach.prepositioning_activities.map((activity, index) => (
+                                        <PrintableDataDisplay
+                                            key={activity.id}
+                                            label={`${index + 1}. ${activity.activity}`}
+                                            value={`${activity.time_value} ${activity.timeframe_display}`}
+                                            valueType="text"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
+                            <PrintableContainer
+                                heading={strings.earlyActionActivitiesHeading}
+                                headingLevel={3}
+                            >
+                                <div className={styles.indicatorItems}>
+                                    {approach.early_action_activities.map((activity, index) => (
+                                        <PrintableDataDisplay
+                                            key={activity.id}
+                                            label={`${index + 1}. ${activity.activity}`}
+                                            value={`${activity.time_value} ${activity.timeframe_display}`}
+                                            valueType="text"
+                                            variant="contents"
+                                            withBackground
+                                            withPadding
+                                            withoutLabelColon
+                                            withDiff={false}
+                                        />
+                                    ))}
+                                </div>
+                            </PrintableContainer>
                         </PrintableContainer>
-                        <PrintableContainer
-                            heading={strings.earlyActionActivitiesHeading}
-                            headingLevel={3}
-                        >
-                            <div className={styles.indicatorItems}>
-                                {approach.early_action_activities.map((activity, index) => (
-                                    <PrintableDataDisplay
-                                        key={activity.id}
-                                        label={`${index + 1}. ${activity.activity}`}
-                                        value={`${activity.time_value} ${activity.timeframe_display}`}
-                                        valueType="text"
-                                        variant="contents"
-                                        withBackground
-                                        withPadding
-                                        withoutLabelColon
-                                        withDiff={false}
-                                    />
-                                ))}
-                            </div>
-                        </PrintableContainer>
-                    </PrintableContainer>
-                ))}
+                    );
+                })}
             </PrintableContainer>
             <PrintableContainer headingLevel={3}>
                 <Link href={budget_file_details?.file}>
diff --git a/go-api b/go-api
index 77a7bd9326..ed99ed1504 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit 77a7bd932612a0e37e79805ef5367537b583cc77
+Subproject commit ed99ed1504ff108d8c74d32862b037867f66287a
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d76a9d6bbe..becf6e05c7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,9 +64,12 @@ importers:
       '@turf/buffer':
         specifier: ^6.5.0
         version: 6.5.0(patch_hash=f6b966f3d2d5a66fd961363e20ecdfad1b807ae7ba8d56eb6bd57592b3fa13af)
-      diff:
-        specifier: ^8.0.2
-        version: 8.0.2
+      '@types/diff-match-patch':
+        specifier: ^1.0.36
+        version: 1.0.36
+      diff-match-patch:
+        specifier: ^1.0.5
+        version: 1.0.5
       exceljs:
         specifier: ^4.4.0
         version: 4.4.0
@@ -2122,6 +2125,9 @@ packages:
   '@types/babel__traverse@7.20.6':
     resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==}
 
+  '@types/diff-match-patch@1.0.36':
+    resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}
+
   '@types/doctrine@0.0.9':
     resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==}
 
@@ -3365,14 +3371,13 @@ packages:
   detect-node-es@1.1.0:
     resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
 
+  diff-match-patch@1.0.5:
+    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
+
   diff-sequences@29.6.3:
     resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  diff@8.0.2:
-    resolution: {integrity: sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==}
-    engines: {node: '>=0.3.1'}
-
   dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
@@ -8325,6 +8330,8 @@ snapshots:
     dependencies:
       '@babel/types': 7.26.9
 
+  '@types/diff-match-patch@1.0.36': {}
+
   '@types/doctrine@0.0.9': {}
 
   '@types/estree@1.0.6': {}
@@ -9985,9 +9992,9 @@ snapshots:
 
   detect-node-es@1.1.0: {}
 
-  diff-sequences@29.6.3: {}
+  diff-match-patch@1.0.5: {}
 
-  diff@8.0.2: {}
+  diff-sequences@29.6.3: {}
 
   dir-glob@3.0.1:
     dependencies: