From de2866f94bb905944cc82dab64ee5d7212ad0b5d Mon Sep 17 00:00:00 2001
From: Aditya Khatri <adityakhatri47@gmail.com>
Date: Wed, 5 Mar 2025 14:43:17 +0545
Subject: [PATCH 1/3] Update strings & add fields to all dref forms

---
 .../useImportTemplateSchema.ts                |   8 -
 app/src/views/DrefApplicationExport/i18n.json |   6 +-
 .../DrefApplicationForm/Actions/i18n.json     |   8 +
 .../DrefApplicationForm/Actions/index.tsx     |  26 ++
 .../DrefApplicationForm/EventDetail/i18n.json |   9 +
 .../DrefApplicationForm/EventDetail/index.tsx |  61 +++++
 .../DrefApplicationForm/Operation/i18n.json   |  70 +++++-
 .../DrefApplicationForm/Operation/index.tsx   | 225 +++++++++++++++++-
 .../Overview/CopyFieldReportSection/i18n.json |   2 +-
 .../DrefApplicationForm/Overview/i18n.json    |   4 +-
 .../DrefApplicationForm/Overview/index.tsx    |  79 ++++--
 .../DrefApplicationForm/Submission/i18n.json  |   7 +
 .../DrefApplicationForm/Submission/index.tsx  |  50 ++++
 app/src/views/DrefApplicationForm/common.tsx  |  15 +-
 app/src/views/DrefApplicationForm/i18n.json   |   1 -
 app/src/views/DrefApplicationForm/index.tsx   |  91 ++-----
 app/src/views/DrefApplicationForm/schema.ts   |  28 ++-
 app/src/views/DrefFinalReportExport/i18n.json |   6 +-
 .../DrefFinalReportForm/EventDetail/i18n.json |   3 +
 .../DrefFinalReportForm/EventDetail/index.tsx |  24 ++
 .../EventDetail/styles.module.css             |   6 +
 .../DrefFinalReportForm/Operation/i18n.json   |  19 +-
 .../DrefFinalReportForm/Operation/index.tsx   |  95 +++++++-
 .../DrefFinalReportForm/Overview/i18n.json    |   3 +-
 .../DrefFinalReportForm/Overview/index.tsx    |  66 ++++-
 .../DrefFinalReportForm/Submission/i18n.json  |   7 +
 .../DrefFinalReportForm/Submission/index.tsx  |  50 ++++
 app/src/views/DrefFinalReportForm/common.tsx  |  17 +-
 app/src/views/DrefFinalReportForm/i18n.json   |   1 -
 app/src/views/DrefFinalReportForm/index.tsx   |  93 +++-----
 app/src/views/DrefFinalReportForm/schema.ts   |  13 +
 .../DrefOperationalUpdateExport/i18n.json     |   8 +-
 .../DrefOperationalUpdateExport/index.tsx     |   9 +-
 .../EventDetail/i18n.json                     |   7 +-
 .../EventDetail/index.tsx                     |  38 ++-
 .../EventDetail/styles.module.css             |   6 +
 .../Operation/i18n.json                       |  28 ++-
 .../Operation/index.tsx                       | 126 +++++++++-
 .../Overview/i18n.json                        |   4 +-
 .../Overview/index.tsx                        |  94 +++++---
 .../Submission/i18n.json                      |   7 +
 .../Submission/index.tsx                      |  50 ++++
 .../DrefOperationalUpdateForm/common.tsx      |  17 +-
 .../views/DrefOperationalUpdateForm/i18n.json |   5 +-
 .../views/DrefOperationalUpdateForm/index.tsx |  98 ++------
 .../views/DrefOperationalUpdateForm/schema.ts |  37 ++-
 46 files changed, 1263 insertions(+), 364 deletions(-)

diff --git a/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts b/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts
index 782036812b..2777df95fe 100644
--- a/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts
+++ b/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts
@@ -199,14 +199,6 @@ function useImportTemplateSchema() {
                 validation: 'string',
             },
 
-            emergency_appeal_planned: {
-                type: 'select',
-                label: 'Emergency appeal planned',
-                optionsKey: '__boolean',
-                validation: 'boolean',
-                description: 'Select <b>Yes</b> or <b>No</b> from the drop-down list.',
-            },
-
             // EVENT DETAIL
 
             did_it_affect_same_area: {
diff --git a/app/src/views/DrefApplicationExport/i18n.json b/app/src/views/DrefApplicationExport/i18n.json
index 3417b09725..70710540e1 100644
--- a/app/src/views/DrefApplicationExport/i18n.json
+++ b/app/src/views/DrefApplicationExport/i18n.json
@@ -21,7 +21,7 @@
         "monthsSuffix": " months",
         "operationEndDateLabel": "Operation End Date",
         "drefPublishedLabel": "DREF Published",
-        "targetedAreasLabel": "Targeted Areas",
+        "targetedAreasLabel": "Targeted Regions",
         "eventDescriptionSectionHeading": "Description of the Event",
         "approximateDateOfImpactHeading": "Approximate date of impact",
         "whatWhereWhenSectionHeading": "What happened, where and when?",
@@ -67,8 +67,8 @@
         "ruralLabel": "Rural",
         "urbanLabel": "Urban",
         "peopleWithDisabilitiesLabel": "People with disabilities (estimated)",
-        "riskAndSecuritySectionHeading": "Risk and Security Considerations",
-        "riskSecurityHeading": "Please indicate about potential operation risk for this operations and mitigation actions",
+        "riskAndSecuritySectionHeading": "Risk and Security Considerations (including \"management\")",
+        "riskSecurityHeading": "Please analyse and indicate potential risks for this operation, its root causes and mitigation actions.",
         "safetyConcernHeading": "Please indicate any security and safety concerns for this operation",
         "hasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
         "plannedInterventionSectionHeading": "Planned Intervention",
diff --git a/app/src/views/DrefApplicationForm/Actions/i18n.json b/app/src/views/DrefApplicationForm/Actions/i18n.json
index 845bbd444d..c86ead0232 100644
--- a/app/src/views/DrefApplicationForm/Actions/i18n.json
+++ b/app/src/views/DrefApplicationForm/Actions/i18n.json
@@ -10,6 +10,12 @@
         "drefFormDidNationalSocietyStartedImminent": "Did the National Society started any anticipatory actions?",
         "drefFormDidNationalSocietyStartedSlow": "Has the National Society started any actions?",
         "drefFormGapsInAssessment": "Any identified gaps/limitations in the assessment",
+        "drefFormGapsInAssessmentDescriptionHeading": "Consider the following:",
+        "drefFormGapsInAssessmentDescriptionPoint1": "Unmet needs: are there specific sectors (e.g., shelter, WASH, health) where needs remain unmet or only partially addressed?",
+        "drefFormGapsInAssessmentDescriptionPoint2": "Resource shortages: highlight any shortages in available resources (e.g., funding, personnel, supplies) that limit the ability to meet the identified needs.",
+        "drefFormGapsInAssessmentDescriptionPoint3": "Operational challenges: mention any operational constraints that are preventing a full response to the needs (e.g., logistical issues, insufficient capacity).",
+        "drefFormGapsInAssessmentDescriptionPoint4": "Coordination issues: note any challenges in coordinating with other actors or agencies that have resulted in gaps in service delivery or response coverage.",
+        "drefFormGapsInAssessmentDescriptionPoint5": "Vulnerable groups: identify any specific vulnerable groups whose needs may not have been fully captured or addressed during the assessment (e.g., displaced persons, elderly, people with disabilities).",
         "drefFormIcrc": "ICRC",
         "drefFormIcrcDescription": "Presence or not of ICRC in country, and support directly provided for this emergency response. Other programs and support provided outside of the scope of this emergency should not be indicated here.",
         "drefFormIfrc": "IFRC",
@@ -19,6 +25,7 @@
         "ifrcNetworkActionsHeading": "IFRC Network Actions Related To The Current Event",
         "icrcActionsHeading": "ICRC Actions Related To The Current Event",
         "drefFormNationalAuthorities": "National authorities",
+        "drefFormNationalAuthoritiesDescription": "Brief description of actions taken by the national authorities.",
         "drefFormNationalOtherActors": "Other Actors Actions Related To The Current Event",
         "drefFormNationalSocietiesActions": "Current National Society Actions",
         "drefFormNationalSocietiesActionsDescription": "Please indicate a description of the ongoing response with if possible: Branches involved, number of volunteers/staff involved in actions, assets deployed/distributed, number of people reach. Impact/added value of the NS in the response already ongoing.",
@@ -29,6 +36,7 @@
         "drefFormPartnerNationalSociety": "Participating National Societies",
         "drefFormPartnerNationalSocietyDescription": "Briefly set out which PNS are present and give details of PNS contributions/roles on the ground and remotely for this specific operation",
         "drefFormUNorOtherActors": "UN or other actors",
+        "drefFormUNorOtherActorsDescription": "Brief description of actions taken by the UN or other actors.",
         "drefFormAddButton": "Add"
     }
 }
diff --git a/app/src/views/DrefApplicationForm/Actions/index.tsx b/app/src/views/DrefApplicationForm/Actions/index.tsx
index 68615ecd44..83587f6161 100644
--- a/app/src/views/DrefApplicationForm/Actions/index.tsx
+++ b/app/src/views/DrefApplicationForm/Actions/index.tsx
@@ -333,6 +333,7 @@ function Actions(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormNationalAuthorities}
+                    description={strings.drefFormNationalAuthoritiesDescription}
                 >
                     <TextArea
                         label={strings.drefFormActionDescription}
@@ -345,6 +346,7 @@ function Actions(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormUNorOtherActors}
+                    description={strings.drefFormUNorOtherActorsDescription}
                 >
                     <TextArea
                         label={strings.drefFormActionDescription}
@@ -454,6 +456,30 @@ function Actions(props: Props) {
                     {value?.type_of_dref !== TYPE_IMMINENT && (
                         <InputSection
                             title={strings.drefFormGapsInAssessment}
+                            description={(
+                                <>
+                                    <p>
+                                        {strings.drefFormGapsInAssessmentDescriptionHeading}
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint4}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint5}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormActionDescription}
diff --git a/app/src/views/DrefApplicationForm/EventDetail/i18n.json b/app/src/views/DrefApplicationForm/EventDetail/i18n.json
index 2a6bd2801c..d7c4ea00f2 100644
--- a/app/src/views/DrefApplicationForm/EventDetail/i18n.json
+++ b/app/src/views/DrefApplicationForm/EventDetail/i18n.json
@@ -13,6 +13,11 @@
         "drefFormPeopleInNeed": "People in need (Optional)",
         "drefFormPeopleAffected": "Total affected population",
         "drefFormRiskPeopleLabel": "Total population at risk",
+        "drefFormAffectedMaleLabel": "Estimated male",
+        "drefFormAffectedFemaleLabel": "Estimated female",
+        "drefFormAffectedMinorsLabel": "Estimated minors",
+        "drefFormChildSafeguardingRiskAnalysisTitle": "Did you complete the Child Safeguarding Risk Analysis in previous operations, what was risk level?",
+        "drefFormChildSafeguardingRiskLevelLabel": "Risk Level",
         "drefFormPeopleInNeedDescriptionImminent": "Include all those whose physical security, basic rights, dignity, living conditions or livelihoods are threatened or have been disrupted, and whose current level of access to basic services, goods and social protection will be inadequate to re-establish normal living conditions without additional assistance",
         "drefFormPeopleInNeedDescriptionSlowSudden": "People in Need (PIN) are those members whose physical security, basic rights, dignity, living conditions or livelihoods are threatened or have been disrupted, and whose current level of access to basic services, goods and social protection is inadequate to re-establish normal living conditions without additional assistance.",
         "drefFormPeopleAffectedDescriptionImminent": "Includes all those whose lives and livelihoods are at risk as a direct result of the shock or stress.",
@@ -36,6 +41,10 @@
         "drefFormUploadSupportingDocumentButtonLabel": "Upload document",
         "drefFormUploadSupportingDocumentDescription": "Here the National Society can upload documentation that substantiates their decision to launch this operation now. For example: seasonal outlooks, forecast information, reports from credible sources...etc.",
         "drefFormWhatWhereWhen": "What happened, where and when?",
+        "drefFormWhatWhereWhenDescriptionHeading": "Clearly Describe:",
+        "drefFormWhatWhereWhenDescriptionPoint1": "What happened: Briefly explain the nature of the emergency (e.g., flood, earthquake, epidemic). Include key details such as the intensity, and any unique aspects of the event.",
+        "drefFormWhatWhereWhenDescriptionPoint2": "Where: Specify the geographic location(s) affected. Be as precise as possible, including names of countries, regions, cities, or specific areas impacted by the event.",
+        "drefFormWhatWhereWhenDescriptionPoint3": "When: Indicate the date and time when the event occurred or began. If the situation is ongoing, mention that and provide relevant updates on the timeframe.",
         "drefOperationalLearningPlatformLabel": "To access the Operational Learning Dashboard and check learnings for the country, {clickHereLink}",
         "clickHereLinkLabel": "Click Here",
         "drefFormSelectImages": "Select images",
diff --git a/app/src/views/DrefApplicationForm/EventDetail/index.tsx b/app/src/views/DrefApplicationForm/EventDetail/index.tsx
index 89fed32cb5..f20575f2d6 100644
--- a/app/src/views/DrefApplicationForm/EventDetail/index.tsx
+++ b/app/src/views/DrefApplicationForm/EventDetail/index.tsx
@@ -249,6 +249,25 @@ function EventDetail(props: Props) {
                             disabled={disabled}
                         />
                     </InputSection>
+                    <InputSection
+                        title={strings.drefFormChildSafeguardingRiskAnalysisTitle}
+                    >
+                        <BooleanInput
+                            name="complete_child_safeguarding_risk"
+                            value={value.complete_child_safeguarding_risk}
+                            onChange={setFieldValue}
+                            error={error?.complete_child_safeguarding_risk}
+                            disabled={disabled}
+                        />
+                        <TextArea
+                            label={strings.drefFormChildSafeguardingRiskLevelLabel}
+                            name="child_safeguarding_risk_level"
+                            onChange={setFieldValue}
+                            value={value.child_safeguarding_risk_level}
+                            error={error?.child_safeguarding_risk_level}
+                            disabled={disabled}
+                        />
+                    </InputSection>
                 </Container>
             )}
             <Container
@@ -355,6 +374,30 @@ function EventDetail(props: Props) {
                             disabled={disabled}
                         />
                     )}
+                    <NumberInput
+                        name="estimated_number_of_affected_male"
+                        label={strings.drefFormAffectedMaleLabel}
+                        value={value?.estimated_number_of_affected_male}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_male}
+                        disabled={disabled}
+                    />
+                    <NumberInput
+                        name="estimated_number_of_affected_female"
+                        label={strings.drefFormAffectedFemaleLabel}
+                        value={value?.estimated_number_of_affected_female}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_female}
+                        disabled={disabled}
+                    />
+                    <NumberInput
+                        name="estimated_number_of_affected_minors"
+                        label={strings.drefFormAffectedMinorsLabel}
+                        value={value?.estimated_number_of_affected_minors}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_minors}
+                        disabled={disabled}
+                    />
                     {/* FIXME: use grid to fix the empty div issue */}
                     {/* NOTE: Empty div to preserve the layout */}
                     <div />
@@ -366,6 +409,24 @@ function EventDetail(props: Props) {
                                 ? strings.drefFormWhatWhereWhen
                                 : strings.drefFormImminentDisaster
                         }
+                        description={value.type_of_dref !== TYPE_IMMINENT && (
+                            <>
+                                <p>
+                                    {strings.drefFormWhatWhereWhenDescriptionHeading}
+                                </p>
+                                <ol>
+                                    <li>
+                                        {strings.drefFormWhatWhereWhenDescriptionPoint1}
+                                    </li>
+                                    <li>
+                                        {strings.drefFormWhatWhereWhenDescriptionPoint2}
+                                    </li>
+                                    <li>
+                                        {strings.drefFormWhatWhereWhenDescriptionPoint3}
+                                    </li>
+                                </ol>
+                            </>
+                        )}
                     >
                         <TextArea
                             name="event_description"
diff --git a/app/src/views/DrefApplicationForm/Operation/i18n.json b/app/src/views/DrefApplicationForm/Operation/i18n.json
index 8eb2992131..83521dab4c 100644
--- a/app/src/views/DrefApplicationForm/Operation/i18n.json
+++ b/app/src/views/DrefApplicationForm/Operation/i18n.json
@@ -9,16 +9,49 @@
         "drefFormPeopleTargetedWithEarlyActions": "Numbers of persons targeted with early actions (if any)",
         "drefFormPlannedIntervention": "Planned Intervention",
         "drefFormRequestAmount": "Requested Amount in CHF",
+        "drefFormRequestAmountDescription": "General funding requested to fund the interventions.",
+        "drefFormRequestAmountDescriptionWithIntervention": "List specific activities that will be carried out as part of the intervention in each sector. The activities should directly address the identified needs and align with the operation’s strategic objectives.",
+        "drefFormRequestAmountDescriptionPoint1": "What specific actions will be taken in this sector to meet the identified needs?” Start by choosing indicators from the IFRC indicator databank [link] whenever possible. This makes it easier to compare and analyse results across all emergency operations.",
+        "drefFormRequestAmountDescriptionPoint2": "Pick indicators that align with the planned activities. This ensures that the indicators accurately reflect the actions being taken on the ground. Missing important indicators could mean missed chances to showcase the positive impact of the work being done.",
+        "drefFormRequestAmountDescriptionPoint3": "Keep in mind that more indicators can mean more work. Each indicator selected requires monitoring, tracking, and reporting, so be sure to choose the ones that best reflect the key outcomes of your actions.",
+        "drefFormRequestAmountDescriptionPoint4": "Consider the type of indicator unit. For example, it’s often simpler and clearer to track and report on the “number of people” rather than a “percentage of people.”",
+        "drefFormRequestAmountDescriptionPoint5": "For each indicator, set a target. This helps track progress and measure whether the operation is achieving its key objectives, making it easier to report results later on.",
         "drefFormPmer": "How will this operation be monitored?",
-        "drefFormPmerDescription": "Will there be IFRC monitoring visits? How will it be deployed?",
+        "drefFormPmerDescription": "Describe the mechanisms that will be used to track the progress and effectiveness of the operation.",
+        "drefFormPmerDescriptionPoint1": "What systems will be used to monitor the operation’s activities and outcomes?",
+        "drefFormPmerDescriptionPoint2": "How will progress be tracked, and who will be responsible for monitoring?",
+        "drefFormPmerDescriptionPoint3": "What indicators or milestones will be used to assess the success of the operation?",
+        "drefFormPmerDescriptionPoint4": "Will there be IFRC monitoring visits? How will it be deployed?",
         "drefFormResponseRationale": "Operation strategy rationale",
-        "drefFormResponseRationaleDescription": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
+        "drefFormResponseRationaleDescription": "Elaborate on the overall plan, strategy and approach of the operation; explain the reasoning behind the chosen strategy for the emergency operation. Explain how the identified needs/gaps and actions taken/plans are linked.",
+        "drefFormResponseRationaleDescriptionPoint1": "Highlight the most urgent needs the operation aims to address.",
+        "drefFormResponseRationaleDescriptionPoint2": "Describe the main priorities and explain why these priorities were chosen based on the specific context of the emergency.",
+        "drefFormResponseRationaleDescriptionPoint3": "Justify why particular methods and actions were selected and how they are expected to achieve the desired outcomes.",
+        "drefFormResponseRationaleDescriptionPoint4": "Include any key factors that influence the strategy; mention how these factors were considered in shaping the operation.",
+        "drefFormResponseRationaleForAssessment": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
         "drefFormResponseRationalePlaceholder": "To address the needs of the targeted population, this DREF will aim at (please briefly describe the planned activities).",
-        "drefFormRiskSecurity": "Risk and security considerations",
+        "drefFormRiskSecurity": "Risk and Security Considerations (including \"management\")",
+        "drefFormRiskDoesNSHaveAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
+        "drefFormRiskDoesNSHaveSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
+        "drefFormRiskDoesNSHaveChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
+        "drefFormRiskDoesNSHaveWhistleblowerPolicy": "Does your National Society have whistleblower protection policy?",
+        "drefFormRiskDoesNSHaveAntiSexualHarassmentPolicy": "Does your National Society have anti-sexual harassment policy?",
         "drefFormRiskSecurityAddButton": "Add New Risk",
-        "drefFormRiskSecurityPotentialRisk": "Please indicate about potential operational risk for this operations and mitigation actions",
-        "drefFormRiskSecurityPotentialRiskDescription": "Please consider any possible challenges to conduct the assessment, any possible limitations in getting the information required and overall risk to the implementation",
+        "drefFormRiskSecurityPotentialRisk": "Please analyse and indicate potential risks for this operation, its root causes and mitigation actions.",
+        "drefFormRiskSecurityPotentialRiskAssessmentDescription": "Please consider any possible challenges to conduct the assessment, any possible limitations in getting the information required and overall risk to the implementation",
+        "drefFormRiskSecurityRiskCategoriesLinkLabel": "Annex III - Risk Categories.pdf",
+        "drefFormRiskSecurityPotentialRiskDescription": "When identifying the risks, please review the IFRC Risk Management Policy and Framework including the different risk categories. When possible, make sure that your identification of risks includes some analysis of previous incidents and performance of the NS in previous operations.",
+        "drefFormRiskSecurityRiskSelectedDescription": "Identify up to 5 key potential risks or threats that could negatively impact the success of the operation. These can range from environmental risks to social or logistical challenges.",
+        "drefFormRiskSecurityRiskSelectedPoint1": "What are the primary risks that could affect the operation’s implementation?",
+        "drefFormRiskSecurityRiskSelectedPoint2": "Are there any context-specific risks that need to be considered?",
+        "drefFormRiskSecurityRiskSelectedPoint3": "How might these risks impact the operation’s objectives, timeline, or resources? Mitigation actions are actions or strategies that will be implemented to reduce or manage the identified risks, ensuring the operation can proceed as planned.",
+        "drefFormRiskSecurityRiskSelectedPoint4": "What specific measures or strategies will be put in place to mitigate the risks identified?",
+        "drefFormRiskSecurityRiskSelectedPoint5": "Will contingency plans or additional resources be required to address these risks?",
         "drefFormRiskSecuritySafetyConcern": "Please indicate any security and safety concerns for this operation",
+        "drefFormRiskSecuritySafetyConcernDescription": "Describe any specific security or safety threats that could impact the safety of personnel, volunteers, and communities during the operation.",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint1": "Are there any security concerns related to the areas where the operation will take place (e.g., conflict zones, high-crime areas)",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint2": "What safety risks could impact the well-being of staff, volunteers, or beneficiaries (e.g., dangerous terrain, health risks)?",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint3": "Are there any specific security protocols or measures that need to be established or followed during the operation?",
         "drefFormRiskSecurityHasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
         "drefFormRiskSecurityHasChildRiskCompletedDescription":"The IFRC Child Safeguarding Risk Analysis helps Operations quickly identify and rate their key child safeguarding risks in order to reduce the risk of harm against children, as outlined as a requirement in the IFRC Child Safeguarding Policy. Here are the link to the tool and Q&A",
         "drefChildSafeguardingPolicyDescription":"Child Safeguarding Policy",
@@ -27,7 +60,10 @@
         "drefFormSelectionCriteriaDescription": "Explain the rational and logic behind which groups are being targeted and why and address vulnerable groups",
         "drefFormSupportServices": "About Support Services",
         "drefFormSurgePersonnelDeployed": "Will surge personnel be deployed?",
-        "drefFormSurgePersonnelDeployedDescription": "Please provide the role profile needed.",
+        "drefFormSurgePersonnelDeployedDescriptionPoint1": "Describe the skills and qualifications/profile of the surge personnel or any additional staff (to be) deployed specifically for the operation.",
+        "drefFormSurgePersonnelDeployedDescriptionPoint2": "What expertise or skill sets are required for the personnel being deployed?",
+        "drefFormSurgePersonnelDeployedDescriptionPoint3": "What roles will these personnel fulfil?",
+        "drefFormSurgePersonnelDeployedDescriptionPoint4": "Are there specific tasks or sectors they will be managing?",
         "drefFormTargetedPopulation": "Targeted Population",
         "drefFormTargetingStrategy": "Targeting Strategy",
         "drefFormTotal": "Total Population",
@@ -39,7 +75,11 @@
         "drefFormBudgetTemplateLabel": "Budget template",
         "drefFormBudgetTemplateUploadButtonLabel": "Upload your budget summary",
         "drefFormCommunication": "Please briefly explain the National Societies communication strategy for this operation.",
-        "drefFormCommunicationDescription": "Will the IFRC be supporting with communication? What roles will be involved?",
+        "drefFormCommunicationDescription": "Describe how the National Society will manage internal and external communication throughout the operation.",
+        "drefFormCommunicationDescriptionPoint1": "What communication channels will be used to share information internally among teams and externally with stakeholders, partners, and the public?",
+        "drefFormCommunicationDescriptionPoint2": "How will the National Society ensure transparent and effective communication with the affected communities?",
+        "drefFormCommunicationDescriptionPoint3": "Is there a media strategy in place for external communication, such as press releases or social media updates?",
+        "drefFormCommunicationDescriptionPoint4": "Will the IFRC be supporting with communication? What roles will be involved?",
         "drefFormOperationDescription": "Description",
         "drefFormEstimatedDisplacedPeople": "Estimated Number of People on the move (if any)",
         "drefFormEstimatedLocal": "Rural",
@@ -48,10 +88,22 @@
         "drefFormEstimatePeopleDisability": "Estimated Percentage People with Disability",
         "drefFormEstimateResponse": "Estimate",
         "drefFormGirls": "Girls (under 18)",
-        "drefFormHumanResourceDescription": "How many staff and volunteers will be involved in this operation. Briefly describe their role.",
+        "drefFormHumanResourceTitle": "How many staff and volunteers will be involved in this operation.",
+        "drefFormHumanResourceDescription": "A brief description of the human resources that will be engaged in the operation, including both staff and volunteers.",
+        "drefFormHumanResourceDescriptionPoint1": "How many staff members and volunteers are expected to participate?",
+        "drefFormHumanResourceDescriptionPoint2": "What specific roles or responsibilities will they have during the operation?",
+        "drefFormHumanResourceDescriptionPoint3": "Are there any key leadership positions or coordinators overseeing the activities?",
+        "drefFormIsVolunteerTeamDiverseTitle": "Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
+        "drefFormIsVolunteerTeamDiverseDescription": "This question is about making sure your team includes the right mix of people to best support those affected. For example, if you’re helping single female heads of households, it’s important to have enough female volunteers to make everyone feel comfortable and understood. Including team members who share the same language or cultural background as the people you’re helping can also make a big difference in building trust and providing effective support.",
+        "drefFormIsVolunteerTeamDiverseLabel": "Description",
         "drefFormInterventionsLabel": "Select the interventions that apply.",
         "drefFormLogisticCapacityOfNs": "If there is procurement, will it be done by National Society or IFRC?",
-        "drefFormLogisticCapacityOfNsDescription": "Will it be for replenishment or for distribution? If for distribution, how long is the tendering expected to take? For Cash and Voucher Assistance, what is the status of the Financial Service Provider?",
+        "drefFormLogisticCapacityOfNsDescription": "Explain the responsibility for procurement activities during the operation.",
+        "drefFormLogisticCapacityOfNsDescriptionPoint1": "Who will be responsible for procurement (National Society or IFRC)?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint2": "Will procurement involve local or international suppliers?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint3": "Will it be for replenishment or for distribution?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint4": "If for distribution, how long is the tendering expected to take?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint5": "For Cash and Voucher Assistance, what is the status of the Financial Service Provider?”",
         "drefFormMen": "Men",
         "drefFormTotalTargeted": "Total targeted population is different from that in Operation Overview",
         "drefFormTotalTargetedPopulation": "Total targeted population is not equal to sum of other population fields",
diff --git a/app/src/views/DrefApplicationForm/Operation/index.tsx b/app/src/views/DrefApplicationForm/Operation/index.tsx
index 57afafdb9c..dda6ac8a50 100644
--- a/app/src/views/DrefApplicationForm/Operation/index.tsx
+++ b/app/src/views/DrefApplicationForm/Operation/index.tsx
@@ -225,8 +225,33 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormResponseRationale}
-                    description={value?.type_of_dref === TYPE_ASSESSMENT
-                        && strings.drefFormResponseRationaleDescription}
+                    description={(
+                        <>
+                            <p>
+                                {strings.drefFormResponseRationaleDescription}
+                            </p>
+                            <ul>
+                                {/* FIXME: Add indicator databank link */}
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint3}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint4}
+                                </li>
+                                {value?.type_of_dref === TYPE_ASSESSMENT && (
+                                    <li>
+                                        {strings.drefFormResponseRationaleForAssessment}
+                                    </li>
+                                )}
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         name="response_strategy"
@@ -409,8 +434,44 @@ function Operation(props: Props) {
             >
                 <InputSection
                     title={strings.drefFormRiskSecurityPotentialRisk}
-                    description={value?.type_of_dref === TYPE_ASSESSMENT
-                        && strings.drefFormRiskSecurityPotentialRiskDescription}
+                    description={(
+                        <>
+                            {value?.type_of_dref === TYPE_ASSESSMENT
+                                && strings.drefFormRiskSecurityPotentialRiskAssessmentDescription}
+                            {strings.drefFormRiskSecurityPotentialRiskDescription}
+                            <Link
+                                href="https://github.com/user-attachments/files/18903662/Annex.III.Risk.Categories.1.pdf"
+                                withLinkIcon
+                                external
+                            >
+                                {strings.drefFormRiskSecurityRiskCategoriesLinkLabel}
+                            </Link>
+                            {(value.risk_security?.length ?? 0) > 0 && (
+                                <>
+                                    <p>
+                                        {strings.drefFormRiskSecurityRiskSelectedDescription}
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint4}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint5}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
+                        </>
+                    )}
                 >
                     <NonFieldError error={getErrorObject(error?.risk_security)} />
                     {value.risk_security?.map((rs, i) => (
@@ -437,6 +498,24 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormRiskSecuritySafetyConcern}
+                    description={(
+                        <>
+                            <p>
+                                {strings.drefFormRiskSecuritySafetyConcernDescription}
+                            </p>
+                            <ul>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint3}
+                                </li>
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         name="risk_security_concern"
@@ -498,6 +577,30 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormRequestAmount}
+                    description={(
+                        <>
+                            {strings.drefFormRequestAmountDescription}
+                            {(value?.planned_interventions?.length ?? 0) > 0 && (
+                                <>
+                                    {strings.drefFormRequestAmountDescriptionWithIntervention}
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormRequestAmountDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRequestAmountDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRequestAmountDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRequestAmountDescriptionPoint4}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
+                        </>
+                    )}
                     numPreferredColumns={2}
                 >
                     <NumberInput
@@ -557,7 +660,23 @@ function Operation(props: Props) {
                 heading={strings.drefFormSupportServices}
             >
                 <InputSection
-                    title={strings.drefFormHumanResourceDescription}
+                    title={strings.drefFormHumanResourceTitle}
+                    description={(
+                        <>
+                            {strings.drefFormHumanResourceDescription}
+                            <ul>
+                                <li>
+                                    {strings.drefFormHumanResourceDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormHumanResourceDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormHumanResourceDescriptionPoint3}
+                                </li>
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         label={strings.drefFormOperationDescription}
@@ -568,11 +687,37 @@ function Operation(props: Props) {
                         disabled={disabled}
                     />
                 </InputSection>
+                <InputSection
+                    title={strings.drefFormIsVolunteerTeamDiverseTitle}
+                    description={strings.drefFormIsVolunteerTeamDiverseDescription}
+                >
+                    <TextArea
+                        name="is_volunteer_team_diverse"
+                        label={strings.drefFormIsVolunteerTeamDiverseLabel}
+                        value={value.is_volunteer_team_diverse}
+                        onChange={setFieldValue}
+                        error={error?.is_volunteer_team_diverse}
+                        disabled={disabled}
+                    />
+                </InputSection>
                 <InputSection
                     title={strings.drefFormSurgePersonnelDeployed}
-                    description={value?.is_surge_personnel_deployed
-                        ? strings.drefFormSurgePersonnelDeployedDescription
-                        : undefined}
+                    description={value?.is_surge_personnel_deployed && (
+                        <ul>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint1}
+                            </li>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint2}
+                            </li>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint3}
+                            </li>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint4}
+                            </li>
+                        </ul>
+                    )}
                 >
                     <BooleanInput
                         name="is_surge_personnel_deployed"
@@ -588,7 +733,6 @@ function Operation(props: Props) {
                             onChange={setFieldValue}
                             value={value.surge_personnel_deployed}
                             error={error?.surge_personnel_deployed}
-                            placeholder={strings.drefFormSurgePersonnelDeployedDescription}
                             disabled={disabled}
                         />
                     )}
@@ -597,7 +741,28 @@ function Operation(props: Props) {
                     <>
                         <InputSection
                             title={strings.drefFormLogisticCapacityOfNs}
-                            description={strings.drefFormLogisticCapacityOfNsDescription}
+                            description={(
+                                <>
+                                    {strings.drefFormLogisticCapacityOfNsDescription}
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint4}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint5}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormOperationDescription}
@@ -610,7 +775,25 @@ function Operation(props: Props) {
                         </InputSection>
                         <InputSection
                             title={strings.drefFormPmer}
-                            description={strings.drefFormPmerDescription}
+                            description={(
+                                <>
+                                    {strings.drefFormPmerDescription}
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint4}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormOperationDescription}
@@ -623,7 +806,25 @@ function Operation(props: Props) {
                         </InputSection>
                         <InputSection
                             title={strings.drefFormCommunication}
-                            description={strings.drefFormCommunicationDescription}
+                            description={(
+                                <>
+                                    {strings.drefFormCommunicationDescription}
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint4}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormOperationDescription}
diff --git a/app/src/views/DrefApplicationForm/Overview/CopyFieldReportSection/i18n.json b/app/src/views/DrefApplicationForm/Overview/CopyFieldReportSection/i18n.json
index 0f623bf184..e50e97a59d 100644
--- a/app/src/views/DrefApplicationForm/Overview/CopyFieldReportSection/i18n.json
+++ b/app/src/views/DrefApplicationForm/Overview/CopyFieldReportSection/i18n.json
@@ -3,7 +3,7 @@
     "strings": {
         "drefFormCopyFRSuccessMessage": "Successfully copied some data from the selected field report",
         "drefFormEventDetailsTitle": "Import data from existing field report",
-        "drefFormEventDescription": "These field reports have already been filtered by the National Society that you have selected. Selecting a field report will pre-fill matching fields in this request, which you can modify.",
+        "drefFormEventDescription": "If a field report related to this event/operation already exists, you can use it to pre-fill matching fields in this request. To do so, select the relevant field report from the drop-down list and click “Copy”.",
         "drefFormSelectFieldReportPlaceholder": "Select field report",
         "drefFormCopyButtonLabel": "Copy"
     }
diff --git a/app/src/views/DrefApplicationForm/Overview/i18n.json b/app/src/views/DrefApplicationForm/Overview/i18n.json
index 500efa86cc..1cf2b31f59 100644
--- a/app/src/views/DrefApplicationForm/Overview/i18n.json
+++ b/app/src/views/DrefApplicationForm/Overview/i18n.json
@@ -7,6 +7,7 @@
         "drefFormInstantShareLabel": "Share",
         "drefFormEssentialInformation": "Essential Information",
         "drefFormNationalSociety": "Name of National Society",
+        "drefFormNationalSocietyDescription": "Indicate your National Society by selecting it from the drop-down list.",
         "drefFormTypeOfDref": "Type of DREF",
         "drefFormImminentDisasterDetails": "Hazard Details",
         "drefFormDisasterDetails": "Disaster Details",
@@ -14,6 +15,7 @@
         "drefFormDisasterTypeLabel": "Type of Disaster",
         "drefFormTypeOfOnsetLabel": "Type of Onset",
         "drefFormManMadeEvent": "Is this a man made event?",
+        "formShareButtonLabel": "Add",
         "drefFormImminentDisasterCategoryLabel": "Disaster Category (Optional)",
         "drefFormDisasterCategoryLabel": "Disaster Category",
         "drefFormAffectedCountryAndProvinceImminent": "Affected Country and Affected Region(s)",
@@ -34,4 +36,4 @@
         "drefFormUploadCrisisDocument": "If available please upload Crisis categorization Analysis",
         "drefFormUploadDocumentButtonLabel": "Upload document"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/views/DrefApplicationForm/Overview/index.tsx b/app/src/views/DrefApplicationForm/Overview/index.tsx
index 4bac7ab80c..7afb42550f 100644
--- a/app/src/views/DrefApplicationForm/Overview/index.tsx
+++ b/app/src/views/DrefApplicationForm/Overview/index.tsx
@@ -3,7 +3,11 @@ import {
     type SetStateAction,
     useCallback,
 } from 'react';
-import { WikiHelpSectionLineIcon } from '@ifrc-go/icons';
+import { useParams } from 'react-router-dom';
+import {
+    ShareLineIcon,
+    WikiHelpSectionLineIcon,
+} from '@ifrc-go/icons';
 import {
     BooleanInput,
     Button,
@@ -13,9 +17,15 @@ import {
     SelectInput,
     TextInput,
 } from '@ifrc-go/ui';
-import { useTranslation } from '@ifrc-go/ui/hooks';
+import {
+    useBooleanState,
+    useTranslation,
+} from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
-import { isNotDefined } from '@togglecorp/fujs';
+import {
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
 import {
     type EntriesAsList,
     type Error,
@@ -26,6 +36,7 @@ import {
 import CountrySelectInput from '#components/domain/CountrySelectInput';
 import DisasterTypeSelectInput from '#components/domain/DisasterTypeSelectInput';
 import DistrictSearchMultiSelectInput, { type DistrictItem } from '#components/domain/DistrictSearchMultiSelectInput';
+import DrefShareModal from '#components/domain/DrefShareModal';
 import UserItem from '#components/domain/DrefShareModal/UserItem';
 import { type FieldReportItem as FieldReportSearchItem } from '#components/domain/FieldReportSearchSelectInput';
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
@@ -36,11 +47,15 @@ import Link from '#components/Link';
 import useCountry from '#hooks/domain/useCountry';
 import useDisasterType from '#hooks/domain/useDisasterType';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
+import useInputState from '#hooks/useInputState';
 import {
     DISASTER_CATEGORY_ORANGE,
     DISASTER_CATEGORY_RED,
 } from '#utils/constants';
-import { type GoApiResponse } from '#utils/restRequest';
+import {
+    type GoApiResponse,
+    useRequest,
+} from '#utils/restRequest';
 
 import {
     DISASTER_FIRE,
@@ -84,7 +99,6 @@ interface Props {
 
     fieldReportOptions: FieldReportSearchItem[] | null | undefined;
     setFieldReportOptions: Dispatch<SetStateAction<FieldReportSearchItem[] | null | undefined>>;
-    drefUsers?: User[] | null;
 }
 
 const userKeySelector = (item: User) => item.id;
@@ -101,7 +115,6 @@ function Overview(props: Props) {
         setDistrictOptions,
         fieldReportOptions,
         setFieldReportOptions,
-        drefUsers,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -113,6 +126,8 @@ function Overview(props: Props) {
     } = useGlobalEnums();
 
     const countryOptions = useCountry();
+    const { drefId } = useParams<{ drefId: string }>();
+    const [drefUsers, setDrefUsers] = useInputState<User[] | undefined | null>([]);
 
     const disasterTypes = useDisasterType();
 
@@ -160,6 +175,29 @@ function Overview(props: Props) {
     }), []);
 
     const error = getErrorObject(formError);
+    const [showShareModal, {
+        setTrue: setShowShareModalTrue,
+        setFalse: setShowShareModalFalse,
+    }] = useBooleanState(false);
+
+    const {
+        retrigger: getDrefUsers,
+    } = useRequest({
+        skip: isNotDefined(drefId),
+        url: '/api/v2/dref-share-user/{id}/',
+        pathVariables: { id: Number(drefId) },
+        onSuccess: (response) => {
+            setDrefUsers(response.users_details);
+        },
+    });
+
+    const handleUserShareSuccess = useCallback(() => {
+        setShowShareModalFalse();
+        getDrefUsers();
+    }, [
+        getDrefUsers,
+        setShowShareModalFalse,
+    ]);
 
     return (
         <div className={styles.operationOverview}>
@@ -185,6 +223,21 @@ function Overview(props: Props) {
                         pending={false}
                         compact
                     />
+                    <Button
+                        name={undefined}
+                        onClick={setShowShareModalTrue}
+                        variant="secondary"
+                        icons={<ShareLineIcon />}
+                    >
+                        {strings.formShareButtonLabel}
+                    </Button>
+                    {showShareModal && isDefined(drefId) && (
+                        <DrefShareModal
+                            onCancel={setShowShareModalFalse}
+                            onSuccess={handleUserShareSuccess}
+                            drefId={Number(drefId)}
+                        />
+                    )}
                 </InputSection>
             </Container>
             <Container
@@ -193,6 +246,7 @@ function Overview(props: Props) {
             >
                 <InputSection
                     title={strings.drefFormNationalSociety}
+                    description={strings.drefFormNationalSocietyDescription}
                     numPreferredColumns={2}
                     withAsteriskOnTitle
                 >
@@ -387,19 +441,6 @@ function Overview(props: Props) {
                         </Button>
                     </div>
                 </InputSection>
-                {value?.type_of_dref !== TYPE_LOAN && (
-                    <InputSection
-                        title={strings.drefFormEmergencyAppealPlanned}
-                    >
-                        <BooleanInput
-                            name="emergency_appeal_planned"
-                            value={value?.emergency_appeal_planned}
-                            onChange={setFieldValue}
-                            error={error?.emergency_appeal_planned}
-                            disabled={disabled}
-                        />
-                    </InputSection>
-                )}
                 {value?.type_of_dref !== TYPE_LOAN && (
                     <InputSection
                         title={strings.drefFormUploadMap}
diff --git a/app/src/views/DrefApplicationForm/Submission/i18n.json b/app/src/views/DrefApplicationForm/Submission/i18n.json
index 402d9cc370..829020dd00 100644
--- a/app/src/views/DrefApplicationForm/Submission/i18n.json
+++ b/app/src/views/DrefApplicationForm/Submission/i18n.json
@@ -31,6 +31,13 @@
         "drefFormFocalPointTitle": "Title",
         "drefFormFocalPointEmail": "Email",
         "drefFormFocalPointPhoneNumber":"Phone Number",
+        "drefFormNationalSocietyIntegrityTitle": "National Societies' Integrity Focal Point",
+        "drefFormIntegrityContactNameLabel": "Name",
+        "drefFormIntegrityContactEmailLabel": "Email",
+        "drefFormIntegrityContactTitleLabel": "Title",
+        "drefFormIntegrityContactPhoneNumberLabel": "Phone Number",
+        "drefFormNationalSocietyHotlineNumberTitle": "National Society Hotline",
+        "drefFormNationalSocietyHotlineNumberLabel": "Phone Number",
         "drefApplicationFormImageAlt": "Image"
     }
 }
diff --git a/app/src/views/DrefApplicationForm/Submission/index.tsx b/app/src/views/DrefApplicationForm/Submission/index.tsx
index e3f24f7de9..7800267536 100644
--- a/app/src/views/DrefApplicationForm/Submission/index.tsx
+++ b/app/src/views/DrefApplicationForm/Submission/index.tsx
@@ -404,6 +404,56 @@ function Submission(props: Props) {
                         />
                     </InputSection>
                 )}
+                <InputSection
+                    title={strings.drefFormNationalSocietyIntegrityTitle}
+                    numPreferredColumns={2}
+                >
+                    <TextInput
+                        label={strings.drefFormIntegrityContactNameLabel}
+                        name="national_society_integrity_contact_name"
+                        value={value.national_society_integrity_contact_name}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_name}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactEmailLabel}
+                        name="national_society_integrity_contact_email"
+                        value={value.national_society_integrity_contact_email}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_email}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactTitleLabel}
+                        name="national_society_integrity_contact_title"
+                        value={value.national_society_integrity_contact_title}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_title}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactPhoneNumberLabel}
+                        name="national_society_integrity_contact_phone_number"
+                        value={value.national_society_integrity_contact_phone_number}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_phone_number}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormNationalSocietyHotlineNumberTitle}
+                    numPreferredColumns={2}
+                >
+                    <TextInput
+                        label={strings.drefFormNationalSocietyHotlineNumberLabel}
+                        name="national_society_hotline_phone_number"
+                        value={value.national_society_hotline_phone_number}
+                        onChange={setFieldValue}
+                        error={error?.national_society_hotline_phone_number}
+                        disabled={disabled}
+                    />
+                </InputSection>
             </Container>
         </div>
     );
diff --git a/app/src/views/DrefApplicationForm/common.tsx b/app/src/views/DrefApplicationForm/common.tsx
index 64f3b37f6d..0299fcf7b8 100644
--- a/app/src/views/DrefApplicationForm/common.tsx
+++ b/app/src/views/DrefApplicationForm/common.tsx
@@ -43,7 +43,6 @@ export const overviewTabFields: (keyof PartialDref)[] = [
     'district',
     'title_prefix',
     'title',
-    'emergency_appeal_planned',
     'event_map_file',
     'cover_image_file',
 ] satisfies (keyof PartialDref)[];
@@ -59,6 +58,9 @@ export const eventDetailTabFields: (keyof PartialDref)[] = [
     'event_date',
     'event_text',
     'num_affected',
+    'estimated_number_of_affected_male',
+    'estimated_number_of_affected_female',
+    'estimated_number_of_affected_minors',
     'people_in_need',
     'event_description',
     'event_scope',
@@ -102,10 +104,16 @@ export const operationTabFields: (keyof PartialDref)[] = [
     'risk_security',
     'risk_security_concern',
     'has_child_safeguarding_risk_analysis_assessment',
+    'has_anti_fraud_corruption_policy',
+    'has_sexual_abuse_policy',
+    'has_child_protection_policy',
+    'has_whistleblower_protection_policy',
+    'has_anti_sexual_harassment_policy',
     'budget_file',
     'amount_requested',
     'planned_interventions',
     'human_resource',
+    'is_volunteer_team_diverse',
     'is_surge_personnel_deployed',
     'surge_personnel_deployed',
     'logistic_capacity_of_ns',
@@ -141,6 +149,11 @@ export const timeframeAndContactsTabFields: (keyof PartialDref)[] = [
     'media_contact_name',
     'media_contact_email',
     'media_contact_phone_number',
+    'national_society_integrity_contact_name',
+    'national_society_integrity_contact_title',
+    'national_society_integrity_contact_email',
+    'national_society_integrity_contact_phone_number',
+    'national_society_hotline_phone_number',
     'media_contact_title',
 ] satisfies (keyof PartialDref)[];
 
diff --git a/app/src/views/DrefApplicationForm/i18n.json b/app/src/views/DrefApplicationForm/i18n.json
index e34e08b329..8e77612e9c 100644
--- a/app/src/views/DrefApplicationForm/i18n.json
+++ b/app/src/views/DrefApplicationForm/i18n.json
@@ -20,7 +20,6 @@
         "formLoadingMessage": "Loading DREF Application...",
         "formNotAvailableInNonEnglishMessage": "DREF Application is not available in the selected language!",
         "formEditNotAvailableInSelectedLanguageMessage": "DREF Application is not available for edit in the selected language!",
-        "formShareButtonLabel": "Share",
         "drefFeedbackForm": "Provide feedback on IFRC DREF"
     }
 }
diff --git a/app/src/views/DrefApplicationForm/index.tsx b/app/src/views/DrefApplicationForm/index.tsx
index 16c7bb8688..26834705ab 100644
--- a/app/src/views/DrefApplicationForm/index.tsx
+++ b/app/src/views/DrefApplicationForm/index.tsx
@@ -5,10 +5,7 @@ import {
     useState,
 } from 'react';
 import { useParams } from 'react-router-dom';
-import {
-    DownloadTwoLineIcon,
-    ShareLineIcon,
-} from '@ifrc-go/icons';
+import { DownloadTwoLineIcon } from '@ifrc-go/icons';
 import {
     Button,
     Message,
@@ -35,18 +32,15 @@ import {
 
 import { type DistrictItem } from '#components/domain/DistrictSearchMultiSelectInput';
 import DrefExportModal from '#components/domain/DrefExportModal';
-import DrefShareModal from '#components/domain/DrefShareModal';
 import { type FieldReportItem as FieldReportSearchItem } from '#components/domain/FieldReportSearchSelectInput';
 import FormFailedToLoadMessage from '#components/domain/FormFailedToLoadMessage';
 import LanguageMismatchMessage from '#components/domain/LanguageMismatchMessage';
 import NonEnglishFormCreationMessage from '#components/domain/NonEnglishFormCreationMessage';
-import { type User } from '#components/domain/UserSearchMultiSelectInput';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import Page from '#components/Page';
 import useCurrentLanguage from '#hooks/domain/useCurrentLanguage';
 import useAlert from '#hooks/useAlert';
-import useInputState from '#hooks/useInputState';
 import useRouting from '#hooks/useRouting';
 import {
     type GoApiResponse,
@@ -132,7 +126,6 @@ export function Component() {
 
     const [activeTab, setActiveTab] = useState<TabKeys>('overview');
     const [fileIdToUrlMap, setFileIdToUrlMap] = useState<Record<number, string>>({});
-    const [drefUsers, setDrefUsers] = useInputState<User[] | undefined | null>([]);
     const currentLanguage = useCurrentLanguage();
 
     const [
@@ -140,10 +133,6 @@ export function Component() {
         setShowObsoletePayloadModal,
     ] = useState(false);
 
-    const [showShareModal, {
-        setTrue: setShowShareModalTrue,
-        setFalse: setShowShareModalFalse,
-    }] = useBooleanState(false);
     const [showExportModal, {
         setTrue: setShowExportModalTrue,
         setFalse: setShowExportModalFalse,
@@ -475,17 +464,6 @@ export function Component() {
         },
     });
 
-    const {
-        retrigger: getDrefUsers,
-    } = useRequest({
-        skip: isNotDefined(drefId),
-        url: '/api/v2/dref-share-user/{id}/',
-        pathVariables: { id: Number(drefId) },
-        onSuccess: (response) => {
-            setDrefUsers(response.users_details);
-        },
-    });
-
     const handleFormSubmit = useCallback(
         (modifiedAt?: string) => {
             formContentRef.current?.scrollIntoView();
@@ -526,14 +504,6 @@ export function Component() {
         setActiveTab(newTab);
     }, []);
 
-    const handleUserShareSuccess = useCallback(() => {
-        setShowShareModalFalse();
-        getDrefUsers();
-    }, [
-        getDrefUsers,
-        setShowShareModalFalse,
-    ]);
-
     const nextStep = getNextStep(activeTab, 1, value.type_of_dref);
     const prevStep = getNextStep(activeTab, -1, value.type_of_dref);
     const saveDrefPending = createDrefPending || updateDrefPending;
@@ -580,24 +550,14 @@ export function Component() {
                             />
                         )}
                         {isDefined(drefId) && (
-                            <>
-                                <Button
-                                    name={undefined}
-                                    onClick={setShowShareModalTrue}
-                                    variant="secondary"
-                                    icons={<ShareLineIcon />}
-                                >
-                                    {strings.formShareButtonLabel}
-                                </Button>
-                                <Button
-                                    name={undefined}
-                                    onClick={setShowExportModalTrue}
-                                    icons={<DownloadTwoLineIcon />}
-                                    variant="secondary"
-                                >
-                                    {strings.formExportLabel}
-                                </Button>
-                            </>
+                            <Button
+                                name={undefined}
+                                onClick={setShowExportModalTrue}
+                                icons={<DownloadTwoLineIcon />}
+                                variant="secondary"
+                            >
+                                {strings.formExportLabel}
+                            </Button>
                         )}
                         <Button
                             name={undefined}
@@ -695,7 +655,6 @@ export function Component() {
                                 setDistrictOptions={setDistrictOptions}
                                 fieldReportOptions={fieldReportOptions}
                                 setFieldReportOptions={setFieldReportOptions}
-                                drefUsers={drefUsers}
                             />
                         </TabPanel>
                         <TabPanel name="eventDetail">
@@ -746,14 +705,23 @@ export function Component() {
                                 >
                                     {strings.formBackButtonLabel}
                                 </Button>
-                                <Button
-                                    name={nextStep ?? activeTab}
-                                    onClick={handleTabChange}
-                                    disabled={isNotDefined(nextStep)}
-                                    variant="secondary"
-                                >
-                                    {strings.formContinueButtonLabel}
-                                </Button>
+                                {isDefined(nextStep) ? (
+                                    <Button
+                                        name={nextStep ?? activeTab}
+                                        onClick={handleTabChange}
+                                        variant="secondary"
+                                    >
+                                        {strings.formContinueButtonLabel}
+                                    </Button>
+                                ) : (
+                                    <Button
+                                        name={undefined}
+                                        onClick={handleFormSubmit}
+                                        disabled={disabled}
+                                    >
+                                        {strings.formSaveButtonLabel}
+                                    </Button>
+                                )}
                             </div>
                         </div>
                     </>
@@ -765,13 +733,6 @@ export function Component() {
                         onCancelButtonClick={setShowObsoletePayloadModal}
                     />
                 )}
-                {showShareModal && isDefined(drefId) && (
-                    <DrefShareModal
-                        onCancel={setShowShareModalFalse}
-                        onSuccess={handleUserShareSuccess}
-                        drefId={Number(drefId)}
-                    />
-                )}
                 {showExportModal && (
                     <DrefExportModal
                         onCancel={setShowExportModalFalse}
diff --git a/app/src/views/DrefApplicationForm/schema.ts b/app/src/views/DrefApplicationForm/schema.ts
index db41dc7c69..67ba95e1eb 100644
--- a/app/src/views/DrefApplicationForm/schema.ts
+++ b/app/src/views/DrefApplicationForm/schema.ts
@@ -150,6 +150,9 @@ const schema: DrefFormSchema = {
             field_report: {}, // This value is set from CopyFieldReportSection
             // EVENT DETAILS
             num_affected: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_male: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_female: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_minors: { validations: [positiveIntegerCondition] },
 
             // none
 
@@ -186,6 +189,11 @@ const schema: DrefFormSchema = {
             regional_focal_point_title: {},
             regional_focal_point_email: { validations: [emailCondition] },
             regional_focal_point_phone_number: {},
+            national_society_integrity_contact_name: {},
+            national_society_integrity_contact_title: {},
+            national_society_integrity_contact_email: { validations: [emailCondition] },
+            national_society_integrity_contact_phone_number: {},
+            national_society_hotline_phone_number: {},
         };
 
         // Note: Section below include conditional form element only
@@ -212,7 +220,6 @@ const schema: DrefFormSchema = {
         );
 
         const overviewDrefTypeRelatedFields = [
-            'emergency_appeal_planned',
             'event_map_file',
             'cover_image_file',
         ] as const;
@@ -227,7 +234,6 @@ const schema: DrefFormSchema = {
             overviewDrefTypeRelatedFields,
             (val): OverviewDrefTypeRelatedFields => {
                 const conditionalFields: OverviewDrefTypeRelatedFields = {
-                    emergency_appeal_planned: { forceValue: nullValue },
                     event_map_file: { forceValue: nullValue }, // NOTE: check if this works
                     cover_image_file: { forceValue: nullValue },
                 };
@@ -236,7 +242,6 @@ const schema: DrefFormSchema = {
                 }
                 return {
                     ...conditionalFields,
-                    emergency_appeal_planned: {},
                     event_map_file: {
                         fields: (): EventMapFileFields => ({
                             client_id: {},
@@ -264,6 +269,8 @@ const schema: DrefFormSchema = {
             'did_ns_respond',
             'did_ns_request_fund',
             'lessons_learned',
+            'child_safeguarding_risk_level',
+            'complete_child_safeguarding_risk',
             'event_scope',
             'event_text',
             'anticipatory_actions',
@@ -291,6 +298,8 @@ const schema: DrefFormSchema = {
                     did_ns_respond: { forceValue: nullValue },
                     did_ns_request_fund: { forceValue: nullValue },
                     lessons_learned: { forceValue: nullValue },
+                    complete_child_safeguarding_risk: {},
+                    child_safeguarding_risk_level: {},
                     event_scope: { forceValue: nullValue },
                     source_information: { forceValue: [] },
                     event_text: { forceValue: nullValue },
@@ -582,9 +591,15 @@ const schema: DrefFormSchema = {
             'risk_security',
             'risk_security_concern',
             'has_child_safeguarding_risk_analysis_assessment',
+            'has_anti_fraud_corruption_policy',
+            'has_sexual_abuse_policy',
+            'has_child_protection_policy',
+            'has_whistleblower_protection_policy',
+            'has_anti_sexual_harassment_policy',
             'budget_file',
             'planned_interventions',
             'human_resource',
+            'is_volunteer_team_diverse',
             'is_surge_personnel_deployed',
         ] as const;
         type OperationDrefTypeRelatedFields = Pick<
@@ -618,8 +633,14 @@ const schema: DrefFormSchema = {
                     risk_security: { forceValue: [] },
                     risk_security_concern: { forceValue: nullValue },
                     budget_file: { forceValue: nullValue },
+                    has_anti_fraud_corruption_policy: {},
+                    has_anti_sexual_harassment_policy: {},
+                    has_sexual_abuse_policy: {},
+                    has_whistleblower_protection_policy: {},
+                    has_child_protection_policy: {},
                     planned_interventions: { forceValue: [] },
                     human_resource: { forceValue: nullValue },
+                    is_volunteer_team_diverse: { forceValue: nullValue },
                     is_surge_personnel_deployed: { forceValue: nullValue },
                     has_child_safeguarding_risk_analysis_assessment: { forceValue: nullValue },
                 };
@@ -711,6 +732,7 @@ const schema: DrefFormSchema = {
                         }),
                     },
                     human_resource: {},
+                    is_volunteer_team_diverse: {},
                     is_surge_personnel_deployed: {},
                 };
                 if (val?.type_of_dref !== TYPE_ASSESSMENT) {
diff --git a/app/src/views/DrefFinalReportExport/i18n.json b/app/src/views/DrefFinalReportExport/i18n.json
index 0e339d9763..b5855d12fa 100644
--- a/app/src/views/DrefFinalReportExport/i18n.json
+++ b/app/src/views/DrefFinalReportExport/i18n.json
@@ -24,7 +24,7 @@
         "monthsSuffix": " months",
         "operationEndDateLabel": "Operational End Date",
         "additionalAllocationRequestedLabel": "Additional Allocation Requested",
-        "targetedAreasLabel": "Targeted Areas",
+        "targetedAreasLabel": "Targeted Regions",
         "eventDescriptionSectionHeading": "Description of the Event",
         "approximateDateOfImpactHeading": "Approximate date of impact",
         "whatWhereWhenSectionHeading": "What happened, where and when?",
@@ -62,8 +62,8 @@
         "ruralLabel": "Rural",
         "urbanLabel": "Urban",
         "peopleWithDisabilitiesLabel": "People with disabilities (estimated)",
-        "riskAndSecuritySectionHeading": "Risk and Security Considerations",
-        "riskSecurityHeading": "Please indicate about potential operation risk for this operations and mitigation actions",
+        "riskAndSecuritySectionHeading": "Risk and Security Considerations (including \"management\")",
+        "riskSecurityHeading": "Please analyse and indicate potential risks for this operation, its root causes and mitigation actions.",
         "riskLabel": "Risk",
         "mitigationLabel": "Mitigation action",
         "safetyConcernHeading": "Please indicate any security and safety concerns for this operation",
diff --git a/app/src/views/DrefFinalReportForm/EventDetail/i18n.json b/app/src/views/DrefFinalReportForm/EventDetail/i18n.json
index f6ce6916e4..7ffb5af7fd 100644
--- a/app/src/views/DrefFinalReportForm/EventDetail/i18n.json
+++ b/app/src/views/DrefFinalReportForm/EventDetail/i18n.json
@@ -16,6 +16,9 @@
         "drefFormRiskPeopleLabel": "Total population at risk",
         "drefFormClickEmergencyResponseFramework": "Click to view Emergency Response Framework",
         "drefFormPeopleAffected": "Total affected population",
+        "drefFormAffectedMaleLabel": "Estimated male",
+        "drefFormAffectedFemaleLabel": "Estimated female",
+        "drefFormAffectedMinorsLabel": "Estimated minors",
         "drefFormPeopleAffectedDescriptionImminent": "Includes all those whose lives and livelihoods are at risk as a direct result of the shock or stress.",
         "drefFormPeopleAffectedDescriptionSlowSudden": "People Affected include all those whose lives and livelihoods have been impacted as a direct result of the shock or stress.",
         "drefFormEstimatedPeopleInNeed": "Estimated people in need (Optional)",
diff --git a/app/src/views/DrefFinalReportForm/EventDetail/index.tsx b/app/src/views/DrefFinalReportForm/EventDetail/index.tsx
index 9d27d1aaec..55729131d8 100644
--- a/app/src/views/DrefFinalReportForm/EventDetail/index.tsx
+++ b/app/src/views/DrefFinalReportForm/EventDetail/index.tsx
@@ -185,6 +185,30 @@ function EventDetail(props: Props) {
                         )}
                         disabled={disabled}
                     />
+                    <NumberInput
+                        name="estimated_number_of_affected_male"
+                        label={strings.drefFormAffectedMaleLabel}
+                        value={value?.estimated_number_of_affected_male}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_male}
+                        disabled={disabled}
+                    />
+                    <NumberInput
+                        name="estimated_number_of_affected_female"
+                        label={strings.drefFormAffectedFemaleLabel}
+                        value={value?.estimated_number_of_affected_female}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_female}
+                        disabled={disabled}
+                    />
+                    <NumberInput
+                        name="estimated_number_of_affected_minors"
+                        label={strings.drefFormAffectedMinorsLabel}
+                        value={value?.estimated_number_of_affected_minors}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_minors}
+                        disabled={disabled}
+                    />
                     <NumberInput
                         label={(
                             <>
diff --git a/app/src/views/DrefFinalReportForm/EventDetail/styles.module.css b/app/src/views/DrefFinalReportForm/EventDetail/styles.module.css
index a8aedf04ee..c5c16569ac 100644
--- a/app/src/views/DrefFinalReportForm/EventDetail/styles.module.css
+++ b/app/src/views/DrefFinalReportForm/EventDetail/styles.module.css
@@ -2,4 +2,10 @@
     display: flex;
     flex-direction: column;
     gap: var(--go-ui-spacing-2xl);
+
+    .affected-section {
+        display: flex;
+        flex-direction: column;
+        gap: var(--go-ui-spacing-sm);
+    }
 }
diff --git a/app/src/views/DrefFinalReportForm/Operation/i18n.json b/app/src/views/DrefFinalReportForm/Operation/i18n.json
index 3af909b08f..ee51d728c2 100644
--- a/app/src/views/DrefFinalReportForm/Operation/i18n.json
+++ b/app/src/views/DrefFinalReportForm/Operation/i18n.json
@@ -17,10 +17,23 @@
         "drefFormResponseRationale": "Operation strategy rationale",
         "drefFormResponseRationaleDescription": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
         "drefFormResponseRationalePlaceholder": "To address the needs of the targeted population, this DREF will aim at (please briefly describe the planned activities).",
-        "drefFormRiskSecurity": "Risk and security considerations",
+        "drefFormRiskSecurity": "Risk and Security Considerations (including \"management\")",
+        "drefFormRiskDoesNSHaveAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
+        "drefFormRiskDoesNSHaveSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
+        "drefFormRiskDoesNSHaveChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
+        "drefFormRiskDoesNSHaveWhistleblowerPolicy": "Does your National Society have whistleblower protection policy?",
+        "drefFormRiskDoesNSHaveAntiSexualHarassmentPolicy": "Does your National Society have anti-sexual harassment policy?",
         "drefFormRiskSecurityAddButton": "Add New Risk",
-        "drefFormRiskSecurityPotentialRisk": "Please indicate about potential operational risk for this operations and mitigation actions",
-        "drefFormRiskSecurityPotentialRiskDescription": "Please consider any possible challenges to conduct the assessment, any possible limitations in getting the information required and overall risk to the implementation",
+        "drefFormRiskSecurityPotentialRisk": "Please analyse and indicate potential risks for this operation, its root causes and mitigation actions.",
+        "drefFormRiskSecurityPotentialRiskAssessmentDescription": "Please consider any possible challenges to conduct the assessment, any possible limitations in getting the information required and overall risk to the implementation",
+        "drefFormRiskSecurityPotentialRiskDescription": "When identifying the risks, please review the IFRC Risk Management Policy and Framework including the different risk categories. When possible, make sure that your identification of risks includes some analysis of previous incidents and performance of the NS in previous operations.",
+        "drefFormRiskSecurityRiskSelectedDescription": "Identify up to 5 key potential risks or threats that could negatively impact the success of the operation. These can range from environmental risks to social or logistical challenges.",
+        "drefFormRiskSecurityRiskSelectedPoint1": "What are the primary risks that could affect the operation’s implementation?",
+        "drefFormRiskSecurityRiskSelectedPoint2": "Are there any context-specific risks that need to be considered?",
+        "drefFormRiskSecurityRiskSelectedPoint3": "How might these risks impact the operation’s objectives, timeline, or resources? Mitigation actions are actions or strategies that will be implemented to reduce or manage the identified risks, ensuring the operation can proceed as planned.",
+        "drefFormRiskSecurityRiskSelectedPoint4": "What specific measures or strategies will be put in place to mitigate the risks identified?",
+        "drefFormRiskSecurityRiskSelectedPoint5": "Will contingency plans or additional resources be required to address these risks?",
+        "drefFormRiskSecurityRiskCategoriesLinkLabel": "Annex III - Risk Categories.pdf",
         "drefFormRiskSecuritySafetyConcern": "Please indicate any security and safety concerns for this operation",
         "drefFormRiskSecurityHasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
         "drefFormRiskSecurityHasChildRiskCompletedDescription":"The IFRC Child Safeguarding Risk Analysis helps Operations quickly identify and rate their key child safeguarding risks in order to reduce the risk of harm against children, as outlined as a requirement in the IFRC Child Safeguarding Policy. Here are the link to the tool and Q&A",
diff --git a/app/src/views/DrefFinalReportForm/Operation/index.tsx b/app/src/views/DrefFinalReportForm/Operation/index.tsx
index ebddce3601..964216465c 100644
--- a/app/src/views/DrefFinalReportForm/Operation/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Operation/index.tsx
@@ -401,10 +401,101 @@ function Operation(props: Props) {
             <Container
                 heading={strings.drefFormRiskSecurity}
             >
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveAntiFraudPolicy}
+                >
+                    <BooleanInput
+                        name="has_anti_fraud_corruption_policy"
+                        value={value.has_anti_fraud_corruption_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_anti_fraud_corruption_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveSexualAbusePolicy}
+                >
+                    <BooleanInput
+                        name="has_sexual_abuse_policy"
+                        value={value.has_sexual_abuse_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_sexual_abuse_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveChildProtectionPolicy}
+                >
+                    <BooleanInput
+                        name="has_child_protection_policy"
+                        value={value.has_child_protection_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_child_protection_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveWhistleblowerPolicy}
+                >
+                    <BooleanInput
+                        name="has_whistleblower_protection_policy"
+                        value={value.has_whistleblower_protection_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_whistleblower_protection_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveAntiSexualHarassmentPolicy}
+                >
+                    <BooleanInput
+                        name="has_anti_sexual_harassment_policy"
+                        value={value.has_anti_sexual_harassment_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_anti_sexual_harassment_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
                 <InputSection
                     title={strings.drefFormRiskSecurityPotentialRisk}
-                    description={value?.type_of_dref === TYPE_ASSESSMENT
-                        && strings.drefFormRiskSecurityPotentialRiskDescription}
+                    description={(
+                        <>
+                            {value?.type_of_dref === TYPE_ASSESSMENT
+                                && strings.drefFormRiskSecurityPotentialRiskAssessmentDescription}
+                            {strings.drefFormRiskSecurityPotentialRiskDescription}
+                            <Link
+                                href="https://github.com/user-attachments/files/18903662/Annex.III.Risk.Categories.1.pdf"
+                                withLinkIcon
+                                external
+                            >
+                                {strings.drefFormRiskSecurityRiskCategoriesLinkLabel}
+                            </Link>
+                            {(value.risk_security?.length ?? 0) > 0 && (
+                                <>
+                                    <p>
+                                        {strings.drefFormRiskSecurityRiskSelectedDescription}
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint4}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint5}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
+                        </>
+                    )}
                 >
                     <NonFieldError error={getErrorObject(error?.risk_security)} />
                     {value.risk_security?.map((rs, i) => (
diff --git a/app/src/views/DrefFinalReportForm/Overview/i18n.json b/app/src/views/DrefFinalReportForm/Overview/i18n.json
index 321f906368..c151f38bb3 100644
--- a/app/src/views/DrefFinalReportForm/Overview/i18n.json
+++ b/app/src/views/DrefFinalReportForm/Overview/i18n.json
@@ -5,6 +5,7 @@
         "drefOperationalShareApplicationLabel": "The DREF Final Report is shared with",
         "drefOperationalShareApplicationDescription": "The users will be able to view, edit and add other users.",
         "drefFormSharingHeading": "Sharing",
+        "formShareButtonLabel": "Add",
         "drefFormInstantShareLabel": "Create & Share",
         "drefFormEssentialInformation": "Essential Information",
         "drefFormNationalSociety": "Name of National Society",
@@ -31,4 +32,4 @@
         "drefFormClickEmergencyResponseFrameworkLabel": "Click to view Emergency Response Framework",
         "userListEmptyMessage": "The DREF Final report is not shared with anyone."
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/views/DrefFinalReportForm/Overview/index.tsx b/app/src/views/DrefFinalReportForm/Overview/index.tsx
index 12c0865217..c301ba3979 100644
--- a/app/src/views/DrefFinalReportForm/Overview/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Overview/index.tsx
@@ -3,7 +3,10 @@ import {
     type SetStateAction,
     useCallback,
 } from 'react';
-import { WikiHelpSectionLineIcon } from '@ifrc-go/icons';
+import {
+    ShareLineIcon,
+    WikiHelpSectionLineIcon,
+} from '@ifrc-go/icons';
 import {
     Button,
     Container,
@@ -13,9 +16,15 @@ import {
     TextArea,
     TextInput,
 } from '@ifrc-go/ui';
-import { useTranslation } from '@ifrc-go/ui/hooks';
+import {
+    useBooleanState,
+    useTranslation,
+} from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
-import { isNotDefined } from '@togglecorp/fujs';
+import {
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
 import {
     type EntriesAsList,
     type Error,
@@ -26,6 +35,7 @@ import {
 import CountrySelectInput from '#components/domain/CountrySelectInput';
 import DisasterTypeSelectInput from '#components/domain/DisasterTypeSelectInput';
 import DistrictSearchMultiSelectInput, { type DistrictItem } from '#components/domain/DistrictSearchMultiSelectInput';
+import DrefShareModal from '#components/domain/DrefShareModal';
 import UserItem from '#components/domain/DrefShareModal/UserItem';
 import ImageWithCaptionInput from '#components/domain/ImageWithCaptionInput';
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
@@ -34,7 +44,11 @@ import Link from '#components/Link';
 import useCountry from '#hooks/domain/useCountry';
 import useDisasterType from '#hooks/domain/useDisasterType';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
-import { type GoApiResponse } from '#utils/restRequest';
+import useInputState from '#hooks/useInputState';
+import {
+    type GoApiResponse,
+    useRequest,
+} from '#utils/restRequest';
 
 import {
     TYPE_IMMINENT,
@@ -74,7 +88,7 @@ interface Props {
     setFileIdToUrlMap?: React.Dispatch<React.SetStateAction<Record<number, string>>>;
     districtOptions: DistrictItem[] | null | undefined;
     setDistrictOptions: Dispatch<SetStateAction<DistrictItem[] | null | undefined>>;
-    drefUsers?: User[] | null;
+    drefId: number | undefined;
 }
 
 function Overview(props: Props) {
@@ -87,10 +101,15 @@ function Overview(props: Props) {
         disabled,
         districtOptions,
         setDistrictOptions,
-        drefUsers,
+        drefId,
     } = props;
 
     const strings = useTranslation(i18n);
+    const [drefUsers, setDrefUsers] = useInputState<User[] | undefined | null>([]);
+    const [showShareModal, {
+        setTrue: setShowShareModalTrue,
+        setFalse: setShowShareModalFalse,
+    }] = useBooleanState(false);
     const {
         dref_dref_dref_type: typeOfDrefOptions,
         dref_dref_disaster_category: drefDisasterCategoryOptions,
@@ -137,6 +156,25 @@ function Overview(props: Props) {
         (option) => option.key !== TYPE_LOAN,
     );
 
+    const {
+        retrigger: getDrefUsers,
+    } = useRequest({
+        skip: isNotDefined(drefId),
+        url: '/api/v2/dref-share-user/{id}/',
+        pathVariables: { id: Number(drefId) },
+        onSuccess: (response) => {
+            setDrefUsers(response.users_details);
+        },
+    });
+
+    const handleUserShareSuccess = useCallback(() => {
+        setShowShareModalFalse();
+        getDrefUsers();
+    }, [
+        getDrefUsers,
+        setShowShareModalFalse,
+    ]);
+
     const error = getErrorObject(formError);
 
     return (
@@ -163,6 +201,15 @@ function Overview(props: Props) {
                         pending={false}
                         compact
                     />
+                    <Button
+                        name={undefined}
+                        onClick={setShowShareModalTrue}
+                        disabled={isNotDefined(drefId)}
+                        variant="secondary"
+                        icons={<ShareLineIcon />}
+                    >
+                        {strings.formShareButtonLabel}
+                    </Button>
                 </InputSection>
             </Container>
             <Container
@@ -377,6 +424,13 @@ function Overview(props: Props) {
                     />
                 </InputSection>
             </Container>
+            {showShareModal && isDefined(drefId) && (
+                <DrefShareModal
+                    onCancel={setShowShareModalFalse}
+                    onSuccess={handleUserShareSuccess}
+                    drefId={drefId}
+                />
+            )}
         </div>
     );
 }
diff --git a/app/src/views/DrefFinalReportForm/Submission/i18n.json b/app/src/views/DrefFinalReportForm/Submission/i18n.json
index 4089d36b15..9fa011d70c 100644
--- a/app/src/views/DrefFinalReportForm/Submission/i18n.json
+++ b/app/src/views/DrefFinalReportForm/Submission/i18n.json
@@ -25,6 +25,13 @@
         "drefFormFocalPointNameLabel": "Name",
         "drefFormFocalPointTitleLabel": "Title",
         "drefFromFocalPointEmailLabel": "Email",
+        "drefFormNationalSocietyIntegrityTitle": "National Societies' Integrity Focal Point",
+        "drefFormIntegrityContactNameLabel": "Name",
+        "drefFormIntegrityContactEmailLabel": "Email",
+        "drefFormIntegrityContactTitleLabel": "Title",
+        "drefFormIntegrityContactPhoneNumberLabel": "Phone Number",
+        "drefFormNationalSocietyHotlineNumberTitle": "National Society Hotline",
+        "drefFormNationalSocietyHotlineNumberLabel": "Phone Number",
         "drefFromFocalPointPhoneNumberLabel": "Phone Number"
     }
 }
diff --git a/app/src/views/DrefFinalReportForm/Submission/index.tsx b/app/src/views/DrefFinalReportForm/Submission/index.tsx
index 5c017ec114..254e223a60 100644
--- a/app/src/views/DrefFinalReportForm/Submission/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Submission/index.tsx
@@ -375,6 +375,56 @@ function Submission(props: Props) {
                         disabled={disabled}
                     />
                 </InputSection>
+                <InputSection
+                    title={strings.drefFormNationalSocietyIntegrityTitle}
+                    numPreferredColumns={2}
+                >
+                    <TextInput
+                        label={strings.drefFormIntegrityContactNameLabel}
+                        name="national_society_integrity_contact_name"
+                        value={value.national_society_integrity_contact_name}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_name}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactEmailLabel}
+                        name="national_society_integrity_contact_email"
+                        value={value.national_society_integrity_contact_email}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_email}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactTitleLabel}
+                        name="national_society_integrity_contact_title"
+                        value={value.national_society_integrity_contact_title}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_title}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactPhoneNumberLabel}
+                        name="national_society_integrity_contact_phone_number"
+                        value={value.national_society_integrity_contact_phone_number}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_phone_number}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormNationalSocietyHotlineNumberTitle}
+                    numPreferredColumns={2}
+                >
+                    <TextInput
+                        label={strings.drefFormNationalSocietyHotlineNumberLabel}
+                        name="national_society_hotline_phone_number"
+                        value={value.national_society_hotline_phone_number}
+                        onChange={setFieldValue}
+                        error={error?.national_society_hotline_phone_number}
+                        disabled={disabled}
+                    />
+                </InputSection>
             </Container>
         </div>
     );
diff --git a/app/src/views/DrefFinalReportForm/common.tsx b/app/src/views/DrefFinalReportForm/common.tsx
index 984c07e6bf..03447f5aa2 100644
--- a/app/src/views/DrefFinalReportForm/common.tsx
+++ b/app/src/views/DrefFinalReportForm/common.tsx
@@ -32,16 +32,12 @@ export type TabKeys = 'overview' | 'eventDetail' | 'actions' | 'operation' | 'su
 // FORM ERROR
 
 const overviewFields: (keyof PartialFinalReport)[] = [
-    'number_of_people_affected',
-    'number_of_people_targeted',
-    'num_assisted',
     'total_dref_allocation',
     'main_donors',
     'title',
     'national_society',
     'country',
     'district',
-    'people_in_need',
     'disaster_type',
     'type_of_onset',
     'disaster_category',
@@ -51,9 +47,17 @@ const overviewFields: (keyof PartialFinalReport)[] = [
 ] satisfies (keyof PartialFinalReport)[];
 
 const eventDetailFields: (keyof PartialFinalReport)[] = [
+    'number_of_people_affected',
+    'number_of_people_targeted',
+    'num_assisted',
+    'people_in_need',
+    'estimated_number_of_affected_male',
+    'estimated_number_of_affected_female',
+    'estimated_number_of_affected_minors',
     'event_description',
     'event_scope',
     'images_file',
+    'source_information',
     'event_date',
     'event_text',
 ] satisfies (keyof PartialFinalReport)[];
@@ -126,6 +130,11 @@ const submissionFields: (keyof PartialFinalReport)[] = [
     'media_contact_name',
     'media_contact_email',
     'media_contact_phone_number',
+    'national_society_integrity_contact_name',
+    'national_society_integrity_contact_title',
+    'national_society_integrity_contact_email',
+    'national_society_integrity_contact_phone_number',
+    'national_society_hotline_phone_number',
     'media_contact_title',
 ] satisfies (keyof PartialFinalReport)[];
 
diff --git a/app/src/views/DrefFinalReportForm/i18n.json b/app/src/views/DrefFinalReportForm/i18n.json
index 093bab0c55..491e69ea57 100644
--- a/app/src/views/DrefFinalReportForm/i18n.json
+++ b/app/src/views/DrefFinalReportForm/i18n.json
@@ -21,7 +21,6 @@
         "formLoadErrorDescription": "There was an error loading the DREF Final Report",
         "formLoadErrorHelpText": "Please make sure that the final report with given id exists and you have the permission to view it",
         "formBackButtonLabel": "Back",
-        "formShareButtonLabel": "Share",
         "drefFeedbackForm": "Provide feedback on IFRC DREF"
     }
 }
diff --git a/app/src/views/DrefFinalReportForm/index.tsx b/app/src/views/DrefFinalReportForm/index.tsx
index 7baf02eb48..1e5f89bed8 100644
--- a/app/src/views/DrefFinalReportForm/index.tsx
+++ b/app/src/views/DrefFinalReportForm/index.tsx
@@ -5,10 +5,7 @@ import {
     useState,
 } from 'react';
 import { useParams } from 'react-router-dom';
-import {
-    DownloadTwoLineIcon,
-    ShareLineIcon,
-} from '@ifrc-go/icons';
+import { DownloadTwoLineIcon } from '@ifrc-go/icons';
 import {
     Button,
     Message,
@@ -35,15 +32,12 @@ import {
 
 import { type DistrictItem } from '#components/domain/DistrictSearchMultiSelectInput';
 import DrefExportModal from '#components/domain/DrefExportModal';
-import DrefShareModal from '#components/domain/DrefShareModal';
 import LanguageMismatchMessage from '#components/domain/LanguageMismatchMessage';
-import { type User } from '#components/domain/UserSearchMultiSelectInput';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import Page from '#components/Page';
 import useCurrentLanguage from '#hooks/domain/useCurrentLanguage';
 import useAlert from '#hooks/useAlert';
-import useInputState from '#hooks/useInputState';
 import {
     type GoApiResponse,
     useLazyRequest,
@@ -104,7 +98,6 @@ export function Component() {
 
     const [activeTab, setActiveTab] = useState<TabKeys>('overview');
     const [fileIdToUrlMap, setFileIdToUrlMap] = useState<Record<number, string>>({});
-    const [drefUsers, setDrefUsers] = useInputState<User[] | undefined | null>([]);
     const [districtOptions, setDistrictOptions] = useState<
         DistrictItem[] | undefined | null
     >([]);
@@ -113,10 +106,6 @@ export function Component() {
         setShowObsoletePayloadModal,
     ] = useState(false);
     const currentLanguage = useCurrentLanguage();
-    const [showShareModal, {
-        setTrue: setShowShareModalTrue,
-        setFalse: setShowShareModalFalse,
-    }] = useBooleanState(false);
     const [showExportModal, {
         setTrue: setShowExportModalTrue,
         setFalse: setShowExportModalFalse,
@@ -327,17 +316,6 @@ export function Component() {
         },
     });
 
-    const {
-        retrigger: getDrefUsers,
-    } = useRequest({
-        skip: isNotDefined(drefId),
-        url: '/api/v2/dref-share-user/{id}/',
-        pathVariables: { id: Number(drefId) },
-        onSuccess: (response) => {
-            setDrefUsers(response.users_details);
-        },
-    });
-
     const handleFormSubmit = useCallback(
         (modifiedAt?: string) => {
             formContentRef.current?.scrollIntoView();
@@ -371,14 +349,6 @@ export function Component() {
         setActiveTab(newTab);
     }, []);
 
-    const handleUserShareSuccess = useCallback(() => {
-        setShowShareModalFalse();
-        getDrefUsers();
-    }, [
-        getDrefUsers,
-        setShowShareModalFalse,
-    ]);
-
     const nextStep = getNextStep(activeTab, 1);
     const prevStep = getNextStep(activeTab, -1);
     const saveFinalReportPending = updateFinalReportPending;
@@ -417,25 +387,14 @@ export function Component() {
                 actions={(
                     <>
                         {isTruthyString(finalReportId) && (
-                            <>
-                                <Button
-                                    name={undefined}
-                                    onClick={setShowShareModalTrue}
-                                    disabled={isNotDefined(drefId)}
-                                    variant="secondary"
-                                    icons={<ShareLineIcon />}
-                                >
-                                    {strings.formShareButtonLabel}
-                                </Button>
-                                <Button
-                                    name={undefined}
-                                    onClick={setShowExportModalTrue}
-                                    icons={<DownloadTwoLineIcon />}
-                                    variant="secondary"
-                                >
-                                    {strings.formExportLabel}
-                                </Button>
-                            </>
+                            <Button
+                                name={undefined}
+                                onClick={setShowExportModalTrue}
+                                icons={<DownloadTwoLineIcon />}
+                                variant="secondary"
+                            >
+                                {strings.formExportLabel}
+                            </Button>
                         )}
                         <Button
                             name={undefined}
@@ -522,9 +481,9 @@ export function Component() {
                                 setFileIdToUrlMap={setFileIdToUrlMap}
                                 error={formError}
                                 disabled={disabled}
-                                drefUsers={drefUsers}
                                 districtOptions={districtOptions}
                                 setDistrictOptions={setDistrictOptions}
+                                drefId={drefId}
                             />
                         </TabPanel>
                         <TabPanel name="eventDetail">
@@ -573,14 +532,23 @@ export function Component() {
                                 >
                                     {strings.formBackButtonLabel}
                                 </Button>
-                                <Button
-                                    name={nextStep ?? activeTab}
-                                    onClick={handleTabChange}
-                                    disabled={isNotDefined(nextStep)}
-                                    variant="secondary"
-                                >
-                                    {strings.formContinueButtonLabel}
-                                </Button>
+                                {isDefined(nextStep) ? (
+                                    <Button
+                                        name={nextStep ?? activeTab}
+                                        onClick={handleTabChange}
+                                        variant="secondary"
+                                    >
+                                        {strings.formContinueButtonLabel}
+                                    </Button>
+                                ) : (
+                                    <Button
+                                        name={undefined}
+                                        onClick={handleFormSubmit}
+                                        disabled={disabled}
+                                    >
+                                        {strings.formSaveButtonLabel}
+                                    </Button>
+                                )}
                             </div>
                         </div>
                     </>
@@ -592,13 +560,6 @@ export function Component() {
                         onCancelButtonClick={setShowObsoletePayloadModal}
                     />
                 )}
-                {showShareModal && isDefined(drefId) && (
-                    <DrefShareModal
-                        onCancel={setShowShareModalFalse}
-                        onSuccess={handleUserShareSuccess}
-                        drefId={drefId}
-                    />
-                )}
                 {showExportModal && isDefined(finalReportId) && (
                     <DrefExportModal
                         onCancel={setShowExportModalFalse}
diff --git a/app/src/views/DrefFinalReportForm/schema.ts b/app/src/views/DrefFinalReportForm/schema.ts
index c78dda4f1c..46efc1efd4 100644
--- a/app/src/views/DrefFinalReportForm/schema.ts
+++ b/app/src/views/DrefFinalReportForm/schema.ts
@@ -170,6 +170,9 @@ const schema: FinalReportFormSchema = {
             number_of_people_affected: {
                 validations: [positiveIntegerCondition],
             },
+            estimated_number_of_affected_male: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_female: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_minors: { validations: [positiveIntegerCondition] },
             people_in_need: { validations: [positiveIntegerCondition] },
             event_description: {},
             images_file: {
@@ -241,6 +244,11 @@ const schema: FinalReportFormSchema = {
                 }),
             },
             risk_security_concern: {},
+            has_anti_fraud_corruption_policy: {},
+            has_anti_sexual_harassment_policy: {},
+            has_sexual_abuse_policy: {},
+            has_whistleblower_protection_policy: {},
+            has_child_protection_policy: {},
             has_child_safeguarding_risk_analysis_assessment: {},
             planned_interventions: {
                 keySelector: (n) => n.client_id,
@@ -331,6 +339,11 @@ const schema: FinalReportFormSchema = {
             media_contact_title: {},
             media_contact_email: { validations: [emailCondition] },
             media_contact_phone_number: {},
+            national_society_integrity_contact_name: {},
+            national_society_integrity_contact_title: {},
+            national_society_integrity_contact_email: { validations: [emailCondition] },
+            national_society_integrity_contact_phone_number: {},
+            national_society_hotline_phone_number: {},
         };
 
         // OVERVIEW
diff --git a/app/src/views/DrefOperationalUpdateExport/i18n.json b/app/src/views/DrefOperationalUpdateExport/i18n.json
index 707998546e..390aadd170 100644
--- a/app/src/views/DrefOperationalUpdateExport/i18n.json
+++ b/app/src/views/DrefOperationalUpdateExport/i18n.json
@@ -23,7 +23,7 @@
         "monthsSuffix": " months",
         "operationEndDateLabel": "New Operational End Date",
         "additionalAllocationRequestedLabel": "Additional Allocation Requested",
-        "targetedAreasLabel": "Targeted Areas",
+        "targetedAreasLabel": "Targeted Regions",
         "eventDescriptionSectionHeading": "Description of the Event",
         "whatWhereWhenSectionHeading": "What happened, where and when?",
         "situationUpdateSectionHeading": "Provide any updates in the situation since the field report and explain what is expected to happen.",
@@ -39,7 +39,7 @@
         "changingTargetPopulationLabel":"Are you changing the target population of the operation",
         "changingLocationLabel":"Are you changing the geographical location",
         "changingBudgetLabel":"Are you making changes to the budget",
-        "secondAllocationLabel":"Is this a request for a second allocation",
+        "secondAllocationLabel":"Are you requesting an additional allocation?",
         "eventMaterializedLabel":"Has the forecasted event materialize?",
         "changeSummaryLabel":"Please explain the summary of changes and justification",
         "specifiedTriggerMetLabel": "Please explain how the operation is transitioning from Anticipatory to Response",
@@ -74,8 +74,8 @@
         "ruralLabel": "Rural",
         "urbanLabel": "Urban",
         "peopleWithDisabilitiesLabel": "People with disabilities (estimated)",
-        "riskAndSecuritySectionHeading": "Risk and Security Considerations",
-        "riskSecurityHeading": "Please indicate about potential operation risk for this operations and mitigation actions",
+        "riskAndSecuritySectionHeading": "Risk and Security Considerations (including \"management\")",
+        "riskSecurityHeading": "Please analyse and indicate potential risks for this operation, its root causes and mitigation actions.",
         "safetyConcernHeading": "Please indicate any security and safety concerns for this operation",
         "hasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
         "plannedInterventionSectionHeading": "Planned Intervention",
diff --git a/app/src/views/DrefOperationalUpdateExport/index.tsx b/app/src/views/DrefOperationalUpdateExport/index.tsx
index d795955efb..cc2d478a2d 100644
--- a/app/src/views/DrefOperationalUpdateExport/index.tsx
+++ b/app/src/views/DrefOperationalUpdateExport/index.tsx
@@ -208,8 +208,7 @@ export function Component() {
         || isDefined(drefResponse?.changing_budget)
         || isDefined(drefResponse?.changing_operation_strategy)
         || isDefined(drefResponse?.changing_target_population_of_operation)
-        || isDefined(drefResponse?.request_for_second_allocation)
-        || isDefined(drefResponse?.has_forecasted_event_materialize);
+        || isDefined(drefResponse?.request_for_second_allocation);
 
     const nsActionImagesDefined = isDefined(drefResponse)
         && drefResponse.photos_file
@@ -616,12 +615,6 @@ export function Component() {
                         valueType="boolean"
                         strongValue
                     />
-                    <BlockTextOutput
-                        label={strings.eventMaterializedLabel}
-                        value={drefResponse?.has_forecasted_event_materialize}
-                        valueType="boolean"
-                        strongValue
-                    />
                     {summaryOfChangeDefined && (
                         <TextOutput
                             className={styles.summary}
diff --git a/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json b/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json
index 73e4bd0a25..c2a9864176 100644
--- a/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json
@@ -7,7 +7,7 @@
         "drefOperationalUpdateSummaryAreYouChangingTargetPopulation": "Are you changing the target population of the operation",
         "drefOperationalUpdateSummaryAreYouChangingGeographicalLocation": "Are you changing the geographical location",
         "drefOperationalUpdateSummaryAreYouChangingBudget": "Are you making changes to the budget",
-        "drefOperationalUpdateSummaryRequestForSecondAllocation": "Is this a request for a second allocation",
+        "drefOperationalUpdateSummaryRequestForSecondAllocation": "Are you requesting an additional allocation?",
         "drefOperationalUpdateEventMaterialize": "Has the forecasted event materialize?",
         "drefOperationalUpdateEventMaterializeExplain": "Please explain how is the operation is transitioning from Anticipatory to Response",
         "drefOperationalUpdateEventMaterializeExplainDescription": "Explain on whether the specified triggers have been met, and if the event has materialized either as forecasted or if there were any differences. Also please provide an update on the readiness, prepositioning and/or early actions implemented so far",
@@ -33,6 +33,9 @@
         "drefFormRiskPeopleLabel": "Total population at risk",
         "drefFormClickEmergencyResponseFramework": "Click to view Emergency Response Framework",
         "drefFormPeopleAffected": "Total affected population",
+        "drefFormAffectedMaleLabel": "Estimated male",
+        "drefFormAffectedFemaleLabel": "Estimated female",
+        "drefFormAffectedMinorsLabel": "Estimated minors",
         "drefFormPeopleAffectedDescriptionImminent": "Includes all those whose lives and livelihoods are at risk as a direct result of the shock or stress.",
         "drefFormPeopleAffectedDescriptionSlowSudden": "People Affected include all those whose lives and livelihoods have been impacted as a direct result of the shock or stress.",
         "drefFormEstimatedPeopleInNeed": "Estimated people in need (Optional)",
@@ -42,4 +45,4 @@
         "drefFormPeopleTargeted": "Number of people targeted",
         "drefFormPeopleTargetedDescription": "Include all those whose the National Society is aiming or planning to assist"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx b/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx
index 8124718028..c63378b9bf 100644
--- a/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx
@@ -159,19 +159,7 @@ function EventDetail(props: Props) {
                             disabled={disabled}
                         />
                     </InputSection>
-                    <InputSection
-                        title={strings.drefOperationalUpdateEventMaterialize}
-                    >
-                        <BooleanInput
-                            name="has_forecasted_event_materialize"
-                            value={value.has_forecasted_event_materialize}
-                            onChange={setFieldValue}
-                            error={error?.has_forecasted_event_materialize}
-                            disabled={disabled}
-                        />
-                    </InputSection>
-                    {/* eslint-disable-next-line max-len */}
-                    {value.type_of_dref === TYPE_IMMINENT && value.has_forecasted_event_materialize && (
+                    {value.type_of_dref === TYPE_IMMINENT && (
                         <InputSection
                             title={strings.drefOperationalUpdateEventMaterializeExplain}
                             // eslint-disable-next-line max-len
@@ -301,6 +289,30 @@ function EventDetail(props: Props) {
                             disabled={disabled}
                         />
                     )}
+                    <NumberInput
+                        name="estimated_number_of_affected_male"
+                        label={strings.drefFormAffectedMaleLabel}
+                        value={value?.estimated_number_of_affected_male}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_male}
+                        disabled={disabled}
+                    />
+                    <NumberInput
+                        name="estimated_number_of_affected_female"
+                        label={strings.drefFormAffectedFemaleLabel}
+                        value={value?.estimated_number_of_affected_female}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_female}
+                        disabled={disabled}
+                    />
+                    <NumberInput
+                        name="estimated_number_of_affected_minors"
+                        label={strings.drefFormAffectedMinorsLabel}
+                        value={value?.estimated_number_of_affected_minors}
+                        onChange={setFieldValue}
+                        error={error?.estimated_number_of_affected_minors}
+                        disabled={disabled}
+                    />
                     <NumberInput
                         label={(
                             <>
diff --git a/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css b/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css
index a8aedf04ee..c5c16569ac 100644
--- a/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css
+++ b/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css
@@ -2,4 +2,10 @@
     display: flex;
     flex-direction: column;
     gap: var(--go-ui-spacing-2xl);
+
+    .affected-section {
+        display: flex;
+        flex-direction: column;
+        gap: var(--go-ui-spacing-sm);
+    }
 }
diff --git a/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json b/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json
index 6c30cd3247..b750c5f181 100644
--- a/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json
@@ -13,10 +13,23 @@
         "drefFormResponseRationale": "Operation strategy rationale",
         "drefFormResponseRationaleDescription": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
         "drefFormResponseRationalePlaceholder": "To address the needs of the targeted population, this DREF will aim at (please briefly describe the planned activities).",
-        "drefFormRiskSecurity": "Risk and security considerations",
+        "drefFormRiskSecurity": "Risk and Security Considerations (including \"management\")",
+        "drefFormRiskDoesNSHaveAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
+        "drefFormRiskDoesNSHaveSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
+        "drefFormRiskDoesNSHaveChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
+        "drefFormRiskDoesNSHaveWhistleblowerPolicy": "Does your National Society have whistleblower protection policy?",
+        "drefFormRiskDoesNSHaveAntiSexualHarassmentPolicy": "Does your National Society have anti-sexual harassment policy?",
         "drefFormRiskSecurityAddButton": "Add New Risk",
-        "drefFormRiskSecurityPotentialRisk": "Please indicate about potential operational risk for this operations and mitigation actions",
-        "drefFormRiskSecurityPotentialRiskDescription": "Please consider any possible challenges to conduct the assessment, any possible limitations in getting the information required and overall risk to the implementation",
+        "drefFormRiskSecurityPotentialRisk": "Please analyse and indicate potential risks for this operation, its root causes and mitigation actions.",
+        "drefFormRiskSecurityPotentialRiskAssessmentDescription": "Please consider any possible challenges to conduct the assessment, any possible limitations in getting the information required and overall risk to the implementation",
+        "drefFormRiskSecurityPotentialRiskDescription": "When identifying the risks, please review the IFRC Risk Management Policy and Framework including the different risk categories. When possible, make sure that your identification of risks includes some analysis of previous incidents and performance of the NS in previous operations.",
+        "drefFormRiskSecurityRiskSelectedDescription": "Identify up to 5 key potential risks or threats that could negatively impact the success of the operation. These can range from environmental risks to social or logistical challenges.",
+        "drefFormRiskSecurityRiskSelectedPoint1": "What are the primary risks that could affect the operation’s implementation?",
+        "drefFormRiskSecurityRiskSelectedPoint2": "Are there any context-specific risks that need to be considered?",
+        "drefFormRiskSecurityRiskSelectedPoint3": "How might these risks impact the operation’s objectives, timeline, or resources? Mitigation actions are actions or strategies that will be implemented to reduce or manage the identified risks, ensuring the operation can proceed as planned.",
+        "drefFormRiskSecurityRiskSelectedPoint4": "What specific measures or strategies will be put in place to mitigate the risks identified?",
+        "drefFormRiskSecurityRiskSelectedPoint5": "Will contingency plans or additional resources be required to address these risks?",
+        "drefFormRiskSecurityRiskCategoriesLinkLabel": "Annex III - Risk Categories.pdf",
         "drefFormRiskSecuritySafetyConcern": "Please indicate any security and safety concerns for this operation",
         "drefFormRiskSecurityHasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
         "drefFormRiskSecurityHasChildRiskCompletedDescription":"The IFRC Child Safeguarding Risk Analysis helps Operations quickly identify and rate their key child safeguarding risks in order to reduce the risk of harm against children, as outlined as a requirement in the IFRC Child Safeguarding Policy. Here are the link to the tool and Q&A",
@@ -49,7 +62,14 @@
         "drefFormEstimatePeopleDisability": "Estimated Percentage People with Disability",
         "drefFormEstimateResponse": "Estimate",
         "drefFormGirls": "Girls (under 18)",
-        "drefFormHumanResourceDescription": "How many staff and volunteers will be involved in this operation. Briefly describe their role.",
+        "drefFormHumanResourceTitle": "How many staff and volunteers will be involved in this operation.",
+        "drefFormHumanResourceDescription": "A brief description of the human resources that will be engaged in the operation, including both staff and volunteers.",
+        "drefFormHumanResourceDescriptionPoint1": "How many staff members and volunteers are expected to participate?",
+        "drefFormHumanResourceDescriptionPoint2": "What specific roles or responsibilities will they have during the operation?",
+        "drefFormHumanResourceDescriptionPoint3": "Are there any key leadership positions or coordinators overseeing the activities?",
+        "drefFormIsVolunteerTeamDiverseTitle": "Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
+        "drefFormIsVolunteerTeamDiverseDescription": "This question is about making sure your team includes the right mix of people to best support those affected. For example, if you’re helping single female heads of households, it’s important to have enough female volunteers to make everyone feel comfortable and understood. Including team members who share the same language or cultural background as the people you’re helping can also make a big difference in building trust and providing effective support.",
+        "drefFormIsVolunteerTeamDiverseLabel": "Description",
         "drefFormInterventionsLabel": "Select the interventions that apply.",
         "drefFormLogisticCapacityOfNs": "If there is procurement, will it be done by National Society or IFRC?",
         "drefFormLogisticCapacityOfNsDescription": "Will it be for replenishment or for distribution? If for distribution, how long is the tendering expected to take? For Cash and Voucher Assistance, what is the status of the Financial Service Provider?",
diff --git a/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx b/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx
index ff2b4de64a..3ef9e56850 100644
--- a/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx
@@ -408,10 +408,101 @@ function Operation(props: Props) {
             <Container
                 heading={strings.drefFormRiskSecurity}
             >
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveAntiFraudPolicy}
+                >
+                    <BooleanInput
+                        name="has_anti_fraud_corruption_policy"
+                        value={value.has_anti_fraud_corruption_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_anti_fraud_corruption_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveSexualAbusePolicy}
+                >
+                    <BooleanInput
+                        name="has_sexual_abuse_policy"
+                        value={value.has_sexual_abuse_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_sexual_abuse_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveChildProtectionPolicy}
+                >
+                    <BooleanInput
+                        name="has_child_protection_policy"
+                        value={value.has_child_protection_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_child_protection_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveWhistleblowerPolicy}
+                >
+                    <BooleanInput
+                        name="has_whistleblower_protection_policy"
+                        value={value.has_whistleblower_protection_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_whistleblower_protection_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveAntiSexualHarassmentPolicy}
+                >
+                    <BooleanInput
+                        name="has_anti_sexual_harassment_policy"
+                        value={value.has_anti_sexual_harassment_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_anti_sexual_harassment_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
                 <InputSection
                     title={strings.drefFormRiskSecurityPotentialRisk}
-                    description={value?.type_of_dref === TYPE_ASSESSMENT
-                        && strings.drefFormRiskSecurityPotentialRiskDescription}
+                    description={(
+                        <>
+                            {value?.type_of_dref === TYPE_ASSESSMENT
+                                && strings.drefFormRiskSecurityPotentialRiskAssessmentDescription}
+                            {strings.drefFormRiskSecurityPotentialRiskDescription}
+                            <Link
+                                href="https://github.com/user-attachments/files/18903662/Annex.III.Risk.Categories.1.pdf"
+                                withLinkIcon
+                                external
+                            >
+                                {strings.drefFormRiskSecurityRiskCategoriesLinkLabel}
+                            </Link>
+                            {(value.risk_security?.length ?? 0) > 0 && (
+                                <>
+                                    <p>
+                                        {strings.drefFormRiskSecurityRiskSelectedDescription}
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint4}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormRiskSecurityRiskSelectedPoint5}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
+                        </>
+                    )}
                 >
                     <NonFieldError error={getErrorObject(error?.risk_security)} />
                     {value.risk_security?.map((rs, i) => (
@@ -588,7 +679,23 @@ function Operation(props: Props) {
                 heading={strings.drefFormSupportServices}
             >
                 <InputSection
-                    title={strings.drefFormHumanResourceDescription}
+                    title={strings.drefFormHumanResourceTitle}
+                    description={(
+                        <>
+                            {strings.drefFormHumanResourceDescription}
+                            <ul>
+                                <li>
+                                    {strings.drefFormHumanResourceDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormHumanResourceDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormHumanResourceDescriptionPoint3}
+                                </li>
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         label={strings.drefFormOperationDescription}
@@ -599,6 +706,19 @@ function Operation(props: Props) {
                         disabled={disabled}
                     />
                 </InputSection>
+                <InputSection
+                    title={strings.drefFormIsVolunteerTeamDiverseTitle}
+                    description={strings.drefFormIsVolunteerTeamDiverseDescription}
+                >
+                    <TextArea
+                        name="is_volunteer_team_diverse"
+                        label={strings.drefFormIsVolunteerTeamDiverseLabel}
+                        value={value.is_volunteer_team_diverse}
+                        onChange={setFieldValue}
+                        error={error?.is_volunteer_team_diverse}
+                        disabled={disabled}
+                    />
+                </InputSection>
                 <InputSection
                     title={strings.drefFormSurgePersonnelDeployed}
                     description={value?.is_surge_personnel_deployed
diff --git a/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json b/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json
index 08d9eccf18..7bfdc6c679 100644
--- a/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json
@@ -23,7 +23,7 @@
         "drefFormAddRegion": "Region/Province",
         "drefFormTitle": "DREF Title",
         "drefFormGenerateTitle": "Generate title",
-        "drefFormEmergencyAppealPlanned": "Emergency appeal planned",
+        "formShareButtonLabel": "Add",
         "drefFormUploadMap": "Upload map",
         "drefFormUploadMapDescription": "Add a map highlighting the targeted areas for this operation, it will be used for the publicly published DREF application.",
         "drefFormUploadAnImageLabel": "Select an Image",
@@ -37,4 +37,4 @@
         "noLabel": "No",
         "changeToResponseHeading": "Change DREF Type"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx b/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
index a5715ad64b..5516d45cd8 100644
--- a/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
@@ -3,8 +3,14 @@ import {
     type SetStateAction,
     useCallback,
 } from 'react';
-import { useLocation } from 'react-router-dom';
-import { WikiHelpSectionLineIcon } from '@ifrc-go/icons';
+import {
+    useLocation,
+    useParams,
+} from 'react-router-dom';
+import {
+    ShareLineIcon,
+    WikiHelpSectionLineIcon,
+} from '@ifrc-go/icons';
 import {
     BooleanInput,
     Button,
@@ -21,7 +27,10 @@ import {
     useTranslation,
 } from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
-import { isNotDefined } from '@togglecorp/fujs';
+import {
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
 import {
     type EntriesAsList,
     type Error,
@@ -32,6 +41,7 @@ import {
 import CountrySelectInput from '#components/domain/CountrySelectInput';
 import DisasterTypeSelectInput from '#components/domain/DisasterTypeSelectInput';
 import DistrictSearchMultiSelectInput, { type DistrictItem } from '#components/domain/DistrictSearchMultiSelectInput';
+import DrefShareModal from '#components/domain/DrefShareModal';
 import UserItem from '#components/domain/DrefShareModal/UserItem';
 import ImageWithCaptionInput from '#components/domain/ImageWithCaptionInput';
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
@@ -40,13 +50,16 @@ import Link from '#components/Link';
 import useCountry from '#hooks/domain/useCountry';
 import useDisasterType from '#hooks/domain/useDisasterType';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
-import { type GoApiResponse } from '#utils/restRequest';
+import useInputState from '#hooks/useInputState';
+import {
+    type GoApiResponse,
+    useRequest,
+} from '#utils/restRequest';
 
 import {
     DISASTER_FIRE,
     DISASTER_FLASH_FLOOD,
     DISASTER_FLOOD,
-    ONSET_SUDDEN,
     TYPE_ASSESSMENT,
     TYPE_IMMINENT,
     TYPE_LOAN,
@@ -85,7 +98,7 @@ interface Props {
     setFileIdToUrlMap?: React.Dispatch<React.SetStateAction<Record<number, string>>>;
     districtOptions: DistrictItem[] | null | undefined;
     setDistrictOptions: Dispatch<SetStateAction<DistrictItem[] | null | undefined>>;
-    drefUsers?: User[] | null;
+    drefId: number | undefined;
 }
 
 function Overview(props: Props) {
@@ -98,9 +111,11 @@ function Overview(props: Props) {
         disabled,
         districtOptions,
         setDistrictOptions,
-        drefUsers,
+        drefId,
     } = props;
     const { state } = useLocation();
+    const { opsUpdateId } = useParams<{ opsUpdateId: string }>();
+    const [drefUsers, setDrefUsers] = useInputState<User[] | undefined | null>([]);
 
     const strings = useTranslation(i18n);
     const {
@@ -120,16 +135,6 @@ function Overview(props: Props) {
         },
     ] = useBooleanState(true);
 
-    const handleTypeOfOnsetChange = useCallback((
-        typeOfOnset: OnsetTypeOption['key'] | undefined,
-        name: 'type_of_onset',
-    ) => {
-        setFieldValue(typeOfOnset, name);
-        if (typeOfOnset === ONSET_SUDDEN) {
-            setFieldValue(false, 'emergency_appeal_planned');
-        }
-    }, [setFieldValue]);
-
     const handleNSChange = useCallback((nationalSociety: number | undefined) => {
         setFieldValue(nationalSociety, 'national_society');
         if (nationalSociety) {
@@ -178,6 +183,30 @@ function Overview(props: Props) {
         user,
     }), []);
 
+    const {
+        retrigger: getDrefUsers,
+    } = useRequest({
+        skip: isNotDefined(drefId),
+        url: '/api/v2/dref-share-user/{id}/',
+        pathVariables: { id: Number(drefId) },
+        onSuccess: (response) => {
+            setDrefUsers(response.users_details);
+        },
+    });
+
+    const [showShareModal, {
+        setTrue: setShowShareModalTrue,
+        setFalse: setShowShareModalFalse,
+    }] = useBooleanState(false);
+
+    const handleUserShareSuccess = useCallback(() => {
+        setShowShareModalFalse();
+        getDrefUsers();
+    }, [
+        getDrefUsers,
+        setShowShareModalFalse,
+    ]);
+
     const error = getErrorObject(formError);
 
     return (
@@ -234,6 +263,15 @@ function Overview(props: Props) {
                         pending={false}
                         compact
                     />
+                    <Button
+                        name={undefined}
+                        onClick={setShowShareModalTrue}
+                        disabled={isNotDefined(opsUpdateId)}
+                        icons={<ShareLineIcon />}
+                        variant="secondary"
+                    >
+                        {strings.formShareButtonLabel}
+                    </Button>
                 </InputSection>
             </Container>
             <Container
@@ -296,7 +334,7 @@ function Overview(props: Props) {
                         keySelector={onsetTypeKeySelector}
                         labelSelector={stringValueSelector}
                         value={value?.type_of_onset}
-                        onChange={handleTypeOfOnsetChange}
+                        onChange={setFieldValue}
                         error={error?.type_of_onset}
                         disabled={disabled}
                         withAsterisk
@@ -401,19 +439,6 @@ function Overview(props: Props) {
                     </div>
                 </InputSection>
 
-                {value?.type_of_dref !== TYPE_LOAN && (
-                    <InputSection
-                        title={strings.drefFormEmergencyAppealPlanned}
-                    >
-                        <BooleanInput
-                            name="emergency_appeal_planned"
-                            value={value?.emergency_appeal_planned}
-                            onChange={setFieldValue}
-                            error={error?.emergency_appeal_planned}
-                            disabled={disabled}
-                        />
-                    </InputSection>
-                )}
                 {value?.type_of_dref !== TYPE_LOAN && (
                     <InputSection
                         title={strings.drefFormUploadMap}
@@ -470,6 +495,13 @@ function Overview(props: Props) {
                     </InputSection>
                 )}
             </Container>
+            {showShareModal && isDefined(drefId) && (
+                <DrefShareModal
+                    onCancel={setShowShareModalFalse}
+                    onSuccess={handleUserShareSuccess}
+                    drefId={drefId}
+                />
+            )}
         </div>
     );
 }
diff --git a/app/src/views/DrefOperationalUpdateForm/Submission/i18n.json b/app/src/views/DrefOperationalUpdateForm/Submission/i18n.json
index 6eb77e542c..fe1130391c 100644
--- a/app/src/views/DrefOperationalUpdateForm/Submission/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/Submission/i18n.json
@@ -24,6 +24,13 @@
         "drefFormSubmissionNameLabel": "Name",
         "drefFormSubmissionTitleLabel": "Title",
         "drefFromSubmissionEmailLabel": "Email",
+        "drefFormNationalSocietyIntegrityTitle": "National Societies' Integrity Focal Point",
+        "drefFormIntegrityContactNameLabel": "Name",
+        "drefFormIntegrityContactEmailLabel": "Email",
+        "drefFormIntegrityContactTitleLabel": "Title",
+        "drefFormIntegrityContactPhoneNumberLabel": "Phone Number",
+        "drefFormNationalSocietyHotlineNumberTitle": "National Society Hotline",
+        "drefFormNationalSocietyHotlineNumberLabel": "Phone Number",
         "drefFromSubmissionPhoneNumberLabel": "Phone Number"
     }
 }
diff --git a/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx b/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
index 6b90a24d92..f4d3e4b3b8 100644
--- a/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
@@ -417,6 +417,56 @@ function Submission(props: Props) {
                         />
                     </InputSection>
                 )}
+                <InputSection
+                    title={strings.drefFormNationalSocietyIntegrityTitle}
+                    numPreferredColumns={2}
+                >
+                    <TextInput
+                        label={strings.drefFormIntegrityContactNameLabel}
+                        name="national_society_integrity_contact_name"
+                        value={value.national_society_integrity_contact_name}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_name}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactEmailLabel}
+                        name="national_society_integrity_contact_email"
+                        value={value.national_society_integrity_contact_email}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_email}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactTitleLabel}
+                        name="national_society_integrity_contact_title"
+                        value={value.national_society_integrity_contact_title}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_title}
+                        disabled={disabled}
+                    />
+                    <TextInput
+                        label={strings.drefFormIntegrityContactPhoneNumberLabel}
+                        name="national_society_integrity_contact_phone_number"
+                        value={value.national_society_integrity_contact_phone_number}
+                        onChange={setFieldValue}
+                        error={error?.national_society_integrity_contact_phone_number}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormNationalSocietyHotlineNumberTitle}
+                    numPreferredColumns={2}
+                >
+                    <TextInput
+                        label={strings.drefFormNationalSocietyHotlineNumberLabel}
+                        name="national_society_hotline_phone_number"
+                        value={value.national_society_hotline_phone_number}
+                        onChange={setFieldValue}
+                        error={error?.national_society_hotline_phone_number}
+                        disabled={disabled}
+                    />
+                </InputSection>
             </Container>
         </div>
     );
diff --git a/app/src/views/DrefOperationalUpdateForm/common.tsx b/app/src/views/DrefOperationalUpdateForm/common.tsx
index a905b6f0fd..de9d6d9b3c 100644
--- a/app/src/views/DrefOperationalUpdateForm/common.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/common.tsx
@@ -38,24 +38,26 @@ const overviewFields: (keyof PartialOpsUpdate)[] = [
     'national_society',
     'country',
     'district',
-    'people_in_need',
     'disaster_type',
     'type_of_onset',
     'disaster_category',
     'event_map_file',
     'cover_image_file',
-    'emergency_appeal_planned',
     'is_man_made_event',
     // 'is_assessment_report',
     'type_of_dref',
-    'number_of_people_targeted',
-    'number_of_people_affected',
     'additional_allocation',
     'dref_allocated_so_far',
     'total_dref_allocation',
 ] satisfies (keyof PartialOpsUpdate)[];
 
 const eventDetailFields: (keyof PartialOpsUpdate)[] = [
+    'number_of_people_targeted',
+    'number_of_people_affected',
+    'estimated_number_of_affected_male',
+    'estimated_number_of_affected_female',
+    'estimated_number_of_affected_minors',
+    'people_in_need',
     'event_description',
     'event_scope',
     'images_file',
@@ -69,7 +71,6 @@ const eventDetailFields: (keyof PartialOpsUpdate)[] = [
     'changing_target_population_of_operation',
     'changing_geographic_location',
     'request_for_second_allocation',
-    'has_forecasted_event_materialize',
     'specified_trigger_met',
 ] satisfies (keyof PartialOpsUpdate)[];
 
@@ -105,6 +106,7 @@ const operationFields: (keyof PartialOpsUpdate)[] = [
     'operation_objective',
     'response_strategy',
     'human_resource',
+    'is_volunteer_team_diverse',
     'surge_personnel_deployed',
     'logistic_capacity_of_ns',
     'pmer',
@@ -147,6 +149,11 @@ const submissionFields: (keyof PartialOpsUpdate)[] = [
     'media_contact_name',
     'media_contact_email',
     'media_contact_phone_number',
+    'national_society_integrity_contact_name',
+    'national_society_integrity_contact_title',
+    'national_society_integrity_contact_email',
+    'national_society_integrity_contact_phone_number',
+    'national_society_hotline_phone_number',
     'media_contact_title',
     'total_operation_timeframe',
     'new_operational_start_date',
diff --git a/app/src/views/DrefOperationalUpdateForm/i18n.json b/app/src/views/DrefOperationalUpdateForm/i18n.json
index 34b167a97e..16beca4890 100644
--- a/app/src/views/DrefOperationalUpdateForm/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/i18n.json
@@ -19,11 +19,10 @@
         "formLoadErrorTitle": "Failed to load DREF Operational Update",
         "formLoadErrorHelpText": "Please make sure that the operational update with given id exists and you have the permission to view it",
         "formBackButtonLabel": "Back",
-        "formShareButtonLabel": "Share",
         "drefOperationalUpdateFormTimeframe": "Please select a different timeframe when selected yes on changing the operation timeframe",
         "drefOperationalUpdateFormOperationTimeframe": "Please select yes on changing the operation timeframe",
-        "drefOperationAdditionalBudget": "When requesting for additional budget allocation, the fields \"Are you making changes to the budget\" and \"Is this a request for a second allocation\" both should be marked \"Yes\" in \"Event Details\" section",
-        "drefOperationAdditionalAllocation": "The field \"Additional Allocation Requested\" should be filled in \"Operation Overview\" section to change the budget or for a second allocation",
+        "drefOperationAdditionalBudget": "When requesting for additional budget allocation, the fields \"Are you making changes to the budget\" and \"Are you requesting an additional allocation\" both should be marked \"Yes\" in \"Event Details\" section",
+        "drefOperationAdditionalAllocation": "The field \"Additional Allocation Requested\" should be filled in \"Operation Overview\" section to change the budget or for an additional allocation",
         "drefOperationSelectDistrict": "Please select a different district when selected yes on changing geographic location",
         "drefOperationSelectLocation": "Please select yes on changing geographic location",
         "drefOperationTargetedPopulation": "Please select a different value for targeted population when selected yes on changing target population",
diff --git a/app/src/views/DrefOperationalUpdateForm/index.tsx b/app/src/views/DrefOperationalUpdateForm/index.tsx
index 495c540b33..e2b93efd15 100644
--- a/app/src/views/DrefOperationalUpdateForm/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/index.tsx
@@ -9,7 +9,6 @@ import { useParams } from 'react-router-dom';
 import {
     DownloadTwoLineIcon,
     ErrorWarningFillIcon,
-    ShareLineIcon,
 } from '@ifrc-go/icons';
 import type { ButtonProps } from '@ifrc-go/ui';
 import {
@@ -41,15 +40,12 @@ import {
 
 import { type DistrictItem } from '#components/domain/DistrictSearchMultiSelectInput';
 import DrefExportModal from '#components/domain/DrefExportModal';
-import DrefShareModal from '#components/domain/DrefShareModal';
 import LanguageMismatchMessage from '#components/domain/LanguageMismatchMessage';
-import { type User } from '#components/domain/UserSearchMultiSelectInput';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import Page from '#components/Page';
 import useCurrentLanguage from '#hooks/domain/useCurrentLanguage';
 import useAlert from '#hooks/useAlert';
-import useInputState from '#hooks/useInputState';
 import {
     type GoApiResponse,
     useLazyRequest,
@@ -128,7 +124,6 @@ export function Component() {
 
     const [activeTab, setActiveTab] = useState<TabKeys>('overview');
     const [fileIdToUrlMap, setFileIdToUrlMap] = useState<Record<number, string>>({});
-    const [drefUsers, setDrefUsers] = useInputState<User[] | undefined | null>([]);
     const [
         showObsoletePayloadModal,
         setShowObsoletePayloadModal,
@@ -137,10 +132,6 @@ export function Component() {
     const [districtOptions, setDistrictOptions] = useState<
         DistrictItem[] | undefined | null
     >([]);
-    const [showShareModal, {
-        setTrue: setShowShareModalTrue,
-        setFalse: setShowShareModalFalse,
-    }] = useBooleanState(false);
     const [showExportModal, {
         setTrue: setShowExportModalTrue,
         setFalse: setShowExportModalFalse,
@@ -169,7 +160,6 @@ export function Component() {
                 changing_geographic_location: false,
                 changing_budget: false,
                 request_for_second_allocation: false,
-                has_forecasted_event_materialize: false,
             },
         },
     );
@@ -257,7 +247,6 @@ export function Component() {
                 changing_geographic_location,
                 changing_budget,
                 request_for_second_allocation,
-                has_forecasted_event_materialize,
                 source_information,
                 // disability_people_per,
                 // people_per_urban,
@@ -297,7 +286,6 @@ export function Component() {
                 changing_geographic_location: changing_geographic_location ?? false,
                 changing_budget: changing_budget ?? false,
                 request_for_second_allocation: request_for_second_allocation ?? false,
-                has_forecasted_event_materialize: has_forecasted_event_materialize ?? false,
                 source_information: source_information?.map(injectClientId),
             });
 
@@ -422,17 +410,6 @@ export function Component() {
         },
     });
 
-    const {
-        retrigger: getDrefUsers,
-    } = useRequest({
-        skip: isNotDefined(drefId),
-        url: '/api/v2/dref-share-user/{id}/',
-        pathVariables: { id: Number(drefId) },
-        onSuccess: (response) => {
-            setDrefUsers(response.users_details);
-        },
-    });
-
     const handleFormSubmit = useCallback(
         (modifiedAt?: string) => {
             formContentRef.current?.scrollIntoView();
@@ -579,12 +556,6 @@ export function Component() {
         ],
     );
 
-    const handleShareClick: NonNullable<ButtonProps<undefined>['onClick']> = useCallback(
-        () => {
-            setShowShareModalTrue();
-        },
-        [setShowShareModalTrue],
-    );
     const handleExportClick: NonNullable<ButtonProps<undefined>['onClick']> = useCallback(
         () => {
             setShowExportModalTrue();
@@ -592,14 +563,6 @@ export function Component() {
         [setShowExportModalTrue],
     );
 
-    const handleUserShareSuccess = useCallback(() => {
-        setShowShareModalFalse();
-        getDrefUsers();
-    }, [
-        getDrefUsers,
-        setShowShareModalFalse,
-    ]);
-
     const hasAnyWarning = isTruthyString(peopleTargetedWarning)
         || isTruthyString(operationTimeframeWarning)
         || isTruthyString(budgetWarning)
@@ -643,25 +606,14 @@ export function Component() {
                 actions={(
                     <>
                         {isTruthyString(opsUpdateId) && (
-                            <>
-                                <Button
-                                    name={undefined}
-                                    onClick={handleShareClick}
-                                    disabled={isNotDefined(drefId)}
-                                    icons={<ShareLineIcon />}
-                                    variant="secondary"
-                                >
-                                    {strings.formShareButtonLabel}
-                                </Button>
-                                <Button
-                                    name={undefined}
-                                    onClick={handleExportClick}
-                                    icons={<DownloadTwoLineIcon />}
-                                    variant="secondary"
-                                >
-                                    {strings.formExportLabel}
-                                </Button>
-                            </>
+                            <Button
+                                name={undefined}
+                                onClick={handleExportClick}
+                                icons={<DownloadTwoLineIcon />}
+                                variant="secondary"
+                            >
+                                {strings.formExportLabel}
+                            </Button>
                         )}
                         <Button
                             name={undefined}
@@ -781,8 +733,8 @@ export function Component() {
                                 error={formError}
                                 disabled={disabled}
                                 districtOptions={districtOptions}
-                                drefUsers={drefUsers}
                                 setDistrictOptions={setDistrictOptions}
+                                drefId={drefId}
                             />
                         </TabPanel>
                         <TabPanel name="eventDetail">
@@ -833,14 +785,23 @@ export function Component() {
                                 >
                                     {strings.formBackButtonLabel}
                                 </Button>
-                                <Button
-                                    name={nextStep ?? activeTab}
-                                    onClick={handleTabChange}
-                                    disabled={isNotDefined(nextStep)}
-                                    variant="secondary"
-                                >
-                                    {strings.formContinueButtonLabel}
-                                </Button>
+                                {isDefined(nextStep) ? (
+                                    <Button
+                                        name={nextStep ?? activeTab}
+                                        onClick={handleTabChange}
+                                        variant="secondary"
+                                    >
+                                        {strings.formContinueButtonLabel}
+                                    </Button>
+                                ) : (
+                                    <Button
+                                        name={undefined}
+                                        onClick={handleFormSubmit}
+                                        disabled={disabled}
+                                    >
+                                        {strings.formSaveButtonLabel}
+                                    </Button>
+                                )}
                             </div>
                         </div>
                     </>
@@ -852,13 +813,6 @@ export function Component() {
                         onCancelButtonClick={setShowObsoletePayloadModal}
                     />
                 )}
-                {showShareModal && isDefined(drefId) && (
-                    <DrefShareModal
-                        onCancel={setShowShareModalFalse}
-                        onSuccess={handleUserShareSuccess}
-                        drefId={drefId}
-                    />
-                )}
                 {showExportModal && isDefined(opsUpdateId) && (
                     <DrefExportModal
                         onCancel={setShowExportModalFalse}
diff --git a/app/src/views/DrefOperationalUpdateForm/schema.ts b/app/src/views/DrefOperationalUpdateForm/schema.ts
index 5b1362f6c5..35054cbef0 100644
--- a/app/src/views/DrefOperationalUpdateForm/schema.ts
+++ b/app/src/views/DrefOperationalUpdateForm/schema.ts
@@ -154,6 +154,9 @@ const schema: OpsUpdateFormSchema = {
             // EVENT DETAILS
             number_of_people_affected: { validations: [positiveIntegerCondition] },
             number_of_people_targeted: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_male: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_female: { validations: [positiveIntegerCondition] },
+            estimated_number_of_affected_minors: { validations: [positiveIntegerCondition] },
 
             // none
 
@@ -209,7 +212,6 @@ const schema: OpsUpdateFormSchema = {
         );
 
         const overviewDrefTypeRelatedFields = [
-            'emergency_appeal_planned',
             'event_map_file',
             'cover_image_file',
             'ns_request_date',
@@ -226,7 +228,6 @@ const schema: OpsUpdateFormSchema = {
             overviewDrefTypeRelatedFields,
             (val): OverviewDrefTypeRelatedFields => {
                 const conditionalFields: OverviewDrefTypeRelatedFields = {
-                    emergency_appeal_planned: { forceValue: nullValue },
                     event_map_file: { forceValue: nullValue },
                     cover_image_file: { forceValue: nullValue },
                     ns_request_date: { forceValue: nullValue },
@@ -241,7 +242,6 @@ const schema: OpsUpdateFormSchema = {
                 }
                 return {
                     ...conditionalFields,
-                    emergency_appeal_planned: {},
                     event_map_file: {
                         fields: (): EventMapFileFields => ({
                             client_id: {},
@@ -278,7 +278,6 @@ const schema: OpsUpdateFormSchema = {
             'changing_target_population_of_operation',
             'changing_geographic_location',
             'request_for_second_allocation',
-            'has_forecasted_event_materialize',
             'source_information',
         ] as const;
         type EventDetailDrefTypeRelatedFields = Pick<
@@ -308,7 +307,6 @@ const schema: OpsUpdateFormSchema = {
                     changing_target_population_of_operation: { forceValue: nullValue },
                     changing_geographic_location: { forceValue: nullValue },
                     request_for_second_allocation: { forceValue: nullValue },
-                    has_forecasted_event_materialize: { forceValue: nullValue },
                 };
 
                 if (
@@ -374,7 +372,6 @@ const schema: OpsUpdateFormSchema = {
                         changing_target_population_of_operation: {},
                         changing_geographic_location: {},
                         request_for_second_allocation: {},
-                        has_forecasted_event_materialize: {},
                     };
                 }
 
@@ -382,13 +379,14 @@ const schema: OpsUpdateFormSchema = {
             },
         );
 
+        // NOTE: @samshara can you confirm this logic?
         formFields = addCondition(
             formFields,
             formValue,
-            ['type_of_dref', 'has_forecasted_event_materialize'],
+            ['type_of_dref'],
             ['specified_trigger_met'],
             (val): Pick<OpsUpdateFormSchemaFields, 'specified_trigger_met'> => {
-                if (val?.type_of_dref === TYPE_IMMINENT && val?.has_forecasted_event_materialize) {
+                if (val?.type_of_dref === TYPE_IMMINENT) {
                     return {
                         specified_trigger_met: {},
                     };
@@ -573,9 +571,15 @@ const schema: OpsUpdateFormSchema = {
             'displaced_people',
             'risk_security',
             'risk_security_concern',
+            'has_anti_fraud_corruption_policy',
+            'has_sexual_abuse_policy',
+            'has_child_protection_policy',
+            'has_whistleblower_protection_policy',
+            'has_anti_sexual_harassment_policy',
             'budget_file',
             'planned_interventions',
             'human_resource',
+            'is_volunteer_team_diverse',
             'is_surge_personnel_deployed',
             'has_child_safeguarding_risk_analysis_assessment',
         ] as const;
@@ -609,9 +613,15 @@ const schema: OpsUpdateFormSchema = {
                     displaced_people: { forceValue: nullValue },
                     risk_security: { forceValue: [] },
                     risk_security_concern: { forceValue: nullValue },
+                    has_anti_fraud_corruption_policy: {},
+                    has_anti_sexual_harassment_policy: {},
+                    has_sexual_abuse_policy: {},
+                    has_whistleblower_protection_policy: {},
+                    has_child_protection_policy: {},
                     budget_file: { forceValue: nullValue },
                     planned_interventions: { forceValue: [] },
                     human_resource: { forceValue: nullValue },
+                    is_volunteer_team_diverse: { forceValue: nullValue },
                     is_surge_personnel_deployed: { forceValue: nullValue },
                     has_child_safeguarding_risk_analysis_assessment: { forceValue: nullValue },
                 };
@@ -716,6 +726,7 @@ const schema: OpsUpdateFormSchema = {
                         }),
                     },
                     human_resource: {},
+                    is_volunteer_team_diverse: {},
                     is_surge_personnel_deployed: {},
                 };
                 if (val?.type_of_dref !== TYPE_ASSESSMENT) {
@@ -778,6 +789,11 @@ const schema: OpsUpdateFormSchema = {
             'media_contact_title',
             'media_contact_email',
             'media_contact_phone_number',
+            'national_society_integrity_contact_name',
+            'national_society_integrity_contact_title',
+            'national_society_integrity_contact_email',
+            'national_society_integrity_contact_phone_number',
+            'national_society_hotline_phone_number',
             'glide_code',
         ] as const;
         type SubmissionDrefTypeRelatedFields = Pick<
@@ -808,6 +824,11 @@ const schema: OpsUpdateFormSchema = {
                     media_contact_email: { forceValue: nullValue },
                     media_contact_phone_number: { forceValue: nullValue },
                     glide_code: { forceValue: nullValue },
+                    national_society_integrity_contact_name: {},
+                    national_society_integrity_contact_title: {},
+                    national_society_integrity_contact_email: { validations: [emailCondition] },
+                    national_society_integrity_contact_phone_number: {},
+                    national_society_hotline_phone_number: {},
                 };
 
                 if (val?.type_of_dref !== TYPE_LOAN) {

From 05bd521bedec1a4a70677fcc607db93004a34c63 Mon Sep 17 00:00:00 2001
From: Aditya Khatri <adityakhatri47@gmail.com>
Date: Mon, 17 Mar 2025 17:28:01 +0545
Subject: [PATCH 2/3] Update exports and import template

---
 .../useImportTemplateSchema.ts                |  83 ++++++++++
 app/src/views/DrefApplicationExport/i18n.json |  13 ++
 app/src/views/DrefApplicationExport/index.tsx | 151 +++++++++++++++++-
 .../DrefApplicationExport/styles.module.css   |   1 +
 .../DrefApplicationForm/Operation/index.tsx   |  55 +++++++
 app/src/views/DrefApplicationForm/common.tsx  |   2 +
 app/src/views/DrefFinalReportExport/i18n.json |  10 ++
 app/src/views/DrefFinalReportExport/index.tsx | 121 +++++++++++++-
 .../DrefOperationalUpdateExport/i18n.json     |  11 ++
 .../DrefOperationalUpdateExport/index.tsx     | 133 ++++++++++++++-
 10 files changed, 577 insertions(+), 3 deletions(-)

diff --git a/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts b/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts
index 2777df95fe..af1f976e6f 100644
--- a/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts
+++ b/app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts
@@ -274,6 +274,22 @@ function useImportTemplateSchema() {
                 ),
             },
 
+            // FIXME: These are not showing up on the file
+            complete_child_safeguarding_risk: {
+                type: 'select',
+                validation: 'boolean',
+                optionsKey: '__boolean',
+                label: 'Did you complete the Child Safeguarding Risk Analysis in previous operations?',
+                description: 'Select <b>Yes</b> or <b>No</b> from the drop-down list.',
+            },
+
+            child_safeguarding_risk_level: {
+                type: 'input',
+                label: 'Child safeguarding risk level',
+                validation: 'textArea',
+                description: 'What was the risk level for child safeguarding risk analysis?',
+            },
+
             event_date: {
                 headingBefore: 'Description of the Event',
                 type: 'input',
@@ -289,6 +305,27 @@ function useImportTemplateSchema() {
                 description: 'People Affected include all those whose lives and livelihoods have been impacted as a direct result of the event.',
             },
 
+            estimated_number_of_affected_male: {
+                type: 'input',
+                validation: 'number',
+                label: 'Estimated number of affected male',
+                description: '',
+            },
+
+            estimated_number_of_affected_female: {
+                type: 'input',
+                validation: 'number',
+                label: 'Estimated number of affected female',
+                description: '',
+            },
+
+            estimated_number_of_affected_minors: {
+                type: 'input',
+                validation: 'number',
+                label: 'Estimated number of affected minors',
+                description: '',
+            },
+
             people_in_need: {
                 type: 'input',
                 validation: 'number',
@@ -661,6 +698,45 @@ function useImportTemplateSchema() {
                 ),
             },
 
+            has_anti_fraud_corruption_policy: {
+                type: 'select',
+                optionsKey: '__boolean',
+                validation: 'boolean',
+                label: 'Does your National Society have anti-fraud and corruption policy?',
+                description: '',
+            },
+
+            has_sexual_abuse_policy: {
+                type: 'select',
+                optionsKey: '__boolean',
+                validation: 'boolean',
+                label: 'Does your National Society have prevention of sexual exploitation and abuse policy?',
+                description: '',
+            },
+
+            has_child_protection_policy: {
+                type: 'select',
+                optionsKey: '__boolean',
+                validation: 'boolean',
+                label: 'Does your National Society have child protection/child safeguarding policy?',
+                description: '',
+            },
+
+            has_whistleblower_protection_policy: {
+                type: 'select',
+                optionsKey: '__boolean',
+                validation: 'boolean',
+                label: 'Does your National Society have whistleblower protection policy?',
+                description: '',
+            },
+
+            has_anti_sexual_harassment_policy: {
+                type: 'select',
+                optionsKey: '__boolean',
+                validation: 'boolean',
+                label: 'Does your National Society have anti-sexual harassment policy?',
+                description: '',
+            },
             has_child_safeguarding_risk_analysis_assessment: {
                 type: 'select',
                 optionsKey: '__boolean',
@@ -767,6 +843,13 @@ function useImportTemplateSchema() {
                 ),
             },
 
+            is_volunteer_team_diverse: {
+                type: 'input',
+                validation: 'textArea',
+                label: 'Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?',
+                description: 'This question is about making sure your team includes the right mix of people to best support those affected. For example, if you’re helping single female heads of households, it’s important to have enough female volunteers to make everyone feel comfortable and understood. Including team members who share the same language or cultural background as the people you’re helping can also make a big difference in building trust and providing effective support.',
+            },
+
             is_surge_personnel_deployed: {
                 type: 'select',
                 validation: 'boolean',
diff --git a/app/src/views/DrefApplicationExport/i18n.json b/app/src/views/DrefApplicationExport/i18n.json
index 70710540e1..8a5848698e 100644
--- a/app/src/views/DrefApplicationExport/i18n.json
+++ b/app/src/views/DrefApplicationExport/i18n.json
@@ -38,6 +38,11 @@
         "nsOperationLabel": "If yes, please specify which operation",
         "recurrentEventJustificationLabel": "If you have answered yes to all questions above, justify why the use of DREF for a recurrent event, or how this event should not be considered recurrent",
         "lessonsLearnedLabel": "Lessons learned",
+        "completeChildSafeguardingRiskLabel": "Did you complete the Child Safeguarding Risk Analysis in previous operations, what was risk level?",
+        "childSafeguardingRiskLevelLabel": "What was the risk level for Child Safeguarding Risk Analysis?",
+        "estimatedAffectedMale": "Estimated male",
+        "estimatedAffectedFemale": "Estimated female",
+        "estimatedAffectedMinors": "Estimated minors",
         "currentNationalSocietyActionsHeading": "Current National Society Actions",
         "nationalSocietyActionsHeading": "National Society anticipatory actions started",
         "drefFormNsResponseStarted": "Start date of National Society actions",
@@ -80,6 +85,12 @@
         "priorityActionsHeading": "Priority Actions",
         "aboutSupportServicesSectionHeading": "About Support Services",
         "humanResourcesHeading": "How many staff and volunteers will be involved in this operation. Briefly describe their role.",
+        "isVolunteerTeamDiverseHeading": "How many staff and volunteers will be involved in this operation“ add the following question “Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
+        "hasAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
+        "hasSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
+        "hasChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
+        "hasWhistleblowerProtectionPolicy": "Does your National Society have whistleblower protection policy?",
+        "hasAntiSexualHarassmentPolicy": "Does your National Society have anti-sexual harassment policy?",
         "surgePersonnelDeployedHeading": "Will surge personnel be deployed? Please provide the role profile needed.",
         "logisticCapacityHeading": "If there is procurement, will it be done by National Society or IFRC?",
         "pmerHeading": "How will this operation be monitored?",
@@ -92,6 +103,8 @@
         "projectManagerContactHeading": "IFRC Project Manager",
         "focalPointContactHeading": "IFRC focal point for the emergency",
         "mediaContactHeading": "Media Contact",
+        "nationalSocietyIntegrityHeading": "National Societies' Integrity Focal Point",
+        "nationalSocietyHotlineHeading": "National Society Hotline",
         "imageLogoIFRCAlt": "IFRC",
         "drefApplicationExportRisk": "Risk",
         "drefApplicationExportMitigation": "Mitigation action",
diff --git a/app/src/views/DrefApplicationExport/index.tsx b/app/src/views/DrefApplicationExport/index.tsx
index 0f7b47f752..530118b1b9 100644
--- a/app/src/views/DrefApplicationExport/index.tsx
+++ b/app/src/views/DrefApplicationExport/index.tsx
@@ -204,6 +204,9 @@ export function Component() {
         || isDefined(drefResponse?.event_map_file?.file);
 
     const lessonsLearnedDefined = isTruthyString(drefResponse?.lessons_learned?.trim());
+    const childSafeguardingRiskLevelDefined = isTruthyString(
+        drefResponse?.child_safeguarding_risk_level?.trim(),
+    );
     const showPreviousOperations = drefResponse?.type_of_dref !== DREF_TYPE_ASSESSMENT && (
         isDefined(drefResponse?.did_it_affect_same_area)
         || isDefined(drefResponse?.did_it_affect_same_population)
@@ -270,11 +273,25 @@ export function Component() {
         && isDefined(drefResponse.risk_security)
         && drefResponse.risk_security.length > 0;
     const riskSecurityConcernDefined = isTruthyString(drefResponse?.risk_security_concern?.trim());
+    const hasAntiFraudPolicy = isDefined(drefResponse?.has_anti_fraud_corruption_policy);
+    const hasSexualAbusePolicy = isDefined(drefResponse?.has_sexual_abuse_policy);
+    const hasChildProtectionPolicy = isDefined(drefResponse?.has_child_protection_policy);
+    const hasWhistleblowerProtectionPolicy = isDefined(
+        drefResponse?.has_whistleblower_protection_policy,
+    );
+    const hasAntiSexualHarassmentPolicy = isDefined(
+        drefResponse?.has_anti_sexual_harassment_policy,
+    );
     const hasChildrenSafeguardingDefined = isDefined(
         drefResponse?.has_child_safeguarding_risk_analysis_assessment,
     );
     const showRiskAndSecuritySection = riskSecurityDefined
         || riskSecurityConcernDefined
+        || hasAntiFraudPolicy
+        || hasSexualAbusePolicy
+        || hasChildProtectionPolicy
+        || hasWhistleblowerProtectionPolicy
+        || hasAntiSexualHarassmentPolicy
         || hasChildrenSafeguardingDefined;
 
     const plannedInterventionDefined = isDefined(drefResponse)
@@ -283,6 +300,9 @@ export function Component() {
         && isDefined(plannedInterventions);
 
     const humanResourceDefined = isTruthyString(drefResponse?.human_resource?.trim());
+    const isVolunteerTeamDiverseDefined = isTruthyString(
+        drefResponse?.is_volunteer_team_diverse?.trim(),
+    );
     const surgePersonnelDeployedDefined = isTruthyString(
         drefResponse?.surge_personnel_deployed?.trim(),
     );
@@ -334,11 +354,26 @@ export function Component() {
         drefResponse?.media_contact_phone_number,
     ].filter(isTruthyString).join(', ');
     const mediaContactDefined = isTruthyString(mediaContactText);
+    const nationalSocietyIntegrityContactText = [
+        drefResponse?.national_society_integrity_contact_name,
+        drefResponse?.national_society_integrity_contact_title,
+        drefResponse?.national_society_integrity_contact_email,
+        drefResponse?.national_society_integrity_contact_phone_number,
+    ].filter(isTruthyString).join(', ');
+    const nationalSocietyIntegrityContactDefined = isTruthyString(
+        nationalSocietyIntegrityContactText,
+    );
+    const nationalSocietyHotlineDefined = isTruthyString(
+        drefResponse?.national_society_hotline_phone_number,
+    );
+
     const showContactsSection = nsContactDefined
         || appealManagerContactDefined
         || projectManagerContactDefined
         || focalPointContactDefined
-        || mediaContactDefined;
+        || mediaContactDefined
+        || nationalSocietyIntegrityContactDefined
+        || nationalSocietyHotlineDefined;
     return (
         <div className={styles.drefApplicationExport}>
             <Container childrenContainerClassName={styles.pageTitleSection}>
@@ -431,6 +466,30 @@ export function Component() {
                     suffix={strings.peopleSuffix}
                     strongValue
                 />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedMale}
+                    value={drefResponse?.estimated_number_of_affected_male}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedFemale}
+                    value={drefResponse?.estimated_number_of_affected_female}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedMinors}
+                    value={drefResponse?.estimated_number_of_affected_minors}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
                 <TextOutput
                     className={styles.budget}
                     label={strings.peopleTargetedLabel}
@@ -650,6 +709,21 @@ export function Component() {
                             strongLabel
                         />
                     )}
+                    <BlockTextOutput
+                        label={strings.completeChildSafeguardingRiskLabel}
+                        value={drefResponse?.complete_child_safeguarding_risk}
+                        valueType="boolean"
+                        strongValue
+                    />
+                    {childSafeguardingRiskLevelDefined && (
+                        <TextOutput
+                            className={styles.childSafeguardingRiskLevel}
+                            label={strings.childSafeguardingRiskLevelLabel}
+                            value={drefResponse?.child_safeguarding_risk_level}
+                            valueType="text"
+                            strongLabel
+                        />
+                    )}
                 </Container>
             )}
             {showNsAction && (
@@ -935,6 +1009,56 @@ export function Component() {
                     <Heading level={2}>
                         {strings.riskAndSecuritySectionHeading}
                     </Heading>
+                    {hasAntiFraudPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasAntiFraudPolicy}
+                                value={drefResponse?.has_anti_fraud_corruption_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasSexualAbusePolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasSexualAbusePolicy}
+                                value={drefResponse?.has_sexual_abuse_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasChildProtectionPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasChildProtectionPolicy}
+                                value={drefResponse?.has_child_protection_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasWhistleblowerProtectionPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasWhistleblowerProtectionPolicy}
+                                value={drefResponse?.has_whistleblower_protection_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasAntiSexualHarassmentPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasAntiSexualHarassmentPolicy}
+                                value={drefResponse?.has_anti_sexual_harassment_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
                     {riskSecurityDefined && (
                         <Container
                             heading={strings.riskSecurityHeading}
@@ -1066,6 +1190,15 @@ export function Component() {
                             </DescriptionText>
                         </Container>
                     )}
+                    {isVolunteerTeamDiverseDefined && (
+                        <Container
+                            heading={strings.isVolunteerTeamDiverseHeading}
+                        >
+                            <DescriptionText>
+                                {drefResponse?.is_volunteer_team_diverse}
+                            </DescriptionText>
+                        </Container>
+                    )}
                     {surgePersonnelDeployedDefined && (
                         <Container
                             heading={strings.surgePersonnelDeployedHeading}
@@ -1173,6 +1306,22 @@ export function Component() {
                                 strongLabel
                             />
                         )}
+                        {nationalSocietyIntegrityContactDefined && (
+                            <TextOutput
+                                labelClassName={styles.contactPersonLabel}
+                                label={strings.nationalSocietyIntegrityHeading}
+                                value={nationalSocietyIntegrityContactText}
+                                strongLabel
+                            />
+                        )}
+                        {nationalSocietyHotlineDefined && (
+                            <TextOutput
+                                labelClassName={styles.contactPersonLabel}
+                                label={strings.nationalSocietyHotlineHeading}
+                                value={drefResponse?.national_society_hotline_phone_number}
+                                strongLabel
+                            />
+                        )}
                     </Container>
                     <Link href="/emergencies">
                         {strings.drefExportReference}
diff --git a/app/src/views/DrefApplicationExport/styles.module.css b/app/src/views/DrefApplicationExport/styles.module.css
index b5d8d81adc..7390b4facd 100644
--- a/app/src/views/DrefApplicationExport/styles.module.css
+++ b/app/src/views/DrefApplicationExport/styles.module.css
@@ -87,6 +87,7 @@
         grid-template-columns: 1fr 1fr;
 
         .recurrent-event-justification,
+        .child-safeguarding-risk-level,
         .lessons-learned {
             grid-column: span 2;
             background-color: var(--pdf-element-bg);
diff --git a/app/src/views/DrefApplicationForm/Operation/index.tsx b/app/src/views/DrefApplicationForm/Operation/index.tsx
index dda6ac8a50..e69feacd71 100644
--- a/app/src/views/DrefApplicationForm/Operation/index.tsx
+++ b/app/src/views/DrefApplicationForm/Operation/index.tsx
@@ -432,6 +432,61 @@ function Operation(props: Props) {
             <Container
                 heading={strings.drefFormRiskSecurity}
             >
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveAntiFraudPolicy}
+                >
+                    <BooleanInput
+                        name="has_anti_fraud_corruption_policy"
+                        value={value.has_anti_fraud_corruption_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_anti_fraud_corruption_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveSexualAbusePolicy}
+                >
+                    <BooleanInput
+                        name="has_sexual_abuse_policy"
+                        value={value.has_sexual_abuse_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_sexual_abuse_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveChildProtectionPolicy}
+                >
+                    <BooleanInput
+                        name="has_child_protection_policy"
+                        value={value.has_child_protection_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_child_protection_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveWhistleblowerPolicy}
+                >
+                    <BooleanInput
+                        name="has_whistleblower_protection_policy"
+                        value={value.has_whistleblower_protection_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_whistleblower_protection_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
+                <InputSection
+                    title={strings.drefFormRiskDoesNSHaveAntiSexualHarassmentPolicy}
+                >
+                    <BooleanInput
+                        name="has_anti_sexual_harassment_policy"
+                        value={value.has_anti_sexual_harassment_policy}
+                        onChange={setFieldValue}
+                        error={error?.has_anti_sexual_harassment_policy}
+                        disabled={disabled}
+                    />
+                </InputSection>
                 <InputSection
                     title={strings.drefFormRiskSecurityPotentialRisk}
                     description={(
diff --git a/app/src/views/DrefApplicationForm/common.tsx b/app/src/views/DrefApplicationForm/common.tsx
index 0299fcf7b8..dbcd86ff4b 100644
--- a/app/src/views/DrefApplicationForm/common.tsx
+++ b/app/src/views/DrefApplicationForm/common.tsx
@@ -55,6 +55,8 @@ export const eventDetailTabFields: (keyof PartialDref)[] = [
     'ns_request_text',
     'dref_recurrent_text',
     'lessons_learned',
+    'child_safeguarding_risk_level',
+    'complete_child_safeguarding_risk',
     'event_date',
     'event_text',
     'num_affected',
diff --git a/app/src/views/DrefFinalReportExport/i18n.json b/app/src/views/DrefFinalReportExport/i18n.json
index b5855d12fa..050326e6c0 100644
--- a/app/src/views/DrefFinalReportExport/i18n.json
+++ b/app/src/views/DrefFinalReportExport/i18n.json
@@ -17,6 +17,14 @@
         "glideNumberLabel": "Glide Number",
         "peopleAffectedLabel": "People Affected",
         "peopleTargetedLabel": "People Targeted",
+        "estimatedAffectedMale": "Estimated male",
+        "estimatedAffectedFemale": "Estimated female",
+        "estimatedAffectedMinors": "Estimated minors",
+        "hasAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
+        "hasSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
+        "hasChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
+        "hasWhistleblowerProtectionPolicy": "Does your National Society have whistleblower protection policy?",
+        "hasAntiSexualHarassmentPolicy": "Does your National Society have anti-sexual harassment policy?",
         "peopleAssistedLabel": "People Assisted",
         "peopleSuffix": " people",
         "operationStartDateLabel": "Operation Start Date",
@@ -88,6 +96,8 @@
         "projectManagerContactHeading": "IFRC Project Manager",
         "focalPointContactHeading": "IFRC focal point for the emergency",
         "mediaContactHeading": "Media Contact",
+        "nationalSocietyIntegrityHeading": "National Societies' Integrity Focal Point",
+        "nationalSocietyHotlineHeading": "National Society Hotline",
         "sourceInformationSectionHeading": "Source Information",
         "sourceInformationSourceNameTitle": "Source Name",
         "sourceInformationSourceLinkTitle": "Source Link"
diff --git a/app/src/views/DrefFinalReportExport/index.tsx b/app/src/views/DrefFinalReportExport/index.tsx
index 90bd70f304..56fd90ad25 100644
--- a/app/src/views/DrefFinalReportExport/index.tsx
+++ b/app/src/views/DrefFinalReportExport/index.tsx
@@ -214,8 +214,22 @@ export function Component() {
     const hasChildrenSafeguardingDefined = isDefined(
         drefResponse?.has_child_safeguarding_risk_analysis_assessment,
     );
+    const hasAntiFraudPolicy = isDefined(drefResponse?.has_anti_fraud_corruption_policy);
+    const hasSexualAbusePolicy = isDefined(drefResponse?.has_sexual_abuse_policy);
+    const hasChildProtectionPolicy = isDefined(drefResponse?.has_child_protection_policy);
+    const hasWhistleblowerProtectionPolicy = isDefined(
+        drefResponse?.has_whistleblower_protection_policy,
+    );
+    const hasAntiSexualHarassmentPolicy = isDefined(
+        drefResponse?.has_anti_sexual_harassment_policy,
+    );
     const showRiskAndSecuritySection = riskSecurityDefined
         || riskSecurityConcernDefined
+        || hasAntiFraudPolicy
+        || hasSexualAbusePolicy
+        || hasChildProtectionPolicy
+        || hasWhistleblowerProtectionPolicy
+        || hasAntiSexualHarassmentPolicy
         || hasChildrenSafeguardingDefined;
 
     const plannedInterventionDefined = isDefined(drefResponse)
@@ -267,11 +281,26 @@ export function Component() {
         drefResponse?.media_contact_phone_number,
     ].filter(isTruthyString).join(', ');
     const mediaContactDefined = isTruthyString(mediaContactText);
+    const nationalSocietyIntegrityContactText = [
+        drefResponse?.national_society_integrity_contact_name,
+        drefResponse?.national_society_integrity_contact_title,
+        drefResponse?.national_society_integrity_contact_email,
+        drefResponse?.national_society_integrity_contact_phone_number,
+    ].filter(isTruthyString).join(', ');
+    const nationalSocietyIntegrityContactDefined = isTruthyString(
+        nationalSocietyIntegrityContactText,
+    );
+    const nationalSocietyHotlineDefined = isTruthyString(
+        drefResponse?.national_society_hotline_phone_number,
+    );
+
     const showContactsSection = nsContactDefined
         || appealManagerContactDefined
         || projectManagerContactDefined
         || focalPointContactDefined
-        || mediaContactDefined;
+        || mediaContactDefined
+        || nationalSocietyIntegrityContactDefined
+        || nationalSocietyHotlineDefined;
 
     return (
         <div className={styles.drefFinalReportExport}>
@@ -348,6 +377,30 @@ export function Component() {
                     suffix={strings.peopleSuffix}
                     strongValue
                 />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedMale}
+                    value={drefResponse?.estimated_number_of_affected_male}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedFemale}
+                    value={drefResponse?.estimated_number_of_affected_female}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedMinors}
+                    value={drefResponse?.estimated_number_of_affected_minors}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
                 <TextOutput
                     className={styles.metaItem}
                     label={strings.peopleTargetedLabel}
@@ -753,6 +806,56 @@ export function Component() {
                     <Heading level={2}>
                         {strings.riskAndSecuritySectionHeading}
                     </Heading>
+                    {hasAntiFraudPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasAntiFraudPolicy}
+                                value={drefResponse?.has_anti_fraud_corruption_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasSexualAbusePolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasSexualAbusePolicy}
+                                value={drefResponse?.has_sexual_abuse_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasChildProtectionPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasChildProtectionPolicy}
+                                value={drefResponse?.has_child_protection_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasWhistleblowerProtectionPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasWhistleblowerProtectionPolicy}
+                                value={drefResponse?.has_whistleblower_protection_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasAntiSexualHarassmentPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasAntiSexualHarassmentPolicy}
+                                value={drefResponse?.has_anti_sexual_harassment_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
                     {riskSecurityDefined && (
                         <Container
                             heading={strings.riskSecurityHeading}
@@ -996,6 +1099,22 @@ export function Component() {
                                 strongLabel
                             />
                         )}
+                        {nationalSocietyIntegrityContactDefined && (
+                            <TextOutput
+                                labelClassName={styles.contactPersonLabel}
+                                label={strings.nationalSocietyIntegrityHeading}
+                                value={nationalSocietyIntegrityContactText}
+                                strongLabel
+                            />
+                        )}
+                        {nationalSocietyHotlineDefined && (
+                            <TextOutput
+                                labelClassName={styles.contactPersonLabel}
+                                label={strings.nationalSocietyHotlineHeading}
+                                value={drefResponse?.national_society_hotline_phone_number}
+                                strongLabel
+                            />
+                        )}
                     </Container>
                     <Link
                         href="/emergencies"
diff --git a/app/src/views/DrefOperationalUpdateExport/i18n.json b/app/src/views/DrefOperationalUpdateExport/i18n.json
index 390aadd170..941c7326b4 100644
--- a/app/src/views/DrefOperationalUpdateExport/i18n.json
+++ b/app/src/views/DrefOperationalUpdateExport/i18n.json
@@ -15,6 +15,9 @@
         "glideNumberLabel": "Glide Number",
         "peopleAffectedLabel": "People Affected",
         "peopleTargetedLabel": "People Targeted",
+        "estimatedAffectedMale": "Estimated male",
+        "estimatedAffectedFemale": "Estimated female",
+        "estimatedAffectedMinors": "Estimated minors",
         "reportingTimeframeStartDateLabel": "Reporting Timeframe Start Date",
         "reportingTimeframeEndDateLabel": "Reporting Timeframe End Date",
         "peopleSuffix": " people",
@@ -88,6 +91,12 @@
         "progressTowardsOutcomeHeading": "Progress Towards Outcome",
         "aboutSupportServicesSectionHeading": "About Support Services",
         "humanResourcesHeading": "How many staff and volunteers will be involved in this operation. Briefly describe their role.",
+        "isVolunteerTeamDiverseHeading": "How many staff and volunteers will be involved in this operation“ add the following question “Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
+        "hasAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
+        "hasSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
+        "hasChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
+        "hasWhistleblowerProtectionPolicy": "Does your National Society have whistleblower protection policy?",
+        "hasAntiSexualHarassmentPolicy": "Does your National Society have anti-sexual harassment policy?",
         "surgePersonnelDeployedHeading": "Will surge personnel be deployed? Please provide the role profile needed.",
         "logisticCapacityHeading": "If there is procurement, will it be done by National Society or IFRC?",
         "pmerHeading": "How will this operation be monitored?",
@@ -100,6 +109,8 @@
         "projectManagerContactHeading": "IFRC Project Manager",
         "focalPointContactHeading": "IFRC focal point for the emergency",
         "mediaContactHeading": "Media Contact",
+        "nationalSocietyIntegrityHeading": "National Societies' Integrity Focal Point",
+        "nationalSocietyHotlineHeading": "National Society Hotline",
         "drefOperationalImageAlt": "IFRC",
         "drefOperationalOtherImageAlt": "Image",
         "drefOperationalRisk": "Risk",
diff --git a/app/src/views/DrefOperationalUpdateExport/index.tsx b/app/src/views/DrefOperationalUpdateExport/index.tsx
index cc2d478a2d..75dd3eb4fd 100644
--- a/app/src/views/DrefOperationalUpdateExport/index.tsx
+++ b/app/src/views/DrefOperationalUpdateExport/index.tsx
@@ -257,8 +257,22 @@ export function Component() {
     const hasChildrenSafeguardingDefined = isDefined(
         drefResponse?.has_child_safeguarding_risk_analysis_assessment,
     );
+    const hasAntiFraudPolicy = isDefined(drefResponse?.has_anti_fraud_corruption_policy);
+    const hasSexualAbusePolicy = isDefined(drefResponse?.has_sexual_abuse_policy);
+    const hasChildProtectionPolicy = isDefined(drefResponse?.has_child_protection_policy);
+    const hasWhistleblowerProtectionPolicy = isDefined(
+        drefResponse?.has_whistleblower_protection_policy,
+    );
+    const hasAntiSexualHarassmentPolicy = isDefined(
+        drefResponse?.has_anti_sexual_harassment_policy,
+    );
     const showRiskAndSecuritySection = riskSecurityDefined
         || riskSecurityConcernDefined
+        || hasAntiFraudPolicy
+        || hasSexualAbusePolicy
+        || hasChildProtectionPolicy
+        || hasWhistleblowerProtectionPolicy
+        || hasAntiSexualHarassmentPolicy
         || hasChildrenSafeguardingDefined;
 
     const plannedInterventionDefined = isDefined(drefResponse)
@@ -266,6 +280,9 @@ export function Component() {
         && drefResponse.planned_interventions.length > 0;
 
     const humanResourceDefined = isTruthyString(drefResponse?.human_resource?.trim());
+    const isVolunteerTeamDiverseDefined = isTruthyString(
+        drefResponse?.is_volunteer_team_diverse?.trim(),
+    );
     const surgePersonnelDeployedDefined = isTruthyString(
         drefResponse?.surge_personnel_deployed?.trim(),
     );
@@ -317,11 +334,26 @@ export function Component() {
         drefResponse?.media_contact_phone_number,
     ].filter(isTruthyString).join(', ');
     const mediaContactDefined = isTruthyString(mediaContactText);
+    const nationalSocietyIntegrityContactText = [
+        drefResponse?.national_society_integrity_contact_name,
+        drefResponse?.national_society_integrity_contact_title,
+        drefResponse?.national_society_integrity_contact_email,
+        drefResponse?.national_society_integrity_contact_phone_number,
+    ].filter(isTruthyString).join(', ');
+    const nationalSocietyIntegrityContactDefined = isTruthyString(
+        nationalSocietyIntegrityContactText,
+    );
+    const nationalSocietyHotlineDefined = isTruthyString(
+        drefResponse?.national_society_hotline_phone_number,
+    );
+
     const showContactsSection = nsContactDefined
         || appealManagerContactDefined
         || projectManagerContactDefined
         || focalPointContactDefined
-        || mediaContactDefined;
+        || mediaContactDefined
+        || nationalSocietyIntegrityContactDefined
+        || nationalSocietyHotlineDefined;
 
     return (
         <div className={styles.drefOperationalUpdateExport}>
@@ -398,6 +430,30 @@ export function Component() {
                     suffix={strings.peopleSuffix}
                     strongValue
                 />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedMale}
+                    value={drefResponse?.estimated_number_of_affected_male}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedFemale}
+                    value={drefResponse?.estimated_number_of_affected_female}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
+                <TextOutput
+                    className={styles.metaItem}
+                    label={strings.estimatedAffectedMinors}
+                    value={drefResponse?.estimated_number_of_affected_minors}
+                    valueType="number"
+                    suffix={strings.peopleSuffix}
+                    strongValue
+                />
                 <TextOutput
                     className={styles.peopleTargeted}
                     label={strings.peopleTargetedLabel}
@@ -921,6 +977,56 @@ export function Component() {
                     <Heading level={2}>
                         {strings.riskAndSecuritySectionHeading}
                     </Heading>
+                    {hasAntiFraudPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasAntiFraudPolicy}
+                                value={drefResponse?.has_anti_fraud_corruption_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasSexualAbusePolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasSexualAbusePolicy}
+                                value={drefResponse?.has_sexual_abuse_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasChildProtectionPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasChildProtectionPolicy}
+                                value={drefResponse?.has_child_protection_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasWhistleblowerProtectionPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasWhistleblowerProtectionPolicy}
+                                value={drefResponse?.has_whistleblower_protection_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
+                    {hasAntiSexualHarassmentPolicy && (
+                        <Container>
+                            <BlockTextOutput
+                                label={strings.hasAntiSexualHarassmentPolicy}
+                                value={drefResponse?.has_anti_sexual_harassment_policy}
+                                valueType="boolean"
+                                strongLabel
+                            />
+                        </Container>
+                    )}
                     {riskSecurityDefined && (
                         <Container
                             heading={strings.riskSecurityHeading}
@@ -1066,6 +1172,15 @@ export function Component() {
                             </DescriptionText>
                         </Container>
                     )}
+                    {isVolunteerTeamDiverseDefined && (
+                        <Container
+                            heading={strings.isVolunteerTeamDiverseHeading}
+                        >
+                            <DescriptionText>
+                                {drefResponse?.is_volunteer_team_diverse}
+                            </DescriptionText>
+                        </Container>
+                    )}
                     {surgePersonnelDeployedDefined && (
                         <Container
                             heading={strings.surgePersonnelDeployedHeading}
@@ -1175,6 +1290,22 @@ export function Component() {
                                 strongLabel
                             />
                         )}
+                        {nationalSocietyIntegrityContactDefined && (
+                            <TextOutput
+                                labelClassName={styles.contactPersonLabel}
+                                label={strings.nationalSocietyIntegrityHeading}
+                                value={nationalSocietyIntegrityContactText}
+                                strongLabel
+                            />
+                        )}
+                        {nationalSocietyHotlineDefined && (
+                            <TextOutput
+                                labelClassName={styles.contactPersonLabel}
+                                label={strings.nationalSocietyHotlineHeading}
+                                value={drefResponse?.national_society_hotline_phone_number}
+                                strongLabel
+                            />
+                        )}
                     </Container>
                     <Link href="/emergencies">
                         {strings.drefExportReference}

From 23d8895c3e57474d05502d1213079c63c3503cf4 Mon Sep 17 00:00:00 2001
From: Aditya Khatri <adityakhatri47@gmail.com>
Date: Wed, 19 Mar 2025 14:38:23 +0545
Subject: [PATCH 3/3] Remove ns actions section from dref ops update form

---
 app/src/views/DrefApplicationExport/i18n.json |   2 +-
 .../DrefApplicationForm/Operation/i18n.json   |   6 +-
 .../DrefApplicationForm/Operation/index.tsx   |  18 +-
 .../DrefFinalReportForm/Actions/i18n.json     |   6 +-
 .../DrefFinalReportForm/Actions/index.tsx     |  29 +--
 .../DrefFinalReportForm/EventDetail/i18n.json |   4 +
 .../DrefFinalReportForm/EventDetail/index.tsx |  18 ++
 .../IndicatorInput/index.tsx                  |   3 +
 .../DrefFinalReportForm/Operation/i18n.json   |  14 +-
 .../DrefFinalReportForm/Operation/index.tsx   |  47 ++++-
 .../DrefFinalReportForm/Overview/i18n.json    |   1 +
 .../DrefFinalReportForm/Overview/index.tsx    |   1 +
 app/src/views/DrefFinalReportForm/schema.ts   |  25 +--
 .../DrefOperationalUpdateExport/i18n.json     |   2 +-
 .../Actions/NSActionInput/i18n.json           |   6 -
 .../Actions/NSActionInput/index.tsx           |  93 ---------
 .../Actions/NSActionInput/styles.module.css   |  16 --
 .../Actions/i18n.json                         |  15 +-
 .../Actions/index.tsx                         | 177 +++--------------
 .../EventDetail/i18n.json                     |   4 +
 .../EventDetail/index.tsx                     | 119 +++++++++---
 .../EventDetail/styles.module.css             |   9 +
 .../IndicatorInput/index.tsx                  |   1 +
 .../Operation/i18n.json                       |  38 +++-
 .../Operation/index.tsx                       | 180 +++++++++++++++---
 .../Overview/i18n.json                        |   1 +
 .../Overview/index.tsx                        |  34 ++--
 .../Overview/styles.module.css                |   9 +
 .../Submission/index.tsx                      |  27 ++-
 .../Submission/styles.module.css              |   9 +
 .../views/DrefOperationalUpdateForm/index.tsx |  46 +----
 .../views/DrefOperationalUpdateForm/schema.ts |  73 +------
 32 files changed, 521 insertions(+), 512 deletions(-)
 delete mode 100644 app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/i18n.json
 delete mode 100644 app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/index.tsx
 delete mode 100644 app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/styles.module.css

diff --git a/app/src/views/DrefApplicationExport/i18n.json b/app/src/views/DrefApplicationExport/i18n.json
index 8a5848698e..7b301b5533 100644
--- a/app/src/views/DrefApplicationExport/i18n.json
+++ b/app/src/views/DrefApplicationExport/i18n.json
@@ -85,7 +85,7 @@
         "priorityActionsHeading": "Priority Actions",
         "aboutSupportServicesSectionHeading": "About Support Services",
         "humanResourcesHeading": "How many staff and volunteers will be involved in this operation. Briefly describe their role.",
-        "isVolunteerTeamDiverseHeading": "How many staff and volunteers will be involved in this operation“ add the following question “Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
+        "isVolunteerTeamDiverseHeading": "Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
         "hasAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
         "hasSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
         "hasChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
diff --git a/app/src/views/DrefApplicationForm/Operation/i18n.json b/app/src/views/DrefApplicationForm/Operation/i18n.json
index 83521dab4c..8673c1cc43 100644
--- a/app/src/views/DrefApplicationForm/Operation/i18n.json
+++ b/app/src/views/DrefApplicationForm/Operation/i18n.json
@@ -3,7 +3,8 @@
     "strings": {
         "drefFormObjectiveAndStrategy": "Objective and Strategy Rationale",
         "drefFormObjectiveOperation": "Overall objective of the operation",
-        "drefFormObjectiveOperationPlaceholder": "This DREF allocation aims at supporting ….. of people in need affected by ……. Disaster, by providing …..(list sectors) support in the ……(list areas/regions) for …. months",
+        "drefFormObjectiveOperationDescription": "The objective statement should clearly and concisely describe the primary goal of the operation, focusing on the humanitarian impact and the specific needs the operation aims to address.",
+        "drefFormObjectiveOperationPlaceholder": "The IFRC-DREF operation aims to [primary action] in order to [desired impact] for [target population] affected by [event/disaster], by providing [key services/interventions] and ensuring [core outcomes such as protection, dignity, and resilience] over [operation period].",
         "drefFormPeopleAssistedThroughOperation": "Who will be targeted through this operation?",
         "drefFormPeopleAssistedThroughOperationDescription": "Explain the logic behind our targets. Which groups are we targeting and why are we targeting these particular groups? Explain how you will target vulnerable groups (e.g., Migrants, refugees, etc.)",
         "drefFormPeopleTargetedWithEarlyActions": "Numbers of persons targeted with early actions (if any)",
@@ -11,7 +12,8 @@
         "drefFormRequestAmount": "Requested Amount in CHF",
         "drefFormRequestAmountDescription": "General funding requested to fund the interventions.",
         "drefFormRequestAmountDescriptionWithIntervention": "List specific activities that will be carried out as part of the intervention in each sector. The activities should directly address the identified needs and align with the operation’s strategic objectives.",
-        "drefFormRequestAmountDescriptionPoint1": "What specific actions will be taken in this sector to meet the identified needs?” Start by choosing indicators from the IFRC indicator databank [link] whenever possible. This makes it easier to compare and analyse results across all emergency operations.",
+        "drefFormRequestAmountDescriptionPoint1": "What specific actions will be taken in this sector to meet the identified needs?” Start by choosing indicators from the {indicatorDatabankLink} whenever possible. This makes it easier to compare and analyse results across all emergency operations.",
+        "drefFormIndicatorDataLinkLabel": "IFRC Indicator Databank",
         "drefFormRequestAmountDescriptionPoint2": "Pick indicators that align with the planned activities. This ensures that the indicators accurately reflect the actions being taken on the ground. Missing important indicators could mean missed chances to showcase the positive impact of the work being done.",
         "drefFormRequestAmountDescriptionPoint3": "Keep in mind that more indicators can mean more work. Each indicator selected requires monitoring, tracking, and reporting, so be sure to choose the ones that best reflect the key outcomes of your actions.",
         "drefFormRequestAmountDescriptionPoint4": "Consider the type of indicator unit. For example, it’s often simpler and clearer to track and report on the “number of people” rather than a “percentage of people.”",
diff --git a/app/src/views/DrefApplicationForm/Operation/index.tsx b/app/src/views/DrefApplicationForm/Operation/index.tsx
index e69feacd71..7b7d5d1520 100644
--- a/app/src/views/DrefApplicationForm/Operation/index.tsx
+++ b/app/src/views/DrefApplicationForm/Operation/index.tsx
@@ -16,6 +16,7 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
+    resolveToComponent,
     stringValueSelector,
     sumSafe,
 } from '@ifrc-go/ui/utils';
@@ -213,6 +214,7 @@ function Operation(props: Props) {
             >
                 <InputSection
                     title={strings.drefFormObjectiveOperation}
+                    description={strings.drefFormObjectiveOperationDescription}
                 >
                     <TextArea
                         name="operation_objective"
@@ -231,7 +233,6 @@ function Operation(props: Props) {
                                 {strings.drefFormResponseRationaleDescription}
                             </p>
                             <ul>
-                                {/* FIXME: Add indicator databank link */}
                                 <li>
                                     {strings.drefFormResponseRationaleDescriptionPoint1}
                                 </li>
@@ -640,7 +641,20 @@ function Operation(props: Props) {
                                     {strings.drefFormRequestAmountDescriptionWithIntervention}
                                     <ul>
                                         <li>
-                                            {strings.drefFormRequestAmountDescriptionPoint1}
+                                            {resolveToComponent(
+                                                strings.drefFormRequestAmountDescriptionPoint1,
+                                                {
+                                                    indicatorDatabankLink: (
+                                                        <Link
+                                                            href="https://github.com/user-attachments/files/18903662/Annex.III.Risk.Categories.1.pdf"
+                                                            withLinkIcon
+                                                            external
+                                                        >
+                                                            {strings.drefFormIndicatorDataLinkLabel}
+                                                        </Link>
+                                                    ),
+                                                },
+                                            )}
                                         </li>
                                         <li>
                                             {strings.drefFormRequestAmountDescriptionPoint2}
diff --git a/app/src/views/DrefFinalReportForm/Actions/i18n.json b/app/src/views/DrefFinalReportForm/Actions/i18n.json
index 39495dd447..b8ef89f0f2 100644
--- a/app/src/views/DrefFinalReportForm/Actions/i18n.json
+++ b/app/src/views/DrefFinalReportForm/Actions/i18n.json
@@ -1,9 +1,6 @@
 {
     "namespace": "drefFinalReportForm",
     "strings": {
-        "finalReportNationalSocietiesActions": "National Society Actions",
-        "finalReportHaveNationalSocietyConducted": "Have the National Society conducted any intervention additionally to those part of this DREF Operation?",
-        "finalReportDescriptionOfAdditionalActivities": "Please provide a brief description of those additional activities",
         "drefFormActionFieldsLabel": "Select the needs that apply.",
         "drefFormAssessmentReportUploadLabel": "Assessment Report (Optional)",
         "drefFormCoordinationMechanism": "Are there major coordination mechanisms in place?",
@@ -18,12 +15,13 @@
         "ifrcNetworkActionsHeading": "IFRC Network Actions Related To The Current Event",
         "icrcActionsHeading": "ICRC Actions Related To The Current Event",
         "drefFormNationalAuthorities": "National authorities",
+        "drefFormNationalAuthoritiesDescription": "Brief description of actions taken by the national authorities.",
         "drefFormNationalOtherActors": "Other Actors Actions Related To The Current Event",
-        "drefFormNationalSocietiesActionsDescription": "Please indicate a description of the ongoing response with if possible: Branches involved, number of volunteers/staff involved in actions, assets deployed/distributed, number of people reach. Impact/added value of the NS in the response already ongoing.",
         "drefFormNeedsIdentified": "Needs (Gaps) Identified",
         "drefFormPartnerNationalSociety": "Participating National Societies",
         "drefFormPartnerNationalSocietyDescription": "Briefly set out which PNS are present and give details of PNS contributions/roles on the ground and remotely for this specific operation",
         "drefFormUNorOtherActors": "UN or other actors",
+        "drefFormUNorOtherActorsDescription": "Brief description of actions taken by the UN or other actors.",
         "drefFormAddButton": "Add"
     }
 }
diff --git a/app/src/views/DrefFinalReportForm/Actions/index.tsx b/app/src/views/DrefFinalReportForm/Actions/index.tsx
index 2dc4c5656a..39b1936725 100644
--- a/app/src/views/DrefFinalReportForm/Actions/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Actions/index.tsx
@@ -128,33 +128,6 @@ function Actions(props: Props) {
 
     return (
         <div className={styles.actions}>
-            <Container
-                className={styles.nationalSocietyActions}
-                heading={strings.finalReportNationalSocietiesActions}
-                headerDescription={strings.drefFormNationalSocietiesActionsDescription}
-            >
-                <InputSection title={strings.finalReportHaveNationalSocietyConducted}>
-                    <BooleanInput
-                        name="has_national_society_conducted"
-                        onChange={setFieldValue}
-                        value={value?.has_national_society_conducted}
-                        error={error?.has_national_society_conducted}
-                        disabled={disabled}
-                    />
-                </InputSection>
-                {value.has_national_society_conducted && (
-                    <InputSection title={strings.finalReportDescriptionOfAdditionalActivities}>
-                        <TextArea
-                            name="national_society_conducted_description"
-                            value={value.national_society_conducted_description}
-                            onChange={setFieldValue}
-                            error={error?.national_society_conducted_description}
-                            disabled={disabled}
-                        />
-                    </InputSection>
-                )}
-            </Container>
-
             <Container
                 heading={strings.ifrcNetworkActionsHeading}
             >
@@ -218,6 +191,7 @@ function Actions(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormNationalAuthorities}
+                    description={strings.drefFormNationalAuthoritiesDescription}
                 >
                     <TextArea
                         label={strings.drefFormActionDescription}
@@ -230,6 +204,7 @@ function Actions(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormUNorOtherActors}
+                    description={strings.drefFormNationalAuthoritiesDescription}
                 >
                     <TextArea
                         label={strings.drefFormActionDescription}
diff --git a/app/src/views/DrefFinalReportForm/EventDetail/i18n.json b/app/src/views/DrefFinalReportForm/EventDetail/i18n.json
index 7ffb5af7fd..b2e3fa0358 100644
--- a/app/src/views/DrefFinalReportForm/EventDetail/i18n.json
+++ b/app/src/views/DrefFinalReportForm/EventDetail/i18n.json
@@ -5,6 +5,10 @@
         "drefFormDescriptionEvent": "Description of the Event",
         "drefFormEventDate": "Date of the Event",
         "drefFormImminentDisaster": "Provide any updates in the situation since the field report and explain what is expected to happen.",
+        "drefFormWhatWhereWhenDescriptionHeading": "Clearly Describe:",
+        "drefFormWhatWhereWhenDescriptionPoint1": "What happened: Briefly explain the nature of the emergency (e.g., flood, earthquake, epidemic). Include key details such as the intensity, and any unique aspects of the event.",
+        "drefFormWhatWhereWhenDescriptionPoint2": "Where: Specify the geographic location(s) affected. Be as precise as possible, including names of countries, regions, cities, or specific areas impacted by the event.",
+        "drefFormWhatWhereWhenDescriptionPoint3": "When: Indicate the date and time when the event occurred or began. If the situation is ongoing, mention that and provide relevant updates on the timeframe.",
         "drefFormScopeAndScaleDescription": "Describe the extent this hazard will produce negative impacts on lives, livelihoods, well-being and infrastructure. Explain which people are most likely to experience the impacts of this hazard? Where do they live, and why are they vulnerable? Please explain which groups (e.g elderly, children, people with disabilities, IDPs, Refugees, etc.) are most likely to be affected? Provide historic information on how communities have been affected by the magnitude of this hazard in the past?",
         "drefFormScopeAndScaleEvent": "Scope and scale of the event",
         "drefFormSlowEventDate": "Date when the trigger was met",
diff --git a/app/src/views/DrefFinalReportForm/EventDetail/index.tsx b/app/src/views/DrefFinalReportForm/EventDetail/index.tsx
index 55729131d8..c5e610350b 100644
--- a/app/src/views/DrefFinalReportForm/EventDetail/index.tsx
+++ b/app/src/views/DrefFinalReportForm/EventDetail/index.tsx
@@ -257,6 +257,24 @@ function EventDetail(props: Props) {
                             ? strings.drefFormWhatWhereWhen
                             : strings.drefFormImminentDisaster
                     }
+                    description={value.type_of_dref !== TYPE_IMMINENT && (
+                        <>
+                            <p>
+                                {strings.drefFormWhatWhereWhenDescriptionHeading}
+                            </p>
+                            <ol>
+                                <li>
+                                    {strings.drefFormWhatWhereWhenDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormWhatWhereWhenDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormWhatWhereWhenDescriptionPoint3}
+                                </li>
+                            </ol>
+                        </>
+                    )}
                 >
                     <TextArea
                         name="event_description"
diff --git a/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx b/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx
index 58fb3bf811..521abee38c 100644
--- a/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx
@@ -65,6 +65,7 @@ function IndicatorInput(props: Props) {
                 error={error?.title}
                 disabled={disabled}
                 withAsterisk
+                readOnly
             />
             <NumberInput
                 className={styles.numberInput}
@@ -74,6 +75,7 @@ function IndicatorInput(props: Props) {
                 onChange={onFieldChange}
                 error={error?.target}
                 disabled={disabled}
+                readOnly
             />
             <NumberInput
                 label={strings.drefOperationalUpdateIndicatorActualLabel}
@@ -82,6 +84,7 @@ function IndicatorInput(props: Props) {
                 onChange={onFieldChange}
                 error={error?.actual}
                 disabled={disabled}
+                withAsterisk
             />
             <Button
                 name={index}
diff --git a/app/src/views/DrefFinalReportForm/Operation/i18n.json b/app/src/views/DrefFinalReportForm/Operation/i18n.json
index ee51d728c2..19d78ca3ae 100644
--- a/app/src/views/DrefFinalReportForm/Operation/i18n.json
+++ b/app/src/views/DrefFinalReportForm/Operation/i18n.json
@@ -8,14 +8,20 @@
         "finalReportChangeToOperationStrategyExplain": "Explain",
         "drefFormDescription": "Description",
         "drefFormObjectiveAndStrategy": "Objective and Strategy Rationale",
+        "drefFormObjectiveOperationDescription": "The objective statement should clearly and concisely describe the primary goal of the operation, focusing on the humanitarian impact and the specific needs the operation aims to address.",
         "drefFormObjectiveOperation": "Overall objective of the operation",
-        "drefFormObjectiveOperationPlaceholder": "This DREF allocation aims at supporting ….. of people in need affected by ……. Disaster, by providing …..(list sectors) support in the ……(list areas/regions) for …. months",
+        "drefFormObjectiveOperationPlaceholder": "The IFRC-DREF operation aims to [primary action] in order to [desired impact] for [target population] affected by [event/disaster], by providing [key services/interventions] and ensuring [core outcomes such as protection, dignity, and resilience] over [operation period].",
         "drefFormPeopleAssistedThroughOperation": "Who was targeted by this operation?",
         "drefFormPeopleAssistedThroughOperationDescription": "Explain the logic behind our targets. Which groups are we targeting and why are we targeting these particular groups? Explain how you will target vulnerable groups (e.g., Migrants, refugees, etc.)",
         "drefFormPeopleTargetedWithEarlyActions": "Numbers of persons targeted with early actions (if any)",
         "drefFormPlannedIntervention": "Planned Intervention",
         "drefFormResponseRationale": "Operation strategy rationale",
-        "drefFormResponseRationaleDescription": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
+        "drefFormResponseRationaleDescription": "Elaborate on the overall plan, strategy and approach of the operation; explain the reasoning behind the chosen strategy for the emergency operation. Explain how the identified needs/gaps and actions taken/plans are linked.",
+        "drefFormResponseRationaleDescriptionPoint1": "Highlight the most urgent needs the operation aims to address.",
+        "drefFormResponseRationaleDescriptionPoint2": "Describe the main priorities and explain why these priorities were chosen based on the specific context of the emergency.",
+        "drefFormResponseRationaleDescriptionPoint3": "Justify why particular methods and actions were selected and how they are expected to achieve the desired outcomes.",
+        "drefFormResponseRationaleDescriptionPoint4": "Include any key factors that influence the strategy; mention how these factors were considered in shaping the operation.",
+        "drefFormResponseRationaleForAssessment": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
         "drefFormResponseRationalePlaceholder": "To address the needs of the targeted population, this DREF will aim at (please briefly describe the planned activities).",
         "drefFormRiskSecurity": "Risk and Security Considerations (including \"management\")",
         "drefFormRiskDoesNSHaveAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
@@ -35,6 +41,10 @@
         "drefFormRiskSecurityRiskSelectedPoint5": "Will contingency plans or additional resources be required to address these risks?",
         "drefFormRiskSecurityRiskCategoriesLinkLabel": "Annex III - Risk Categories.pdf",
         "drefFormRiskSecuritySafetyConcern": "Please indicate any security and safety concerns for this operation",
+        "drefFormRiskSecuritySafetyConcernDescription": "Describe any specific security or safety threats that could impact the safety of personnel, volunteers, and communities during the operation.",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint1": "Are there any security concerns related to the areas where the operation will take place (e.g., conflict zones, high-crime areas)",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint2": "What safety risks could impact the well-being of staff, volunteers, or beneficiaries (e.g., dangerous terrain, health risks)?",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint3": "Are there any specific security protocols or measures that need to be established or followed during the operation?",
         "drefFormRiskSecurityHasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
         "drefFormRiskSecurityHasChildRiskCompletedDescription":"The IFRC Child Safeguarding Risk Analysis helps Operations quickly identify and rate their key child safeguarding risks in order to reduce the risk of harm against children, as outlined as a requirement in the IFRC Child Safeguarding Policy. Here are the link to the tool and Q&A",
         "drefChildSafeguardingPolicyDescription":"Child Safeguarding Policy",
diff --git a/app/src/views/DrefFinalReportForm/Operation/index.tsx b/app/src/views/DrefFinalReportForm/Operation/index.tsx
index 964216465c..18b6b32272 100644
--- a/app/src/views/DrefFinalReportForm/Operation/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Operation/index.tsx
@@ -196,6 +196,7 @@ function Operation(props: Props) {
             >
                 <InputSection
                     title={strings.drefFormObjectiveOperation}
+                    description={strings.drefFormObjectiveOperationDescription}
                 >
                     <TextArea
                         name="operation_objective"
@@ -208,8 +209,32 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormResponseRationale}
-                    description={value?.type_of_dref === TYPE_ASSESSMENT
-                        && strings.drefFormResponseRationaleDescription}
+                    description={(
+                        <>
+                            <p>
+                                {strings.drefFormResponseRationaleDescription}
+                            </p>
+                            <ul>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint3}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint4}
+                                </li>
+                                {value?.type_of_dref === TYPE_ASSESSMENT && (
+                                    <li>
+                                        {strings.drefFormResponseRationaleForAssessment}
+                                    </li>
+                                )}
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         name="response_strategy"
@@ -522,6 +547,24 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormRiskSecuritySafetyConcern}
+                    description={(
+                        <>
+                            <p>
+                                {strings.drefFormRiskSecuritySafetyConcernDescription}
+                            </p>
+                            <ul>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint3}
+                                </li>
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         name="risk_security_concern"
diff --git a/app/src/views/DrefFinalReportForm/Overview/i18n.json b/app/src/views/DrefFinalReportForm/Overview/i18n.json
index c151f38bb3..5004c9e181 100644
--- a/app/src/views/DrefFinalReportForm/Overview/i18n.json
+++ b/app/src/views/DrefFinalReportForm/Overview/i18n.json
@@ -9,6 +9,7 @@
         "drefFormInstantShareLabel": "Create & Share",
         "drefFormEssentialInformation": "Essential Information",
         "drefFormNationalSociety": "Name of National Society",
+        "drefFormNationalSocietyDescription": "Indicate your National Society by selecting it from the drop-down list.",
         "drefFormTypeOfDref": "Type of DREF",
         "drefFormImminentDisasterDetails": "Hazard Details",
         "drefFormDisasterDetails": "Disaster Details",
diff --git a/app/src/views/DrefFinalReportForm/Overview/index.tsx b/app/src/views/DrefFinalReportForm/Overview/index.tsx
index c301ba3979..e7b75d2e72 100644
--- a/app/src/views/DrefFinalReportForm/Overview/index.tsx
+++ b/app/src/views/DrefFinalReportForm/Overview/index.tsx
@@ -218,6 +218,7 @@ function Overview(props: Props) {
             >
                 <InputSection
                     title={strings.drefFormNationalSociety}
+                    description={strings.drefFormNationalSocietyDescription}
                     numPreferredColumns={2}
                     withAsteriskOnTitle
                 >
diff --git a/app/src/views/DrefFinalReportForm/schema.ts b/app/src/views/DrefFinalReportForm/schema.ts
index 46efc1efd4..e125fef60d 100644
--- a/app/src/views/DrefFinalReportForm/schema.ts
+++ b/app/src/views/DrefFinalReportForm/schema.ts
@@ -199,7 +199,6 @@ const schema: FinalReportFormSchema = {
             national_authorities: {},
             un_or_other_actor: {},
             is_there_major_coordination_mechanism: {},
-            has_national_society_conducted: {},
 
             // OPERATION
             total_dref_allocation: {},
@@ -299,7 +298,12 @@ const schema: FinalReportFormSchema = {
                                         required: true,
                                         requiredValidation: requiredStringCondition,
                                     },
-                                    actual: { validations: [positiveNumberCondition] },
+                                    actual: {
+                                        required: true,
+                                        validations: [
+                                            positiveNumberCondition,
+                                        ],
+                                    },
                                     target: { validations: [positiveNumberCondition] },
                                 }),
                             }),
@@ -420,23 +424,6 @@ const schema: FinalReportFormSchema = {
             },
         );
 
-        formFields = addCondition(
-            formFields,
-            formValue,
-            ['has_national_society_conducted'],
-            ['national_society_conducted_description'],
-            (val): Pick<FinalReportFormSchemaFields, 'national_society_conducted_description'> => {
-                if (val?.has_national_society_conducted) {
-                    return {
-                        national_society_conducted_description: {},
-                    };
-                }
-                return {
-                    national_society_conducted_description: { forceValue: nullValue },
-                };
-            },
-        );
-
         type ActionsDrefTypeRelatedFields = Pick<FinalReportFormSchemaFields, 'needs_identified' | 'event_scope'>;
         formFields = addCondition(
             formFields,
diff --git a/app/src/views/DrefOperationalUpdateExport/i18n.json b/app/src/views/DrefOperationalUpdateExport/i18n.json
index 941c7326b4..1ac32ece65 100644
--- a/app/src/views/DrefOperationalUpdateExport/i18n.json
+++ b/app/src/views/DrefOperationalUpdateExport/i18n.json
@@ -91,7 +91,7 @@
         "progressTowardsOutcomeHeading": "Progress Towards Outcome",
         "aboutSupportServicesSectionHeading": "About Support Services",
         "humanResourcesHeading": "How many staff and volunteers will be involved in this operation. Briefly describe their role.",
-        "isVolunteerTeamDiverseHeading": "How many staff and volunteers will be involved in this operation“ add the following question “Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
+        "isVolunteerTeamDiverseHeading": "Does your volunteer team reflect the gender, age, and cultural diversity of the people you’re helping? What gaps exist in your volunteer team’s gender, age, or cultural diversity, and how are you addressing them to ensure inclusive and appropriate support?",
         "hasAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
         "hasSexualAbusePolicy": "Does your National Society have prevention of sexual exploitation and abuse policy?",
         "hasChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
diff --git a/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/i18n.json b/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/i18n.json
deleted file mode 100644
index a0a1b274e0..0000000000
--- a/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "namespace": "drefOperationalUpdateForm",
-    "strings": {
-        "drefOperationalUpdateFormRemoveAction": "Remove Action"
-    }
-}
diff --git a/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/index.tsx b/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/index.tsx
deleted file mode 100644
index 8ae294ad83..0000000000
--- a/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/index.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { DeleteBinTwoLineIcon } from '@ifrc-go/icons';
-import {
-    Button,
-    InputSection,
-    TextArea,
-} from '@ifrc-go/ui';
-import { useTranslation } from '@ifrc-go/ui/hooks';
-import { isDefined } from '@togglecorp/fujs';
-import {
-    type ArrayError,
-    getErrorObject,
-    type SetValueArg,
-    useFormObject,
-} from '@togglecorp/toggle-form';
-
-import NonFieldError from '#components/NonFieldError';
-
-import { type PartialOpsUpdate } from '../../schema';
-
-import i18n from './i18n.json';
-import styles from './styles.module.css';
-
-type NsActionFormFields = NonNullable<PartialOpsUpdate['national_society_actions']>[number];
-
-const defaultNsActionValue: NsActionFormFields = {
-    client_id: '-1',
-};
-
-interface Props {
-    value: NsActionFormFields;
-    error: ArrayError<NsActionFormFields> | undefined;
-    onChange: (value: SetValueArg<NsActionFormFields>, index: number) => void;
-    onRemove: (index: number) => void;
-    index: number;
-    titleDisplayMap: Record<string, string> | undefined;
-    disabled?: boolean;
-}
-
-function NsActionInput(props: Props) {
-    const {
-        error: errorFromProps,
-        onChange,
-        value,
-        index,
-        titleDisplayMap,
-        onRemove,
-        disabled,
-    } = props;
-
-    const strings = useTranslation(i18n);
-
-    const onFieldChange = useFormObject(index, onChange, defaultNsActionValue);
-
-    const nsActionLabel = isDefined(value.title)
-        ? titleDisplayMap?.[value.title]
-        : '--';
-
-    const error = (value && value.client_id && errorFromProps)
-        ? getErrorObject(errorFromProps?.[value.client_id])
-        : undefined;
-
-    return (
-        <InputSection
-            className={styles.nsActionInput}
-            title={nsActionLabel}
-            contentSectionClassName={styles.content}
-            withAsteriskOnTitle
-        >
-            <NonFieldError error={error} />
-            <TextArea
-                className={styles.descriptionInput}
-                name="description"
-                value={value.description}
-                onChange={onFieldChange}
-                error={error?.description}
-                disabled={disabled}
-                // withAsterisk
-            />
-            <Button
-                className={styles.removeButton}
-                name={index}
-                onClick={onRemove}
-                variant="tertiary"
-                title={strings.drefOperationalUpdateFormRemoveAction}
-                disabled={disabled}
-            >
-                <DeleteBinTwoLineIcon />
-            </Button>
-        </InputSection>
-    );
-}
-
-export default NsActionInput;
diff --git a/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/styles.module.css b/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/styles.module.css
deleted file mode 100644
index f244405dd4..0000000000
--- a/app/src/views/DrefOperationalUpdateForm/Actions/NSActionInput/styles.module.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.ns-action-input {
-    .content {
-        display: flex;
-        align-items: flex-start;
-        gap: var(--go-ui-spacing-md);
-        flex-wrap: wrap;
-
-        .description-input {
-            flex-grow: 1;
-        }
-
-        .remove-button {
-            flex-shrink: 0;
-        }
-    }
-}
diff --git a/app/src/views/DrefOperationalUpdateForm/Actions/i18n.json b/app/src/views/DrefOperationalUpdateForm/Actions/i18n.json
index e5e33e811d..147636dcba 100644
--- a/app/src/views/DrefOperationalUpdateForm/Actions/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/Actions/i18n.json
@@ -1,16 +1,19 @@
 {
     "namespace": "drefOperationalUpdateForm",
     "strings": {
-        "operationalUpdateCurrentNsImageLabel": "Add photos of National Society Operation",
         "drefFormActionFieldsLabel": "Select the needs that apply.",
         "drefFormAssessmentReportUploadButtonLabel": "Upload assessment report",
         "drefFormAssessmentReportUploadLabel": "Assessment Report (Optional)",
         "drefFormCoordinationMechanism": "Are there major coordination mechanisms in place?",
         "drefFormCoordinationMechanismDescription": "List coordination mechanisms/platform in place at local/district and national level. Indicate the lead authorities/agencies. How the National Society is involved/positioned in this coordination. Does the NS in any lead/co-lead role? Any identified gap/overlap in the coordination (e.g., sector missing…)?",
         "drefFormActionDescription": "Description",
-        "drefFormDidNationalSocietyStartedImminent": "Did the National Society started any anticipatory actions?",
-        "drefFormDidNationalSocietyStartedSlow": "Has the National Society started any actions?",
         "drefFormGapsInAssessment": "Any identified gaps/limitations in the assessment",
+        "drefFormGapsInAssessmentDescriptionHeading": "Consider the following:",
+        "drefFormGapsInAssessmentDescriptionPoint1": "Unmet needs: are there specific sectors (e.g., shelter, WASH, health) where needs remain unmet or only partially addressed?",
+        "drefFormGapsInAssessmentDescriptionPoint2": "Resource shortages: highlight any shortages in available resources (e.g., funding, personnel, supplies) that limit the ability to meet the identified needs.",
+        "drefFormGapsInAssessmentDescriptionPoint3": "Operational challenges: mention any operational constraints that are preventing a full response to the needs (e.g., logistical issues, insufficient capacity).",
+        "drefFormGapsInAssessmentDescriptionPoint4": "Coordination issues: note any challenges in coordinating with other actors or agencies that have resulted in gaps in service delivery or response coverage.",
+        "drefFormGapsInAssessmentDescriptionPoint5": "Vulnerable groups: identify any specific vulnerable groups whose needs may not have been fully captured or addressed during the assessment (e.g., displaced persons, elderly, people with disabilities).",
         "drefFormIcrc": "ICRC",
         "drefFormIcrcDescription": "Presence or not of ICRC in country, and support directly provided for this emergency response. Other programs and support provided outside of the scope of this emergency should not be indicated here.",
         "drefFormIfrc": "IFRC",
@@ -20,16 +23,14 @@
         "ifrcNetworkActionsHeading": "IFRC Network Actions Related To The Current Event",
         "icrcActionsHeading": "ICRC Actions Related To The Current Event",
         "drefFormNationalAuthorities": "National authorities",
+        "drefFormNationalAuthoritiesDescription": "Brief description of actions taken by the national authorities.",
         "drefFormNationalOtherActors": "Other Actors Actions Related To The Current Event",
-        "drefFormNationalSocietiesActions": "Current National Society Actions",
-        "drefFormNationalSocietiesActionsDescription": "Please indicate a description of the ongoing response with if possible: Branches involved, number of volunteers/staff involved in actions, assets deployed/distributed, number of people reach. Impact/added value of the NS in the response already ongoing.",
         "drefFormNationalSocietiesActionsLabel": "Select the actions that apply.",
         "drefFormNeedsIdentified": "Needs (Gaps) Identified",
-        "drefFormNSAnticipatoryAction": "National Society anticipatory actions started",
-        "drefFormNsResponseStarted": "Start date of National Society actions",
         "drefFormPartnerNationalSociety": "Participating National Societies",
         "drefFormPartnerNationalSocietyDescription": "Briefly set out which PNS are present and give details of PNS contributions/roles on the ground and remotely for this specific operation",
         "drefFormUNorOtherActors": "UN or other actors",
+        "drefFormUNorOtherActorsDescription": "Brief description of actions taken by the UN or other actors.",
         "drefFormAddButton": "Add"
     }
 }
diff --git a/app/src/views/DrefOperationalUpdateForm/Actions/index.tsx b/app/src/views/DrefOperationalUpdateForm/Actions/index.tsx
index de2cb4956b..ccfc1b7b0f 100644
--- a/app/src/views/DrefOperationalUpdateForm/Actions/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Actions/index.tsx
@@ -7,7 +7,6 @@ import {
     BooleanInput,
     Button,
     Container,
-    DateInput,
     InputSection,
     SelectInput,
     TextArea,
@@ -27,7 +26,6 @@ import {
 } from '@togglecorp/toggle-form';
 
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
-import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
 import NonFieldError from '#components/NonFieldError';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { type GoApiResponse } from '#utils/restRequest';
@@ -39,22 +37,16 @@ import {
 // FIXME: move common components together
 import { type PartialOpsUpdate } from '../schema';
 import NeedInput from './NeedInput';
-import NsActionInput from './NSActionInput';
 
 import i18n from './i18n.json';
 import styles from './styles.module.css';
 
 type GlobalEnumsResponse = GoApiResponse<'/api/v2/global-enums/'>;
-type NsActionOption = NonNullable<GlobalEnumsResponse['dref_national_society_action_title']>[number];
 type NeedOption = NonNullable<GlobalEnumsResponse['dref_identified_need_title']>[number];
 
 type Value = PartialOpsUpdate;
 type NeedFormFields = NonNullable<PartialOpsUpdate['needs_identified']>[number];
-type NsActionFormFields = NonNullable<PartialOpsUpdate['national_society_actions']>[number];
 
-function nsActionKeySelector(option: NsActionOption) {
-    return option.key;
-}
 function needOptionKeySelector(option: NeedOption) {
     return option.key;
 }
@@ -79,12 +71,10 @@ function Actions(props: Props) {
     } = props;
 
     const [selectedNeed, setSelectedNeed] = useState<NeedOption['key'] | undefined>();
-    const [selectedNsAction, setSelectedNsAction] = useState<NsActionOption['key'] | undefined>();
 
     const strings = useTranslation(i18n);
 
     const {
-        dref_national_society_action_title: nsActionOptions,
         dref_identified_need_title: needOptions,
     } = useGlobalEnums();
 
@@ -97,13 +87,6 @@ function Actions(props: Props) {
         'needs_identified',
         setFieldValue,
     );
-    const {
-        setValue: onNsActionChange,
-        removeValue: onNsActionRemove,
-    } = useFormArray<'national_society_actions', NsActionFormFields>(
-        'national_society_actions',
-        setFieldValue,
-    );
 
     const handleNeedAddButtonClick = useCallback((title: NeedOption['key'] | undefined) => {
         const newNeedItem: NeedFormFields = {
@@ -121,22 +104,6 @@ function Actions(props: Props) {
         setSelectedNeed(undefined);
     }, [setFieldValue, setSelectedNeed]);
 
-    const handleNsActionAddButtonClick = useCallback((title: NsActionOption['key'] | undefined) => {
-        const newNsActionItem: NsActionFormFields = {
-            client_id: randomString(),
-            title,
-        };
-
-        setFieldValue(
-            (oldValue: NsActionFormFields[] | undefined) => (
-                [...(oldValue ?? []), newNsActionItem]
-            ),
-            'national_society_actions' as const,
-        );
-
-        setSelectedNsAction(undefined);
-    }, [setFieldValue, setSelectedNsAction]);
-
     const needsIdentifiedMap = useMemo(() => (
         listToMap(
             value.needs_identified,
@@ -154,23 +121,6 @@ function Actions(props: Props) {
         [needsIdentifiedMap, needOptions],
     );
 
-    const nsActionsMap = useMemo(() => (
-        listToMap(
-            value.national_society_actions,
-            (d) => d.title ?? '<no-key>',
-            () => true,
-        )
-    ), [value.national_society_actions]);
-
-    const filteredNsActionOptions = useMemo(
-        () => (
-            nsActionOptions?.filter(
-                (nsAction) => !nsActionsMap?.[nsAction.key],
-            )
-        ),
-        [nsActionsMap, nsActionOptions],
-    );
-
     const needsIdentifiedTitleDisplayMap = useMemo(
         () => (
             listToMap(
@@ -181,110 +131,9 @@ function Actions(props: Props) {
         ),
         [needOptions],
     );
-    const nsActionTitleDisplayMap = useMemo(
-        () => (
-            listToMap(
-                nsActionOptions,
-                (nsAction) => nsAction.key,
-                (nsAction) => nsAction.value,
-            )
-        ),
-        [nsActionOptions],
-    );
 
     return (
         <div className={styles.actions}>
-            <Container
-                className={styles.nationalSocietyActions}
-                headerDescription={strings.drefFormNationalSocietiesActionsDescription}
-                heading={strings.drefFormNationalSocietiesActions}
-            >
-                <InputSection
-                    title={
-                        value?.type_of_dref !== TYPE_IMMINENT
-                            ? strings.drefFormDidNationalSocietyStartedSlow
-                            : strings.drefFormDidNationalSocietyStartedImminent
-                    }
-                >
-                    <BooleanInput
-                        name="did_national_society"
-                        onChange={setFieldValue}
-                        value={value?.did_national_society}
-                        error={error?.did_national_society}
-                        disabled={disabled}
-                    />
-                </InputSection>
-                {value.did_national_society && (
-                    <InputSection
-                        title={
-                            value?.type_of_dref === TYPE_IMMINENT
-                                ? strings.drefFormNSAnticipatoryAction
-                                : strings.drefFormNsResponseStarted
-                        }
-                    >
-                        <DateInput
-                            name="ns_respond_date"
-                            value={value.ns_respond_date}
-                            onChange={setFieldValue}
-                            error={error?.ns_respond_date}
-                            disabled={disabled}
-                        />
-                    </InputSection>
-                )}
-                <InputSection
-                    title=" "
-                >
-                    <MultiImageWithCaptionInput
-                        name="photos_file"
-                        url="/api/v2/dref-files/multiple/"
-                        value={value?.photos_file}
-                        onChange={setFieldValue}
-                        error={getErrorObject(error?.photos_file)}
-                        fileIdToUrlMap={fileIdToUrlMap}
-                        setFileIdToUrlMap={setFileIdToUrlMap}
-                        label={strings.operationalUpdateCurrentNsImageLabel}
-                        disabled={disabled}
-                    />
-                </InputSection>
-                <InputSection
-                    numPreferredColumns={2}
-                    title=" "
-                >
-                    <SelectInput
-                        label={strings.drefFormNationalSocietiesActionsLabel}
-                        name={undefined}
-                        options={filteredNsActionOptions}
-                        value={selectedNsAction}
-                        keySelector={nsActionKeySelector}
-                        labelSelector={stringValueSelector}
-                        onChange={setSelectedNsAction}
-                        disabled={disabled}
-                    />
-                    <div className={styles.addButtonContainer}>
-                        <Button
-                            variant="secondary"
-                            name={selectedNsAction}
-                            onClick={handleNsActionAddButtonClick}
-                            disabled={isNotDefined(selectedNsAction) || disabled}
-                        >
-                            {strings.drefFormAddButton}
-                        </Button>
-                    </div>
-                </InputSection>
-                <NonFieldError error={getErrorObject(error?.national_society_actions)} />
-                {value?.national_society_actions?.map((nsAction, i) => (
-                    <NsActionInput
-                        key={nsAction.client_id}
-                        index={i}
-                        value={nsAction}
-                        onChange={onNsActionChange}
-                        onRemove={onNsActionRemove}
-                        error={getErrorObject(error?.national_society_actions)}
-                        titleDisplayMap={nsActionTitleDisplayMap}
-                        disabled={disabled}
-                    />
-                ))}
-            </Container>
             <Container
                 heading={strings.ifrcNetworkActionsHeading}
             >
@@ -348,6 +197,7 @@ function Actions(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormNationalAuthorities}
+                    description={strings.drefFormNationalAuthoritiesDescription}
                 >
                     <TextArea
                         label={strings.drefFormActionDescription}
@@ -360,6 +210,7 @@ function Actions(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormUNorOtherActors}
+                    description={strings.drefFormUNorOtherActorsDescription}
                 >
                     <TextArea
                         label={strings.drefFormActionDescription}
@@ -465,6 +316,30 @@ function Actions(props: Props) {
                     {value?.type_of_dref !== TYPE_IMMINENT && (
                         <InputSection
                             title={strings.drefFormGapsInAssessment}
+                            description={(
+                                <>
+                                    <p>
+                                        {strings.drefFormGapsInAssessmentDescriptionHeading}
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint4}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormGapsInAssessmentDescriptionPoint5}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormActionDescription}
diff --git a/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json b/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json
index c2a9864176..388f0234b7 100644
--- a/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json
@@ -16,6 +16,10 @@
         "drefFormDescriptionEvent": "Description of the Event",
         "drefFormEventDate": "Date of the Event",
         "drefFormImminentDisaster": "Provide any updates in the situation since the field report and explain what is expected to happen.",
+        "drefFormWhatWhereWhenDescriptionHeading": "Clearly Describe:",
+        "drefFormWhatWhereWhenDescriptionPoint1": "What happened: Briefly explain the nature of the emergency (e.g., flood, earthquake, epidemic). Include key details such as the intensity, and any unique aspects of the event.",
+        "drefFormWhatWhereWhenDescriptionPoint2": "Where: Specify the geographic location(s) affected. Be as precise as possible, including names of countries, regions, cities, or specific areas impacted by the event.",
+        "drefFormWhatWhereWhenDescriptionPoint3": "When: Indicate the date and time when the event occurred or began. If the situation is ongoing, mention that and provide relevant updates on the timeframe.",
         "drefFormScopeAndScaleDescription": "Describe the extent this hazard will produce negative impacts on lives, livelihoods, well-being and infrastructure. Explain which people are most likely to experience the impacts of this hazard? Where do they live, and why are they vulnerable? Please explain which groups (e.g elderly, children, people with disabilities, IDPs, Refugees, etc.) are most likely to be affected? Provide historic information on how communities have been affected by the magnitude of this hazard in the past?",
         "drefFormScopeAndScaleEvent": "Scope and scale of the event",
         "drefFormSourceInformationTitle": "Source Information",
diff --git a/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx b/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx
index c63378b9bf..4fad192b4b 100644
--- a/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx
@@ -1,5 +1,8 @@
 import { useCallback } from 'react';
-import { WikiHelpSectionLineIcon } from '@ifrc-go/icons';
+import {
+    ErrorWarningFillIcon,
+    WikiHelpSectionLineIcon,
+} from '@ifrc-go/icons';
 import {
     BooleanInput,
     Button,
@@ -44,6 +47,10 @@ interface Props {
     fileIdToUrlMap: Record<number, string>;
     setFileIdToUrlMap?: React.Dispatch<React.SetStateAction<Record<number, string>>>;
     disabled?: boolean;
+    operationTimeframeWarning: string | undefined;
+    budgetWarning: string | undefined;
+    geoWarning: string | undefined;
+    peopleTargetedWarning: string | undefined;
 }
 
 const totalPopulationRiskImminentLink = 'https://ifrcorg.sharepoint.com/sites/IFRCSharing/Shared%20Documents/Forms/AllItems.aspx?id=%2Fsites%2FIFRCSharing%2FShared%20Documents%2FDREF%2FHum%20Pop%20Definitions%20for%20DREF%20Form%5F21072022%2Epdf&parent=%2Fsites%2FIFRCSharing%2FShared%20Documents%2FDREF&p=true&ga=1';
@@ -61,6 +68,10 @@ function EventDetail(props: Props) {
         fileIdToUrlMap,
         setFileIdToUrlMap,
         disabled,
+        operationTimeframeWarning,
+        budgetWarning,
+        geoWarning,
+        peopleTargetedWarning,
     } = props;
 
     const error = getErrorObject(formError);
@@ -95,13 +106,21 @@ function EventDetail(props: Props) {
                     <InputSection
                         title={strings.drefOperationalUpdateSummaryAreYouChangingTimeFrame}
                     >
-                        <BooleanInput
-                            name="changing_timeframe_operation"
-                            value={value.changing_timeframe_operation}
-                            onChange={setFieldValue}
-                            error={error?.changing_timeframe_operation}
-                            disabled={disabled}
-                        />
+                        <div>
+                            <BooleanInput
+                                name="changing_timeframe_operation"
+                                value={value.changing_timeframe_operation}
+                                onChange={setFieldValue}
+                                error={error?.changing_timeframe_operation}
+                                disabled={disabled}
+                            />
+                            {operationTimeframeWarning && (
+                                <div className={styles.warning}>
+                                    <ErrorWarningFillIcon className={styles.icon} />
+                                    {operationTimeframeWarning}
+                                </div>
+                            )}
+                        </div>
                     </InputSection>
                     <InputSection
                         title={strings.drefOperationalUpdateSummaryAreYouChangingStrategy}
@@ -117,36 +136,60 @@ function EventDetail(props: Props) {
                     <InputSection
                         title={strings.drefOperationalUpdateSummaryAreYouChangingTargetPopulation}
                     >
-                        <BooleanInput
-                            name="changing_target_population_of_operation"
-                            value={value.changing_target_population_of_operation}
-                            onChange={setFieldValue}
-                            error={error?.changing_target_population_of_operation}
-                            disabled={disabled}
-                        />
+                        <div>
+                            <BooleanInput
+                                name="changing_target_population_of_operation"
+                                value={value.changing_target_population_of_operation}
+                                onChange={setFieldValue}
+                                error={error?.changing_target_population_of_operation}
+                                disabled={disabled}
+                            />
+                            {peopleTargetedWarning && (
+                                <div className={styles.warning}>
+                                    <ErrorWarningFillIcon className={styles.icon} />
+                                    {peopleTargetedWarning}
+                                </div>
+                            )}
+                        </div>
                     </InputSection>
                     <InputSection
                         // eslint-disable-next-line max-len
                         title={strings.drefOperationalUpdateSummaryAreYouChangingGeographicalLocation}
                     >
-                        <BooleanInput
-                            name="changing_geographic_location"
-                            value={value.changing_geographic_location}
-                            onChange={setFieldValue}
-                            error={error?.changing_geographic_location}
-                            disabled={disabled}
-                        />
+                        <div>
+                            <BooleanInput
+                                name="changing_geographic_location"
+                                value={value.changing_geographic_location}
+                                onChange={setFieldValue}
+                                error={error?.changing_geographic_location}
+                                disabled={disabled}
+                            />
+                            {geoWarning && (
+                                <div className={styles.warning}>
+                                    <ErrorWarningFillIcon className={styles.icon} />
+                                    {geoWarning}
+                                </div>
+                            )}
+                        </div>
                     </InputSection>
                     <InputSection
                         title={strings.drefOperationalUpdateSummaryAreYouChangingBudget}
                     >
-                        <BooleanInput
-                            name="changing_budget"
-                            value={value.changing_budget}
-                            onChange={setFieldValue}
-                            error={error?.changing_budget}
-                            disabled={disabled}
-                        />
+                        <div>
+                            <BooleanInput
+                                name="changing_budget"
+                                value={value.changing_budget}
+                                onChange={setFieldValue}
+                                error={error?.changing_budget}
+                                disabled={disabled}
+                            />
+                            {budgetWarning && (
+                                <div className={styles.warning}>
+                                    <ErrorWarningFillIcon className={styles.icon} />
+                                    {budgetWarning}
+                                </div>
+                            )}
+                        </div>
                     </InputSection>
                     <InputSection
                         title={strings.drefOperationalUpdateSummaryRequestForSecondAllocation}
@@ -343,6 +386,24 @@ function EventDetail(props: Props) {
                                 ? strings.drefFormWhatWhereWhen
                                 : strings.drefFormImminentDisaster
                         }
+                        description={value.type_of_dref !== TYPE_IMMINENT && (
+                            <>
+                                <p>
+                                    {strings.drefFormWhatWhereWhenDescriptionHeading}
+                                </p>
+                                <ol>
+                                    <li>
+                                        {strings.drefFormWhatWhereWhenDescriptionPoint1}
+                                    </li>
+                                    <li>
+                                        {strings.drefFormWhatWhereWhenDescriptionPoint2}
+                                    </li>
+                                    <li>
+                                        {strings.drefFormWhatWhereWhenDescriptionPoint3}
+                                    </li>
+                                </ol>
+                            </>
+                        )}
                     >
                         <TextArea
                             name="event_description"
diff --git a/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css b/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css
index c5c16569ac..1610b4157a 100644
--- a/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css
+++ b/app/src/views/DrefOperationalUpdateForm/EventDetail/styles.module.css
@@ -8,4 +8,13 @@
         flex-direction: column;
         gap: var(--go-ui-spacing-sm);
     }
+
+    .warning {
+        display: flex;
+        align-items: flex-start;
+        gap: var(--go-ui-spacing-sm);
+        padding: var(--go-ui-spacing-sm) 0;
+        color: var(--go-ui-color-warning);
+        font-weight: var(--go-ui-font-weight-semibold);
+    }
 }
diff --git a/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx b/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx
index 4c5c0c6dc0..fc8b40a766 100644
--- a/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx
@@ -82,6 +82,7 @@ function IndicatorInput(props: Props) {
                 onChange={onFieldChange}
                 error={error?.actual}
                 disabled={disabled}
+                withAsterisk
             />
             <Button
                 name={index}
diff --git a/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json b/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json
index b750c5f181..fbfecf460a 100644
--- a/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/Operation/i18n.json
@@ -3,15 +3,25 @@
     "strings": {
         "drefFormObjectiveAndStrategy": "Objective and Strategy Rationale",
         "drefFormObjectiveOperation": "Overall objective of the operation",
-        "drefFormObjectiveOperationPlaceholder": "This DREF allocation aims at supporting ….. of people in need affected by ……. Disaster, by providing …..(list sectors) support in the ……(list areas/regions) for …. months",
+        "drefFormObjectiveOperationDescription": "The objective statement should clearly and concisely describe the primary goal of the operation, focusing on the humanitarian impact and the specific needs the operation aims to address.",
+        "drefFormObjectiveOperationPlaceholder": "The IFRC-DREF operation aims to [primary action] in order to [desired impact] for [target population] affected by [event/disaster], by providing [key services/interventions] and ensuring [core outcomes such as protection, dignity, and resilience] over [operation period].",
         "drefFormPeopleAssistedThroughOperation": "Who will be targeted through this operation?",
         "drefFormPeopleAssistedThroughOperationDescription": "Explain the logic behind our targets. Which groups are we targeting and why are we targeting these particular groups? Explain how you will target vulnerable groups (e.g., Migrants, refugees, etc.)",
         "drefFormPeopleTargetedWithEarlyActions": "Numbers of persons targeted with early actions (if any)",
         "drefFormPlannedIntervention": "Update on intervention",
         "drefFormPmer": "How will this operation be monitored?",
-        "drefFormPmerDescription": "Will there be IFRC monitoring visits? How will it be deployed?",
+        "drefFormPmerDescription": "Describe the mechanisms that will be used to track the progress and effectiveness of the operation.",
+        "drefFormPmerDescriptionPoint1": "What systems will be used to monitor the operation’s activities and outcomes?",
+        "drefFormPmerDescriptionPoint2": "How will progress be tracked, and who will be responsible for monitoring?",
+        "drefFormPmerDescriptionPoint3": "What indicators or milestones will be used to assess the success of the operation?",
+        "drefFormPmerDescriptionPoint4": "Will there be IFRC monitoring visits? How will it be deployed?",
         "drefFormResponseRationale": "Operation strategy rationale",
-        "drefFormResponseRationaleDescription": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
+        "drefFormResponseRationaleDescription": "Elaborate on the overall plan, strategy and approach of the operation; explain the reasoning behind the chosen strategy for the emergency operation. Explain how the identified needs/gaps and actions taken/plans are linked.",
+        "drefFormResponseRationaleDescriptionPoint1": "Highlight the most urgent needs the operation aims to address.",
+        "drefFormResponseRationaleDescriptionPoint2": "Describe the main priorities and explain why these priorities were chosen based on the specific context of the emergency.",
+        "drefFormResponseRationaleDescriptionPoint3": "Justify why particular methods and actions were selected and how they are expected to achieve the desired outcomes.",
+        "drefFormResponseRationaleDescriptionPoint4": "Include any key factors that influence the strategy; mention how these factors were considered in shaping the operation.",
+        "drefFormResponseRationaleForAssessment": "Please describe the strategy to conduct the assessment exercise, main objectives, who will be involved?",
         "drefFormResponseRationalePlaceholder": "To address the needs of the targeted population, this DREF will aim at (please briefly describe the planned activities).",
         "drefFormRiskSecurity": "Risk and Security Considerations (including \"management\")",
         "drefFormRiskDoesNSHaveAntiFraudPolicy": "Does your National Society have anti-fraud and corruption policy?",
@@ -31,6 +41,10 @@
         "drefFormRiskSecurityRiskSelectedPoint5": "Will contingency plans or additional resources be required to address these risks?",
         "drefFormRiskSecurityRiskCategoriesLinkLabel": "Annex III - Risk Categories.pdf",
         "drefFormRiskSecuritySafetyConcern": "Please indicate any security and safety concerns for this operation",
+        "drefFormRiskSecuritySafetyConcernDescription": "Describe any specific security or safety threats that could impact the safety of personnel, volunteers, and communities during the operation.",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint1": "Are there any security concerns related to the areas where the operation will take place (e.g., conflict zones, high-crime areas)",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint2": "What safety risks could impact the well-being of staff, volunteers, or beneficiaries (e.g., dangerous terrain, health risks)?",
+        "drefFormRiskSecuritySafetyConcernDescriptionPoint3": "Are there any specific security protocols or measures that need to be established or followed during the operation?",
         "drefFormRiskSecurityHasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
         "drefFormRiskSecurityHasChildRiskCompletedDescription":"The IFRC Child Safeguarding Risk Analysis helps Operations quickly identify and rate their key child safeguarding risks in order to reduce the risk of harm against children, as outlined as a requirement in the IFRC Child Safeguarding Policy. Here are the link to the tool and Q&A",
         "drefChildSafeguardingPolicyDescription":"Child Safeguarding Policy",
@@ -39,7 +53,10 @@
         "drefFormSelectionCriteriaDescription": "Explain the rational and logic behind which groups are being targeted and why and address vulnerable groups",
         "drefFormSupportServices": "About Support Services",
         "drefFormSurgePersonnelDeployed": "Will surge personnel be deployed?",
-        "drefFormSurgePersonnelDeployedDescription": "Please provide the role profile needed.",
+        "drefFormSurgePersonnelDeployedDescriptionPoint1": "Describe the skills and qualifications/profile of the surge personnel or any additional staff (to be) deployed specifically for the operation.",
+        "drefFormSurgePersonnelDeployedDescriptionPoint2": "What expertise or skill sets are required for the personnel being deployed?",
+        "drefFormSurgePersonnelDeployedDescriptionPoint3": "What roles will these personnel fulfil?",
+        "drefFormSurgePersonnelDeployedDescriptionPoint4": "Are there specific tasks or sectors they will be managing?",
         "drefFormTargetedPopulation": "Targeted Population",
         "drefFormTargetingStrategy": "Targeting Strategy",
         "drefFormTotal": "Total Population",
@@ -53,7 +70,11 @@
         "drefOperationalUpdateAdditionalAllocationRequested": "Additional Allocation Requested",
         "drefOperationalUpdateTotalAllocation": "Total DREF Allocation",
         "drefFormCommunication": "Please briefly explain the National Societies communication strategy for this operation.",
-        "drefFormCommunicationDescription": "Will the IFRC be supporting with communication? What roles will be involved?",
+        "drefFormCommunicationDescription": "Describe how the National Society will manage internal and external communication throughout the operation.",
+        "drefFormCommunicationDescriptionPoint1": "What communication channels will be used to share information internally among teams and externally with stakeholders, partners, and the public?",
+        "drefFormCommunicationDescriptionPoint2": "How will the National Society ensure transparent and effective communication with the affected communities?",
+        "drefFormCommunicationDescriptionPoint3": "Is there a media strategy in place for external communication, such as press releases or social media updates?",
+        "drefFormCommunicationDescriptionPoint4": "Will the IFRC be supporting with communication? What roles will be involved?",
         "drefFormOperationDescription": "Description",
         "drefFormEstimatedDisplacedPeople": "Estimated Number of People on the move (if any)",
         "drefFormEstimatedLocal": "Rural",
@@ -72,7 +93,12 @@
         "drefFormIsVolunteerTeamDiverseLabel": "Description",
         "drefFormInterventionsLabel": "Select the interventions that apply.",
         "drefFormLogisticCapacityOfNs": "If there is procurement, will it be done by National Society or IFRC?",
-        "drefFormLogisticCapacityOfNsDescription": "Will it be for replenishment or for distribution? If for distribution, how long is the tendering expected to take? For Cash and Voucher Assistance, what is the status of the Financial Service Provider?",
+        "drefFormLogisticCapacityOfNsDescription": "Explain the responsibility for procurement activities during the operation.",
+        "drefFormLogisticCapacityOfNsDescriptionPoint1": "Who will be responsible for procurement (National Society or IFRC)?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint2": "Will procurement involve local or international suppliers?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint3": "Will it be for replenishment or for distribution?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint4": "If for distribution, how long is the tendering expected to take?",
+        "drefFormLogisticCapacityOfNsDescriptionPoint5": "For Cash and Voucher Assistance, what is the status of the Financial Service Provider?”",
         "drefFormMen": "Men",
         "drefOperationalUpdateFormTotalTargetedPopulation": "Total targeted population is not equal to sum of other population fields",
         "drefOperationalUpdateFormTotalDrefAllocation": "Total DREF allocation is not equal to sum of other budget fields"
diff --git a/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx b/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx
index 3ef9e56850..e140cb887e 100644
--- a/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Operation/index.tsx
@@ -66,6 +66,8 @@ interface Props {
     fileIdToUrlMap: Record<number, string>;
     setFileIdToUrlMap?: React.Dispatch<React.SetStateAction<Record<number, string>>>;
     disabled?: boolean;
+    peopleTargetedWarning: string | undefined;
+    budgetWarning: string | undefined;
 }
 
 function Operation(props: Props) {
@@ -81,6 +83,8 @@ function Operation(props: Props) {
         fileIdToUrlMap,
         setFileIdToUrlMap,
         disabled,
+        peopleTargetedWarning,
+        budgetWarning,
     } = props;
 
     const error = getErrorObject(formError);
@@ -230,6 +234,7 @@ function Operation(props: Props) {
             >
                 <InputSection
                     title={strings.drefFormObjectiveOperation}
+                    description={strings.drefFormObjectiveOperationDescription}
                 >
                     <TextArea
                         name="operation_objective"
@@ -242,8 +247,32 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormResponseRationale}
-                    description={value?.type_of_dref === TYPE_ASSESSMENT
-                        && strings.drefFormResponseRationaleDescription}
+                    description={(
+                        <>
+                            <p>
+                                {strings.drefFormResponseRationaleDescription}
+                            </p>
+                            <ul>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint3}
+                                </li>
+                                <li>
+                                    {strings.drefFormResponseRationaleDescriptionPoint4}
+                                </li>
+                                {value?.type_of_dref === TYPE_ASSESSMENT && (
+                                    <li>
+                                        {strings.drefFormResponseRationaleForAssessment}
+                                    </li>
+                                )}
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         name="response_strategy"
@@ -341,14 +370,22 @@ function Operation(props: Props) {
                             />
                         </>
                     )}
-                    <NumberInput
-                        label={strings.drefFormTotal}
-                        name="total_targeted_population"
-                        value={value.total_targeted_population}
-                        onChange={setFieldValue}
-                        error={error?.total_targeted_population}
-                        disabled={disabled}
-                    />
+                    <div>
+                        <NumberInput
+                            label={strings.drefFormTotal}
+                            name="total_targeted_population"
+                            value={value.total_targeted_population}
+                            onChange={setFieldValue}
+                            error={error?.total_targeted_population}
+                            disabled={disabled}
+                        />
+                        {peopleTargetedWarning && (
+                            <div className={styles.warning}>
+                                <ErrorWarningFillIcon className={styles.icon} />
+                                {peopleTargetedWarning}
+                            </div>
+                        )}
+                    </div>
                 </InputSection>
                 <InputSection
                     title={strings.drefFormEstimateResponse}
@@ -529,6 +566,24 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormRiskSecuritySafetyConcern}
+                    description={(
+                        <>
+                            <p>
+                                {strings.drefFormRiskSecuritySafetyConcernDescription}
+                            </p>
+                            <ul>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint1}
+                                </li>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint2}
+                                </li>
+                                <li>
+                                    {strings.drefFormRiskSecuritySafetyConcernDescriptionPoint3}
+                                </li>
+                            </ul>
+                        </>
+                    )}
                 >
                     <TextArea
                         name="risk_security_concern"
@@ -600,13 +655,21 @@ function Operation(props: Props) {
                     title={strings.drefOperationalUpdateAdditionalAllocationRequested}
                     numPreferredColumns={2}
                 >
-                    <NumberInput
-                        name="additional_allocation"
-                        value={value.additional_allocation}
-                        onChange={handleAdditionalAllocationChange}
-                        error={error?.additional_allocation}
-                        disabled={disabled}
-                    />
+                    <div>
+                        <NumberInput
+                            name="additional_allocation"
+                            value={value.additional_allocation}
+                            onChange={handleAdditionalAllocationChange}
+                            error={error?.additional_allocation}
+                            disabled={disabled}
+                        />
+                        {budgetWarning && (
+                            <div className={styles.warning}>
+                                <ErrorWarningFillIcon className={styles.icon} />
+                                {budgetWarning}
+                            </div>
+                        )}
+                    </div>
                 </InputSection>
                 <InputSection
                     title={strings.drefOperationalUpdateTotalAllocation}
@@ -721,9 +784,22 @@ function Operation(props: Props) {
                 </InputSection>
                 <InputSection
                     title={strings.drefFormSurgePersonnelDeployed}
-                    description={value?.is_surge_personnel_deployed
-                        ? strings.drefFormSurgePersonnelDeployedDescription
-                        : undefined}
+                    description={value?.is_surge_personnel_deployed && (
+                        <ul>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint1}
+                            </li>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint2}
+                            </li>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint3}
+                            </li>
+                            <li>
+                                {strings.drefFormSurgePersonnelDeployedDescriptionPoint4}
+                            </li>
+                        </ul>
+                    )}
                 >
                     <BooleanInput
                         name="is_surge_personnel_deployed"
@@ -739,7 +815,6 @@ function Operation(props: Props) {
                             onChange={setFieldValue}
                             value={value.surge_personnel_deployed}
                             error={error?.surge_personnel_deployed}
-                            placeholder={strings.drefFormSurgePersonnelDeployedDescription}
                             disabled={disabled}
                         />
                     )}
@@ -748,7 +823,28 @@ function Operation(props: Props) {
                     <>
                         <InputSection
                             title={strings.drefFormLogisticCapacityOfNs}
-                            description={strings.drefFormLogisticCapacityOfNsDescription}
+                            description={(
+                                <>
+                                    {strings.drefFormLogisticCapacityOfNsDescription}
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint4}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormLogisticCapacityOfNsDescriptionPoint5}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormOperationDescription}
@@ -761,7 +857,25 @@ function Operation(props: Props) {
                         </InputSection>
                         <InputSection
                             title={strings.drefFormPmer}
-                            description={strings.drefFormPmerDescription}
+                            description={(
+                                <>
+                                    {strings.drefFormPmerDescription}
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormPmerDescriptionPoint4}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormOperationDescription}
@@ -774,7 +888,25 @@ function Operation(props: Props) {
                         </InputSection>
                         <InputSection
                             title={strings.drefFormCommunication}
-                            description={strings.drefFormCommunicationDescription}
+                            description={(
+                                <>
+                                    {strings.drefFormCommunicationDescription}
+                                    <ul>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint1}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint2}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint3}
+                                        </li>
+                                        <li>
+                                            {strings.drefFormCommunicationDescriptionPoint4}
+                                        </li>
+                                    </ul>
+                                </>
+                            )}
                         >
                             <TextArea
                                 label={strings.drefFormOperationDescription}
diff --git a/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json b/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json
index 7bfdc6c679..ecfef30c5f 100644
--- a/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json
+++ b/app/src/views/DrefOperationalUpdateForm/Overview/i18n.json
@@ -8,6 +8,7 @@
         "drefFormInstantShareLabel": "Create & Share",
         "drefFormEssentialInformation": "Essential Information",
         "drefFormNationalSociety": "Name of National Society",
+        "drefFormNationalSocietyDescription": "Indicate your National Society by selecting it from the drop-down list.",
         "drefFormTypeOfDref": "Type of DREF",
         "drefFormImminentDisasterDetails": "Hazard Details",
         "drefFormDisasterDetails": "Disaster Details",
diff --git a/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx b/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
index 5516d45cd8..21f069e1db 100644
--- a/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Overview/index.tsx
@@ -8,6 +8,7 @@ import {
     useParams,
 } from 'react-router-dom';
 import {
+    ErrorWarningFillIcon,
     ShareLineIcon,
     WikiHelpSectionLineIcon,
 } from '@ifrc-go/icons';
@@ -99,6 +100,7 @@ interface Props {
     districtOptions: DistrictItem[] | null | undefined;
     setDistrictOptions: Dispatch<SetStateAction<DistrictItem[] | null | undefined>>;
     drefId: number | undefined;
+    geoWarning: string | undefined;
 }
 
 function Overview(props: Props) {
@@ -112,6 +114,7 @@ function Overview(props: Props) {
         districtOptions,
         setDistrictOptions,
         drefId,
+        geoWarning,
     } = props;
     const { state } = useLocation();
     const { opsUpdateId } = useParams<{ opsUpdateId: string }>();
@@ -280,6 +283,7 @@ function Overview(props: Props) {
             >
                 <InputSection
                     title={strings.drefFormNationalSociety}
+                    description={strings.drefFormNationalSocietyDescription}
                     numPreferredColumns={2}
                     withAsteriskOnTitle
                 >
@@ -397,17 +401,25 @@ function Overview(props: Props) {
                         error={error?.country}
                         disabled={disabled}
                     />
-                    <DistrictSearchMultiSelectInput
-                        name="district"
-                        countryId={value.country}
-                        label={strings.drefFormAddRegion}
-                        options={districtOptions}
-                        onChange={setFieldValue}
-                        value={value?.district}
-                        disabled={disabled}
-                        onOptionsChange={setDistrictOptions}
-                        error={getErrorString(error?.district)}
-                    />
+                    <div>
+                        <DistrictSearchMultiSelectInput
+                            name="district"
+                            countryId={value.country}
+                            label={strings.drefFormAddRegion}
+                            options={districtOptions}
+                            onChange={setFieldValue}
+                            value={value?.district}
+                            disabled={disabled}
+                            onOptionsChange={setDistrictOptions}
+                            error={getErrorString(error?.district)}
+                        />
+                        {geoWarning && (
+                            <div className={styles.warning}>
+                                <ErrorWarningFillIcon className={styles.icon} />
+                                {geoWarning}
+                            </div>
+                        )}
+                    </div>
                 </InputSection>
                 <InputSection
                     title={strings.drefFormTitle}
diff --git a/app/src/views/DrefOperationalUpdateForm/Overview/styles.module.css b/app/src/views/DrefOperationalUpdateForm/Overview/styles.module.css
index b8f51fb3a6..22dfa9c815 100644
--- a/app/src/views/DrefOperationalUpdateForm/Overview/styles.module.css
+++ b/app/src/views/DrefOperationalUpdateForm/Overview/styles.module.css
@@ -35,4 +35,13 @@
             min-height: 3rem;
         }
     }
+
+    .warning {
+        display: flex;
+        align-items: flex-start;
+        gap: var(--go-ui-spacing-sm);
+        padding: var(--go-ui-spacing-sm) 0;
+        color: var(--go-ui-color-warning);
+        font-weight: var(--go-ui-font-weight-semibold);
+    }
 }
diff --git a/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx b/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
index f4d3e4b3b8..1d9cd39fce 100644
--- a/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/Submission/index.tsx
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+import { ErrorWarningFillIcon } from '@ifrc-go/icons';
 import {
     Container,
     DateInput,
@@ -31,6 +32,7 @@ interface Props {
     setFieldValue: (...entries: EntriesAsList<Value>) => void;
     error: Error<Value> | undefined;
     disabled?: boolean;
+    operationTimeframeWarning: string | undefined;
 }
 
 function Submission(props: Props) {
@@ -39,6 +41,7 @@ function Submission(props: Props) {
         setFieldValue,
         value,
         disabled,
+        operationTimeframeWarning,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -104,14 +107,22 @@ function Submission(props: Props) {
                             disabled={disabled}
                         />
                     )}
-                    <NumberInput
-                        label={strings.drefOperationalUpdateTimeFrameTotalOperatingTimeFrame}
-                        name="total_operation_timeframe"
-                        value={value.total_operation_timeframe}
-                        onChange={handleTotalOperationTimeframeChange}
-                        error={error?.total_operation_timeframe}
-                        disabled={disabled}
-                    />
+                    <div>
+                        <NumberInput
+                            label={strings.drefOperationalUpdateTimeFrameTotalOperatingTimeFrame}
+                            name="total_operation_timeframe"
+                            value={value.total_operation_timeframe}
+                            onChange={handleTotalOperationTimeframeChange}
+                            error={error?.total_operation_timeframe}
+                            disabled={disabled}
+                        />
+                        {operationTimeframeWarning && (
+                            <div className={styles.warning}>
+                                <ErrorWarningFillIcon className={styles.icon} />
+                                {operationTimeframeWarning}
+                            </div>
+                        )}
+                    </div>
                     {value.type_of_dref !== TYPE_LOAN && (
                         <DateInput
                             label={strings.drefOperationalUpdateTimeFrameExtensionRequestedIfYes}
diff --git a/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css b/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css
index 58070b36ac..efdc9f5abd 100644
--- a/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css
+++ b/app/src/views/DrefOperationalUpdateForm/Submission/styles.module.css
@@ -2,4 +2,13 @@
     display: flex;
     flex-direction: column;
     gap: var(--go-ui-spacing-2xl);
+
+    .warning {
+        display: flex;
+        align-items: flex-start;
+        gap: var(--go-ui-spacing-sm);
+        padding: var(--go-ui-spacing-sm) 0;
+        color: var(--go-ui-color-warning);
+        font-weight: var(--go-ui-font-weight-semibold);
+    }
 }
diff --git a/app/src/views/DrefOperationalUpdateForm/index.tsx b/app/src/views/DrefOperationalUpdateForm/index.tsx
index e2b93efd15..a4f3e8a2f1 100644
--- a/app/src/views/DrefOperationalUpdateForm/index.tsx
+++ b/app/src/views/DrefOperationalUpdateForm/index.tsx
@@ -6,10 +6,7 @@ import {
     useState,
 } from 'react';
 import { useParams } from 'react-router-dom';
-import {
-    DownloadTwoLineIcon,
-    ErrorWarningFillIcon,
-} from '@ifrc-go/icons';
+import { DownloadTwoLineIcon } from '@ifrc-go/icons';
 import type { ButtonProps } from '@ifrc-go/ui';
 import {
     Button,
@@ -563,11 +560,6 @@ export function Component() {
         [setShowExportModalTrue],
     );
 
-    const hasAnyWarning = isTruthyString(peopleTargetedWarning)
-        || isTruthyString(operationTimeframeWarning)
-        || isTruthyString(budgetWarning)
-        || isTruthyString(geoWarning);
-
     const disabled = fetchingOpsUpdate
         || updateOpsUpdatePending
         || fetchingDref
@@ -696,34 +688,6 @@ export function Component() {
                             error={formError}
                             withFallbackError
                         />
-                        {hasAnyWarning && (
-                            <div className={styles.warnings}>
-                                {operationTimeframeWarning && (
-                                    <div className={styles.warning}>
-                                        <ErrorWarningFillIcon className={styles.icon} />
-                                        {operationTimeframeWarning}
-                                    </div>
-                                )}
-                                {budgetWarning && (
-                                    <div className={styles.warning}>
-                                        <ErrorWarningFillIcon className={styles.icon} />
-                                        {budgetWarning}
-                                    </div>
-                                )}
-                                {geoWarning && (
-                                    <div className={styles.warning}>
-                                        <ErrorWarningFillIcon className={styles.icon} />
-                                        {geoWarning}
-                                    </div>
-                                )}
-                                {peopleTargetedWarning && (
-                                    <div className={styles.warning}>
-                                        <ErrorWarningFillIcon className={styles.icon} />
-                                        {peopleTargetedWarning}
-                                    </div>
-                                )}
-                            </div>
-                        )}
                         <TabPanel name="overview">
                             <Overview
                                 value={value}
@@ -735,6 +699,7 @@ export function Component() {
                                 districtOptions={districtOptions}
                                 setDistrictOptions={setDistrictOptions}
                                 drefId={drefId}
+                                geoWarning={geoWarning}
                             />
                         </TabPanel>
                         <TabPanel name="eventDetail">
@@ -745,6 +710,10 @@ export function Component() {
                                 setFileIdToUrlMap={setFileIdToUrlMap}
                                 error={formError}
                                 disabled={disabled}
+                                operationTimeframeWarning={operationTimeframeWarning}
+                                budgetWarning={budgetWarning}
+                                geoWarning={geoWarning}
+                                peopleTargetedWarning={peopleTargetedWarning}
                             />
                         </TabPanel>
                         <TabPanel name="actions">
@@ -765,6 +734,8 @@ export function Component() {
                                 setFileIdToUrlMap={setFileIdToUrlMap}
                                 error={formError}
                                 disabled={disabled}
+                                budgetWarning={budgetWarning}
+                                peopleTargetedWarning={peopleTargetedWarning}
                             />
                         </TabPanel>
                         <TabPanel name="submission">
@@ -772,6 +743,7 @@ export function Component() {
                                 value={value}
                                 setFieldValue={setFieldValue}
                                 error={formError}
+                                operationTimeframeWarning={operationTimeframeWarning}
                                 disabled={disabled}
                             />
                         </TabPanel>
diff --git a/app/src/views/DrefOperationalUpdateForm/schema.ts b/app/src/views/DrefOperationalUpdateForm/schema.ts
index 35054cbef0..16e51e436e 100644
--- a/app/src/views/DrefOperationalUpdateForm/schema.ts
+++ b/app/src/views/DrefOperationalUpdateForm/schema.ts
@@ -52,7 +52,6 @@ export type OpsUpdateRequestBody = GoApiBody<'/api/v2/dref-op-update/{id}/', 'PA
 };
 
 type NeedIdentifiedResponse = NonNullable<OpsUpdateRequestBody['needs_identified']>[number];
-type NsActionResponse = NonNullable<OpsUpdateRequestBody['national_society_actions']>[number];
 type InterventionResponse = NonNullable<OpsUpdateRequestBody['planned_interventions']>[number];
 type IndicatorResponse = NonNullable<InterventionResponse['indicators']>[number];
 type RiskSecurityResponse = NonNullable<OpsUpdateRequestBody['risk_security']>[number];
@@ -60,7 +59,6 @@ type ImagesFileResponse = NonNullable<OpsUpdateRequestBody['images_file']>[numbe
 type SourceInformationResponse = NonNullable<OpsUpdateRequestBody['source_information']>[number];
 
 type NeedIdentifiedFormFields = NeedIdentifiedResponse & { client_id: string };
-type NsActionFormFields = NsActionResponse & { client_id: string; }
 type InterventionFormFields = InterventionResponse & { client_id: string };
 type IndicatorFormFields = IndicatorResponse & { client_id: string };
 type SourceInformationFormFields = SourceInformationResponse & { client_id: string };
@@ -83,13 +81,9 @@ type OpsUpdateFormFields = (
                         DeepReplace<
                             DeepReplace<
                                 DeepReplace<
-                                    DeepReplace<
-                                        OpsUpdateRequestBody,
-                                        NeedIdentifiedResponse,
-                                        NeedIdentifiedFormFields
-                                    >,
-                                    NsActionResponse,
-                                    NsActionFormFields
+                                    OpsUpdateRequestBody,
+                                    NeedIdentifiedResponse,
+                                    NeedIdentifiedFormFields
                                 >,
                                 InterventionResponse,
                                 InterventionFormFields
@@ -122,12 +116,9 @@ export type PartialOpsUpdate = PartialForm<
 type OpsUpdateFormSchema = ObjectSchema<PartialOpsUpdate>;
 type OpsUpdateFormSchemaFields = ReturnType<OpsUpdateFormSchema['fields']>;
 
-type PhotoFileFields = ReturnType<ObjectSchema<NonNullable<PartialOpsUpdate['photos_file']>[number], PartialOpsUpdate>['fields']>;
-
 type EventMapFileFields = ReturnType<ObjectSchema<PartialOpsUpdate['event_map_file'], PartialOpsUpdate>['fields']>;
 type CoverImageFileFields = ReturnType<ObjectSchema<PartialOpsUpdate['cover_image_file'], PartialOpsUpdate>['fields']>;
 type ImageFileFields = ReturnType<ObjectSchema<NonNullable<PartialOpsUpdate['images_file']>[number], PartialOpsUpdate>['fields']>;
-type NationalSocietyFields = ReturnType<ObjectSchema<NonNullable<PartialOpsUpdate['national_society_actions']>[number], PartialOpsUpdate>['fields']>;
 type NeedsIdentifiedFields = ReturnType<ObjectSchema<NonNullable<PartialOpsUpdate['needs_identified']>[number], PartialOpsUpdate>['fields']>;
 type RiskSecurityFields = ReturnType<ObjectSchema<NonNullable<PartialOpsUpdate['risk_security']>[number], PartialOpsUpdate>['fields']>;
 type SourceInformationFields = ReturnType<ObjectSchema<NonNullable<PartialOpsUpdate['source_information']>[number], PartialOpsUpdate>['fields']>;
@@ -399,23 +390,6 @@ const schema: OpsUpdateFormSchema = {
 
         // ACTIONS
 
-        formFields = addCondition(
-            formFields,
-            formValue,
-            ['did_national_society', 'type_of_dref'],
-            ['ns_respond_date'],
-            (val): Pick<OpsUpdateFormSchemaFields, 'ns_respond_date'> => {
-                if (val?.type_of_dref !== TYPE_LOAN && val?.did_national_society) {
-                    return {
-                        ns_respond_date: {},
-                    };
-                }
-                return {
-                    ns_respond_date: { forceValue: nullValue },
-                };
-            },
-        );
-
         formFields = addCondition(
             formFields,
             formValue,
@@ -437,8 +411,6 @@ const schema: OpsUpdateFormSchema = {
             'assessment_report',
             'needs_identified',
             'identified_gaps',
-            'did_national_society',
-            'national_society_actions',
             'ifrc',
             'icrc',
             'partner_national_society',
@@ -446,7 +418,6 @@ const schema: OpsUpdateFormSchema = {
             'national_authorities',
             'un_or_other_actor',
             'is_there_major_coordination_mechanism',
-            'photos_file',
         ] as const;
         type ActionsDrefTypeRelatedFields = Pick<
             OpsUpdateFormSchemaFields,
@@ -462,9 +433,6 @@ const schema: OpsUpdateFormSchema = {
                     assessment_report: { forceValue: nullValue },
                     needs_identified: { forceValue: [] },
                     identified_gaps: { forceValue: nullValue },
-                    did_national_society: { forceValue: nullValue },
-                    national_society_actions: { forceValue: [] },
-                    photos_file: { forceValue: [] },
                     ifrc: { forceValue: nullValue },
                     icrc: { forceValue: nullValue },
                     partner_national_society: { forceValue: nullValue },
@@ -478,34 +446,6 @@ const schema: OpsUpdateFormSchema = {
                 }
                 conditionalFields = {
                     ...conditionalFields,
-                    did_national_society: {},
-                    national_society_actions: {
-                        keySelector: (nsAction) => nsAction.client_id,
-                        member: () => ({
-                            fields: (): NationalSocietyFields => ({
-                                client_id: {},
-                                title: {
-                                    required: true,
-                                    requiredValidation: requiredStringCondition,
-                                },
-                                description: {
-                                    required: true,
-                                    requiredValidation: requiredStringCondition,
-                                },
-                            }),
-                        }),
-                    },
-                    photos_file: {
-                        validations: [lessThanEqualToTwoImagesCondition],
-                        keySelector: (value) => value.client_id,
-                        member: () => ({
-                            fields: (): PhotoFileFields => ({
-                                client_id: {},
-                                id: { defaultValue: undefinedValue },
-                                caption: {},
-                            }),
-                        }),
-                    },
                     ifrc: {},
                     icrc: {},
                     partner_national_society: {},
@@ -718,7 +658,12 @@ const schema: OpsUpdateFormSchema = {
                                             client_id: {},
                                             title: {},
                                             target: { validations: [positiveNumberCondition] },
-                                            actual: { validations: [positiveNumberCondition] },
+                                            actual: {
+                                                required: true,
+                                                validations: [
+                                                    positiveNumberCondition,
+                                                ],
+                                            },
                                         }),
                                     }),
                                 },