diff --git a/.env.example b/.env.example
index 3b3995570..86969f78c 100644
--- a/.env.example
+++ b/.env.example
@@ -20,3 +20,6 @@ JWT_SECRET=
 #Crowdin
 CROWDIN_PERSONAL_TOKEN=
 CROWDIN_PROJECT_ID=
+
+# For dmptool-narrative-generator service
+NARRATIVE_SERVICE_URL=http://narrative:3030
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e73498b97..8ea4eb811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,50 @@
 ### Added
+- Added missing `slug` property to all `tags` in the graphQL queries 
+- Added guidance text from the backend to the Question Answer page [#580]
+- Added new, shared `ProjectRoles` component that generates the list of Project Roles for both the Project Member Search and Edit Project member pages [#945]
+- Added `Help text` fields to `Description, Repositories, Metadata Standards, License, Access Level and Custom Text` fields in Research Output question type [#970]
+- Added customizable `Initial Access Level` field to the QuestionAdd page for Research Outputs question type [#969]
+- Added new `Start DMP` page at `projects/[projectId]/dmp/start` to direct user to create new plan or upload existing [#956]
+- Added `autosave` back to the `PlanOverviewQuestionpage` [#944]
+- Hooked up the `Download plan` page and added a `download-narrative` api endpoint [#313]
+
+### Updated
+- Guidance page updates [#934]
+  - Hooked up `admin/guidance` page that lists all the `guidance groups` and offers `Create Guidance Group` button and edit options for existing Guidance Groups [#934]
+  - Hooked up `admin/guidance/groups/create`, and created a new page for `admin/guidance/groups/[groupId]` to include guidance text for all tags in one place and to allow    
+    publishing at that level [#934]
+  - Added skeleton for loading of TinyMCEEditor. Especially needed it for the new Guidance Group Edit page, since we are loading so many at once [#934] 
+  - Updated stripHtmlTags to include replacement of ` ` [#934]
+  - Updated `DashboardListItem` to have the option to be fully clickable. This makes clicking on smaller devices easier [#934]
+- Made improvements to auth handling in `middleware` and `authHelper.ts` [#1035]
+- Made text changes to upcoming blog posts [#989]
+- For Research Outputs, updated repositories and metadata standards fields to be automatically enabled when user selects custom ones [#943]
+- Updated Licenses and Output Types to use label "Use custom list" [#943]
+- Updated `Output Types` in static `Research Outputs` table [#962]
+  - Added a description field to custom types
+  - Added tooltip icons next to each default output type with the description
+  - Updated Output Types component to behave like the Licenses component, where users can delete default types
+  - Updated unit test
+- Improved project creation steps by updating pages in the flow (header, home, plan dashboard, create project details,and funding search) to help users in creating a plan [#956]
+- Updated Project Details subdomains field to only display once a user selects a research domain [#947]
+- Updated `Remove` buttons to be `secondary` buttons, rather than `red` [#964]
+
+### Fixed
+- For Research Outputs, fixed custom Licenses select field to display selected value [#943]
+- Fixed issue where custom repos and standards were not saving in state [#943]
+
+### Removed
+- Removed Research Outputs section from the plan overview page
+- Removed reference to the old `outputs` association on the graphQL query
+- Removed `Description` fields for Research Output question fields [#970]
+- Removed `scrollToTop` from `Template Create` page [#950]
+
+### Chore
+- Updated `next` version to `15.5.7` due to vulnerability
+- Ran `npm audit fix` to address `glob` vulnerability and `js-yaml` vulnerability
+====================================================================================================================================
+## All changes above the line happened after the merge to the main branch on Nov 3, 2025
+### Added
 - Added user's org as a filter for the Plan Create (`projects/9/dmp/create`) page, and updated filter text to include `organization` [#735]
   - Fixed filtering on the Plan Create (`projects/9/dmp/create`) page so that it takes search term into consideration when used with checked filters [#735]
   - Moved checkbox filters below search field to make them more noticeable [#735]
@@ -6,7 +52,7 @@
 - Removed `Title` field from TinyMCEEditor's `Insert Link` form, and made `new window` the default for `Open link in...` [#874]
 - Integrated related works UI with GraphQL backend.
 - Added updated description that includes template source, affiliation name, version and publish date on the `Plan Overview` page [#621]
-
+- Added plan feedback status (Feedback received, Feedback requested, No feedback) to the `Plan Overview` page [#411]
 
 ### Updated
 - Updated `TinyMCEEditor` to allow users to change text color and background color.
diff --git a/app/[locale]/__tests__/page.spec.tsx b/app/[locale]/__tests__/page.spec.tsx
index 845303667..e8aca56ce 100644
--- a/app/[locale]/__tests__/page.spec.tsx
+++ b/app/[locale]/__tests__/page.spec.tsx
@@ -10,37 +10,33 @@ describe('Home Page', () => {
     render(<Home />);
 
     // Check for the heading
-    expect(screen.getByRole('heading', { level: 1 })).toHaveTextContent('Home Page');
+    expect(screen.getByRole('heading', { level: 1 })).toHaveTextContent('title');
 
     // Check for the PageLinkCard sections
-    expect(screen.getByText('Create & Manage')).toBeInTheDocument();
-    expect(screen.getByText('Account & Administration')).toBeInTheDocument();
+    expect(screen.getByText('createAndManage.title')).toBeInTheDocument();
+    expect(screen.getByText('createAndManage.description')).toBeInTheDocument();
+    expect(screen.getByText('accountAndAdmin.title')).toBeInTheDocument();
+    expect(screen.getByText('accountAndAdmin.description')).toBeInTheDocument();
 
     // Check for section descriptions
-    expect(screen.getByText('Create new templates and projects')).toBeInTheDocument();
-    expect(screen.getByText('Manage your account and access admin features')).toBeInTheDocument();
+    expect(screen.getByText('sections.templateManagement.title')).toBeInTheDocument();
+    expect(screen.getByText('sections.templateManagement.description')).toBeInTheDocument();
+    expect(screen.getByText('sections.planDashboard.title')).toBeInTheDocument();
+    expect(screen.getByText('sections.planDashboard.description')).toBeInTheDocument();
+    expect(screen.getByText('sections.accountSettings.title')).toBeInTheDocument();
+    expect(screen.getByText('sections.accountSettings.description')).toBeInTheDocument();
+    expect(screen.getByText('sections.adminOverview.title')).toBeInTheDocument();
+    expect(screen.getByText('sections.adminOverview.description')).toBeInTheDocument();
 
     // Check for all links to be present
     const allLinks = screen.getAllByRole('link');
     expect(allLinks).toHaveLength(4);
 
-   
-    expect(screen.getByText('Template Management')).toBeInTheDocument();
-    expect(screen.getByText('Project Management')).toBeInTheDocument();
-    expect(screen.getByText('Account Settings')).toBeInTheDocument();
-    expect(screen.getByText('Admin Overview')).toBeInTheDocument();
 
-
-    expect(screen.getByText('Create and manage templates (Must be Admin to access)')).toBeInTheDocument();
-    expect(screen.getByText('Create and manage projects')).toBeInTheDocument();
-    expect(screen.getByText('View and manage your account')).toBeInTheDocument();
-    expect(screen.getByText('Access administrative functions')).toBeInTheDocument();
-
-
-    const templateManagementLink = screen.getByText('Template Management').closest('a');
-    const projectManagementLink = screen.getByText('Project Management').closest('a');
-    const accountSettingsLink = screen.getByText('Account Settings').closest('a');
-    const adminOverviewLink = screen.getByText('Admin Overview').closest('a');
+    const templateManagementLink = screen.getByText('sections.templateManagement.title').closest('a');
+    const projectManagementLink = screen.getByText('sections.planDashboard.title').closest('a');
+    const accountSettingsLink = screen.getByText('sections.accountSettings.title').closest('a');
+    const adminOverviewLink = screen.getByText('sections.adminOverview.title').closest('a');
 
     expect(templateManagementLink).toHaveAttribute('href', '/en-US/template');
     expect(projectManagementLink).toHaveAttribute('href', '/en-US/projects');
diff --git a/app/[locale]/admin/guidance/__mocks__/mockGuidanceGroupsData.json b/app/[locale]/admin/guidance/__mocks__/mockGuidanceGroupsData.json
new file mode 100644
index 000000000..ad38ab9f5
--- /dev/null
+++ b/app/[locale]/admin/guidance/__mocks__/mockGuidanceGroupsData.json
@@ -0,0 +1,256 @@
+{
+  "guidanceGroups": [
+    {
+      "__typename": "GuidanceGroup",
+      "id": 2397,
+      "name": "CDL Guidance Group",
+      "description": "This is the guidance group for all CDL guidance",
+      "latestPublishedVersion": "1",
+      "latestPublishedDate": "2025-11-26 19:43:42",
+      "guidance": [
+        {
+          "__typename": "Guidance",
+          "tagId": 2,
+          "guidanceText": "<p>This is guidance text for Preservation</p>",
+          "id": 974
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 3,
+          "guidanceText": "<p>This is guidance text for Data Collection</p>",
+          "id": 975
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 11,
+          "guidanceText": "<p>This is guidance text for Data sharing</p>",
+          "id": 976
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 1,
+          "guidanceText": "<p>Guidance text for storage &amp; security123</p>",
+          "id": 977
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 4,
+          "guidanceText": "<p>Guidance text for data format</p>",
+          "id": 978
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 5,
+          "guidanceText": "<p>Guidance text for roles &amp; responsibilities</p>",
+          "id": 979
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 6,
+          "guidanceText": "<p>Guidance for Ethics &amp; privacy</p>",
+          "id": 980
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 7,
+          "guidanceText": "<p>Guidance text for intellectual propert rights</p>",
+          "id": 981
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 8,
+          "guidanceText": "<p>Guidance text for related policies123</p>",
+          "id": 982
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 9,
+          "guidanceText": "<p>Adding guidance text for budget, which didn't exist before</p>",
+          "id": 983
+        }
+      ],
+      "modifiedBy": {
+        "__typename": "User",
+        "givenName": "Super",
+        "surName": "Admin",
+        "id": 1
+      },
+      "modified": "2025-11-25 23:38:35",
+      "isDirty": true,
+      "versionedGuidanceGroup": [
+        {
+          "__typename": "VersionedGuidanceGroup",
+          "active": false,
+          "id": 1001,
+          "version": 1
+        }
+      ]
+    },
+    {
+      "__typename": "GuidanceGroup",
+      "id": 2396,
+      "name": "Data sharing",
+      "description": "",
+      "latestPublishedVersion": null,
+      "latestPublishedDate": null,
+      "guidance": [],
+      "modifiedBy": {
+        "__typename": "User",
+        "givenName": "Test",
+        "surName": "Admin",
+        "id": 2
+      },
+      "modified": "2025-11-25 00:00:00",
+      "isDirty": true,
+      "versionedGuidanceGroup": []
+    },
+    {
+      "__typename": "GuidanceGroup",
+      "id": 210,
+      "name": "DMPTool",
+      "description": "",
+      "latestPublishedVersion": "1",
+      "latestPublishedDate": "2017-12-04 14:30:41",
+      "guidance": [
+        {
+          "__typename": "Guidance",
+          "tagId": 1,
+          "guidanceText": "<ul><li>Give a summary of the data you will collect or create, noting the content, coverage and data type, e.g., tabular data, survey data, experimental measurements, models, software, audiovisual data, physical samples, etc.</li><li>Consider how your data could complement and integrate with existing data, or whether there are any existing data or methods that you could reuse.</li><li>Indicate which data are of long-term value and should be shared and/or preserved.</li><li>If purchasing or reusing existing data, explain how issues such as copyright and IPR have been addressed. You should aim to minimize any restrictions on the reuse (and subsequent sharing) of third-party data.</li></ul>",
+          "id": 960
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 2,
+          "guidanceText": "<ul><li>Clearly note what format(s) your data will be in, e.g., plain text (.txt), comma-separated values (.csv), geo-referenced TIFF (.tif, .tfw).</li><li>Explain why you have chosen certain formats. Decisions may be based on staff expertise, a preference for open formats, the standards accepted by data centers, or widespread usage within a given community.</li><li>Using standardized, interchangeable, or open formats ensures the long-term usability of data; these are recommended for sharing and archiving.</li><li>See&nbsp;DataONE Best Practices for&nbsp;<a href=\"https://dataoneorg.github.io/Education/bestpractices/tag#format\" target=\"_blank\" rel=\"noopener\">file formats</a>.</li></ul>",
+          "id": 961
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 3,
+          "guidanceText": "<ul><li>Note what volume of data you will create in MB/GB/TB. Indicate the proportions of raw data, processed data, and other secondary outputs (e.g., reports).</li><li>Consider the implications of data volumes in terms of storage, access, and preservation. Do you need to include additional costs?</li><li>Consider whether the scale of the data will pose challenges when sharing or transferring data between sites; if so, how will you address these challenges?</li></ul>",
+          "id": 962
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 14,
+          "guidanceText": "<ul><li>Outline how the data will be collected and processed. This should cover relevant standards or methods, quality assurance, and data organisation.</li><li>Indicate how the data will be organized during the project, mentioning, e.g., naming conventions, version control, and folder structures. Consistent, well-ordered research data will be easier to find, understand, and reuse.</li><li>Explain how the consistency and quality of data collection will be controlled and documented. This may include processes such as calibration, repeat samples, or measurements, standardized data capture, data entry validation, peer review of data, or representation with controlled vocabularies.</li><li>See the DataOne Best Practices for&nbsp;<a href=\"https://dataoneorg.github.io/Education/bestpractices/tag#quality\" target=\"_blank\" rel=\"noopener\">data quality</a>.</li></ul>",
+          "id": 963
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 4,
+          "guidanceText": "<ul><li>What metadata will be provided to help others identify and discover the data?</li><li>Researchers are strongly encouraged to use community metadata standards where these are in place. The Research Data Alliance offers a&nbsp;<a href=\"http://rd-alliance.github.io/metadata-directory/\">Directory of Metadata Standards</a>. Data repositories may also provide guidance about appropriate metadata standards.</li><li>Consider what other documentation is needed to enable reuse. This may include information on the methodology used to collect the data, analytical and procedural information, definitions of variables, units of measurement, any assumptions made, the format and file type of the data, and software used to collect and/or process the data.</li><li>Consider how you will capture this information and where it will be recorded, e.g., in a database with links to each item, in a \"readme\" text file, in file headers, etc.</li></ul>",
+          "id": 964
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 5,
+          "guidanceText": "<ul><li>Investigators carrying out research involving human participants should request consent to preserve and share the data. Do not just ask for permission to use the data in your study or make unnecessary promises to delete it at the end.</li><li>Consider how you will protect the identity of participants, e.g., via anonymization or using managed access procedures.</li><li>Ethical issues may affect how you store and transfer data, who can see/use it, and how long it is kept. You should demonstrate that you are aware of this and have planned accordingly.</li><li>See&nbsp;<a href=\"http://www.icpsr.umich.edu/icpsrweb/content/datamanagement/confidentiality/index.html\">ICPSR approach to confidentiality</a>&nbsp;and Health Insurance Portability and Accountability Act&nbsp;<a href=\"https://privacyruleandresearch.nih.gov/\">(HIPAA) regulations for health research</a>.</li><li>If you are collecting Traditional Knowledge as part of the project it is advisable to apply <a title=\"TK Notices\" href=\"https://www.localcontexts.org/\" target=\"_blank\" rel=\"noopener\">TK Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.&nbsp;</li><li>If you are generating data derived from Indigenous lands and/or waters, it is advisable to use&nbsp;<a title=\"BC Notice\" href=\"https://www.localcontexts.org/\" target=\"_blank\" rel=\"noopener\">B</a><a title=\"BC Notices\" href=\"https://www.localcontexts.org/\">C Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.</li></ul>",
+          "id": 965
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 6,
+          "guidanceText": "<ul><li>State who will own the copyright and IPR of any existing data as well as new data that you will generate. For multi-partner projects, IPR ownership should be covered in the consortium agreement.</li><li>Outline any restrictions needed on data sharing, e.g., to protect proprietary or patentable data.</li><li>Explain how the data will be licensed for reuse. See the DCC guide on&nbsp;<a href=\"http://www.dcc.ac.uk/resources/how-guides/license-research-data\">How to license research data</a>&nbsp;and EUDAT&rsquo;s&nbsp;<a href=\"https://ufal.github.io/public-license-selector/\">data and software licensing wizard</a>.</li><li>If you are collecting Traditional Knowledge as part of the project it is advisable to apply <a title=\"TK Notices\" href=\"https://www.localcontexts.org/\" target=\"_blank\" rel=\"noopener\">TK Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.&nbsp;</li><li>If you are generating data derived from Indigenous lands and/or waters, it is advisable to use&nbsp;<a title=\"TK Notices\" href=\"https://www.localcontexts.org/\" target=\"_blank\" rel=\"noopener\">TK Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.</li></ul>",
+          "id": 966
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 7,
+          "guidanceText": "<ul><li>Describe where the data will be stored and backed up during the course of research activities. This may vary if you are doing fieldwork or working across multiple sites so explain each procedure.</li><li>Identify who will be responsible for backup and how often this will be performed. The use of robust, managed storage with automatic backup, for example, that provided by university IT teams, is preferable. Storing data on laptops, computer hard drives, or external storage devices alone is very risky.</li><li>See the&nbsp;DataONE Best Practices for&nbsp;<a href=\"https://dataoneorg.github.io/Education/bestpractices/tag#storage\" target=\"_blank\" rel=\"noopener\">storage</a>.</li><li>Also consider data security, particularly if your data is sensitive e.g., detailed personal data, politically sensitive information or trade secrets. Note the main risks and how these will be managed. Also note whether any institutional data security policies are in place.</li><li>Identify any formal standards that you will comply with, e.g., ISO 27001. See the DCC Briefing Paper on Information Security Management -&nbsp;<a href=\"http://www.dcc.ac.uk/resources/briefing-papers/standards-watch-papers/information-security-management-iso-27000-iso-27k-s\">ISO 27000</a>&nbsp;and UK Data Service guidance on&nbsp;<a href=\"https://www.ukdataservice.ac.uk/manage-data/store/security\">data security</a>.</li></ul>",
+          "id": 967
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 8,
+          "guidanceText": "<ul><li>How will you share the data, e.g., deposit in a data repository, use a secure data service, handle data requests directly, or use another mechanism? The methods used will depend on a number of factors such as the type, size, complexity, and sensitivity of the data.</li><li>When will you make the data available? Research funders expect timely release. They typically allow embargoes but not prolonged exclusive use.</li><li>Who will be able to use your data? If you need to restrict access to certain communities or apply data sharing agreements, explain why.</li><li>Consider strategies to minimize restrictions on sharing. These may include anonymizing or aggregating data, gaining participant consent for data sharing, gaining copyright permissions, and agreeing a limited embargo period.</li><li>How might your data be reused in other contexts? Where there is potential for reuse, you should use standards and formats that facilitate this, and ensure that appropriate metadata is available online so your data can be discovered. Persistent identifiers should be applied so people can reliably and efficiently find your data. They also help you to track citations and reuse.</li></ul>",
+          "id": 968
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 9,
+          "guidanceText": "<ul><li>Where will the data be deposited? If you do not propose to use an established repository, the data management plan should demonstrate that the data can be curated effectively beyond the lifetime of the grant.</li><li>It helps to show that you have consulted with the repository to understand their policies and procedures, including any metadata standards, and costs involved.</li><li>An international list of data repositories is available via&nbsp;<a href=\"http://www.re3data.org/\">re3data</a>&nbsp;and some universities or publishers provide lists of recommendations, e.g.,&nbsp;<a href=\"http://journals.plos.org/plosone/s/data-availability#loc-recommended-repositories\">PLOS ONE recommended repositories</a>.</li></ul>",
+          "id": 969
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 10,
+          "guidanceText": "<ul><li>Outline the plans for data sharing and preservation - how long will the data be retained and where will it be archived? Will additional resources be needed to prepare data for deposit or meet any charges from data repositories?</li><li>See the&nbsp;DataONE Best Practices for&nbsp;<a href=\"https://www.dataone.org/best-practices/identify-data-long-term-value\">Identifying data with long-term value</a>.</li></ul>",
+          "id": 970
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 11,
+          "guidanceText": "<ul><li>Outline the roles and responsibilities for all activities, e.g., data capture, metadata production, data quality, storage and backup, data archiving, and data sharing. Individuals should be named where possible.</li><li>For collaborative projects you should explain the coordination of data management responsibilities across partners.</li><li>See the&nbsp;DataONE Best Practices:&nbsp;<a href=\"https://www.dataone.org/best-practices/define-roles-and-assign-responsibilities-data-management\">Define roles and assign responsibilities for data management</a>.</li></ul>",
+          "id": 971
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 12,
+          "guidanceText": "<ul><li>Carefully consider and justify any resources needed to deliver the plan. These may include storage costs, hardware, staff time, costs of preparing data for deposit, and repository charges.</li><li>Outline any relevant technical expertise, support, and training that is likely to be required and how it will be acquired.</li><li>If you are not depositing in a data repository, ensure you have appropriate resources and systems in place to share and preserve the data. See UK Data Service guidance on&nbsp;<a href=\"https://www.ukdataservice.ac.uk/manage-data/plan/costing\">costing data management</a>.</li></ul>",
+          "id": 972
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 13,
+          "guidanceText": "<ul><li>Consider whether there are any existing procedures that you can base your approach on. If your group/department has local guidelines that you work to, point to them here.</li><li>List any other relevant funder, institutional, departmental, or group policies on data management, data sharing, and data security.</li></ul>",
+          "id": 973
+        }
+      ],
+      "modifiedBy": {
+        "__typename": "User",
+        "givenName": "Test",
+        "surName": "Admin",
+        "id": 2
+      },
+      "modified": "2025-11-25 00:00:00",
+      "isDirty": false,
+      "versionedGuidanceGroup": [
+        {
+          "__typename": "VersionedGuidanceGroup",
+          "active": true,
+          "id": 1002,
+          "version": 1
+        }
+      ]
+    },
+    {
+      "__typename": "GuidanceGroup",
+      "id": 2398,
+      "name": "Test Guidance Group",
+      "description": "This is the description for my new Guidance Group123",
+      "latestPublishedVersion": "1",
+      "latestPublishedDate": "2025-11-30 19:21:28",
+      "guidance": [
+        {
+          "__typename": "Guidance",
+          "tagId": 1,
+          "guidanceText": "<p>This is the storage &amp; security guidance</p>",
+          "id": 984
+        },
+        {
+          "__typename": "Guidance",
+          "tagId": 2,
+          "guidanceText": "<p>This is the preservation guidance</p>",
+          "id": 985
+        }
+      ],
+      "modifiedBy": {
+        "__typename": "User",
+        "givenName": "Super",
+        "surName": "Admin",
+        "id": 1
+      },
+      "modified": "2025-11-30 21:05:24",
+      "isDirty": true,
+      "versionedGuidanceGroup": [
+        {
+          "__typename": "VersionedGuidanceGroup",
+          "active": false,
+          "id": 1003,
+          "version": 1
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/__mocks__/mockMeData.json b/app/[locale]/admin/guidance/__mocks__/mockMeData.json
new file mode 100644
index 000000000..b7df9ae71
--- /dev/null
+++ b/app/[locale]/admin/guidance/__mocks__/mockMeData.json
@@ -0,0 +1,33 @@
+{
+  "me": {
+    "__typename": "User",
+    "id": 1,
+    "givenName": "Super",
+    "surName": "Admin",
+    "languageId": "en-US",
+    "role": "SUPERADMIN",
+    "emails": [
+      {
+        "__typename": "UserEmail",
+        "id": 1,
+        "email": "super@example.com",
+        "isPrimary": true,
+        "isConfirmed": true
+      }
+    ],
+    "errors": {
+      "__typename": "UserErrors",
+      "general": null,
+      "email": null,
+      "password": null,
+      "role": null
+    },
+    "affiliation": {
+      "__typename": "Affiliation",
+      "id": 1,
+      "name": "California Digital Library",
+      "searchName": "California Digital Library | cdlib.org | CDL ",
+      "uri": "https://ror.org/03yrm5c12"
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/__mocks__/mockTagsData.json b/app/[locale]/admin/guidance/__mocks__/mockTagsData.json
new file mode 100644
index 000000000..434dbb85d
--- /dev/null
+++ b/app/[locale]/admin/guidance/__mocks__/mockTagsData.json
@@ -0,0 +1,102 @@
+{
+  "tags": [
+    {
+      "__typename": "Tag",
+      "id": 1,
+      "name": "Storage & security",
+      "slug": "storage-security",
+      "description": "<ul><li>Describe where the data will be stored and backed up during the course of research activities. This may vary if you are doing fieldwork or working across multiple sites so explain each procedure.</li><li>Identify who will be responsible for backup and how often this will be performed. The use of robust, managed storage with automatic backup, for example, that provided by university IT teams, is preferable. Storing data on laptops, computer hard drives, or external storage devices alone is very risky.</li><li>See UK Data Service Guidance on&nbsp;<a href=\"https://www.ukdataservice.ac.uk/manage-data/store\">data storage</a>&nbsp;or DataONE Best Practices for&nbsp;<a href=\"https://dataoneorg.github.io/Education/bestpractices/create-manage-and.html\">storage</a>.</li><li>Also consider data security, particularly if your data is sensitive, e.g., detailed personal data, politically sensitive information, or trade secrets. Note the main risks and how these will be managed. Also note whether any institutional data security policies are in place.</li><li>Identify any formal standards that you will comply with, e.g., ISO 27001. See the DCC Briefing Paper on Information Security Management -&nbsp;<a href=\"http://www.dcc.ac.uk/resources/briefing-papers/standards-watch-papers/information-security-management-iso-27000-iso-27k-s\">ISO 27000</a>&nbsp;and UK Data Service guidance on&nbsp;<a href=\"https://www.ukdataservice.ac.uk/manage-data/store/security\">data security</a>.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 2,
+      "name": "Preservation",
+      "slug": "preservation",
+      "description": "<ul><li>Outline the plans for data sharing and preservation - how long will the data be retained and where will it be archived? Will additional resources be needed to prepare data for deposit or meet any charges from data repositories?</li><li>See the DCC guide:&nbsp;<a href=\"http://www.dcc.ac.uk/resources/how-guides/appraise-select-data\">How to appraise and select research data for curation</a>&nbsp;or DataONE Best Practices:&nbsp;<a href=\"https://dataoneorg.github.io/Education/bestpractices/decide-what-data\">Identifying data with long-term value</a>.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 3,
+      "name": "Data collection",
+      "slug": "data-collection",
+      "description": "<ul class=\"ul1\"><li class=\"li1\"><span class=\"s2\">Outline how the data will be collected and processed. This should cover relevant standards or methods, quality assurance, and data organization.</span></li><li class=\"li1\"><span class=\"s2\">Indicate how the data will be organized during the project, mentioning, e.g., naming conventions, version control, and folder structures. Consistent, well-ordered research data will be easier to find, understand, and reuse.</span></li><li class=\"li1\"><span class=\"s2\">Explain how the consistency and quality of data collection will be controlled and documented. This may include processes such as calibration, repeat samples or measurements, standardized data capture, data entry validation, peer review of data, or representation with controlled vocabularies.</span></li><li class=\"li1\"><span class=\"s2\">See the DataOne Best Practices for&nbsp;<a href=\"https://dataoneorg.github.io/Education//bestpractices/ensure-basic-quality\"><span class=\"s3\">data quality</span></a>.</span></li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 4,
+      "name": "Data format",
+      "slug": "data-format",
+      "description": "<ul><li>Clearly note what format(s) your data will be in, e.g., plain text (.txt), comma-separated values (.csv), geo-referenced TIFF (.tif, .tfw).</li><li>Explain why you have chosen certain formats. Decisions may be based on staff expertise, a preference for open formats, the standards accepted by data centers or widespread usage within a given community.</li><li>Using standardized, interchangeable, or open formats ensures the long-term usability of data; these are recommended for sharing and archiving.</li><li>See UK Data Service guidance on&nbsp;<a href=\"https://www.ukdataservice.ac.uk/manage-data/format/recommended-formats\" target=\"_blank\" rel=\"noopener\">recommended formats</a>&nbsp;or DataONE Best Practices for&nbsp;<a href=\"https://dataoneorg.github.io/Education/bestpractices/tag#format\" target=\"_blank\" rel=\"noopener\">file formats</a>.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 5,
+      "name": "Roles & responsibilities",
+      "slug": "roles-responsibilities",
+      "description": "<ul><li>Outline the roles and responsibilities for all activities, e.g., data capture, metadata production, data quality, storage and backup, data archiving, and data sharing. Individuals should be named where possible.</li><li>For collaborative projects you should explain the coordination of data management responsibilities across partners.</li><li>See UK Data Service guidance on&nbsp;<a href=\"https://www.ukdataservice.ac.uk/manage-data/plan/roles-and-responsibilities\">data management roles and responsibilities</a>&nbsp;or DataONE Best Practices:&nbsp;<a href=\"https://dataoneorg.github.io/Education/bestpractices/define-roles-and\">Define roles and assign responsibilities for data management</a>.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 6,
+      "name": "Ethics & privacy",
+      "slug": "ethics-privacy",
+      "description": "<ul><li>Investigators carrying out research involving human participants should request consent to preserve and share the data. Do not just ask for permission to use the data in your study or make unnecessary promises to delete it at the end.</li><li>Consider how you will protect the identity of participants, e.g., via anonymization or using managed access procedures.</li><li>Ethical issues may affect how you store and transfer data, who can see/use it, and how long it is kept. You should demonstrate that you are aware of this and have planned accordingly.</li><li>See&nbsp;<a href=\"http://www.icpsr.umich.edu/icpsrweb/content/datamanagement/confidentiality/index.html\">ICPSR approach to confidentiality</a>&nbsp;and Health Insurance Portability and Accountability Act&nbsp;<a href=\"https://privacyruleandresearch.nih.gov/\">(HIPAA) regulations for health research</a>.</li><li>If you are collecting Traditional Knowledge as part of the project, it is advisable to apply <a href=\"https://www.localcontexts.org\" target=\"_blank\" rel=\"noopener\">TK Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.&nbsp;</li><li>If you are generating data derived from Indigenous lands and/or waters, it is advisable to use <a href=\"https://www.localcontexts.org\" target=\"_blank\" rel=\"noopener\">BC Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 7,
+      "name": "Intellectual property rights",
+      "slug": "intellectual-property-rights",
+      "description": "<ul><li>State who will own the copyright and IPR of any existing data as well as new data that you will generate. For multi-partner projects, IPR ownership should be covered in the consortium agreement.</li><li>Outline any restrictions needed on data sharing, e.g., to protect proprietary or patentable data.</li><li>Explain how the data will be licensed for reuse. See the DCC guide on&nbsp;<a href=\"http://www.dcc.ac.uk/resources/how-guides/license-research-data\">How to license research data</a>&nbsp;and EUDAT&rsquo;s&nbsp;<a href=\"https://ufal.github.io/public-license-selector/\">data and software licensing wizard</a>.</li><li>If you are collecting Traditional Knowledge as part of the project it is advisable to apply <a href=\"https://www.localcontexts.org\" target=\"_blank\" rel=\"noopener\">TK Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.&nbsp;</li><li>If you are generating data derived from Indigenous lands and/or waters, it is advisable to use&nbsp;<a href=\"https://www.localcontexts.org\" target=\"_blank\" rel=\"noopener\">BC Notices</a> and engage with communities around the application of Labels to support ongoing connection to inform future data management.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 8,
+      "name": "Related policies",
+      "slug": "related-policies",
+      "description": "<ul><li>Consider whether there are any existing procedures that you can base your approach on. If your group/department has local guidelines that you work to, point to them here.</li><li>List any other relevant funder, institutional, departmental, or group policies on data management, data sharing, and data security.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 9,
+      "name": "Budget",
+      "slug": "budget",
+      "description": "<ul><li>Carefully consider and justify any resources needed to deliver the plan. These may include storage costs, hardware, staff time, costs of preparing data for deposit, and repository charges.</li><li>Outline any relevant technical expertise, support, and training that is likely to be required and how it will be acquired.</li><li>If you are not depositing in a data repository, ensure you have appropriate resources and systems in place to share and preserve the data. See UK Data Service guidance on&nbsp;<a href=\"https://www.ukdataservice.ac.uk/manage-data/plan/costing\">costing data management</a>.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 10,
+      "name": "Data repository",
+      "slug": "data-repository",
+      "description": "<ul><li>Where will the data be deposited? If you do not propose to use an established repository, the data management plan should demonstrate that the data can be curated effectively beyond the lifetime of the grant.</li><li>It helps to show that you have consulted with the repository to understand their policies and procedures, including any metadata standards, and costs involved.</li><li>An international list of data repositories is available via&nbsp;<a href=\"http://www.re3data.org/\">re3data</a>&nbsp;and some universities or publishers provide lists of recommendations, e.g.,&nbsp;<a href=\"http://journals.plos.org/plosone/s/data-availability#loc-recommended-repositories\">PLOS ONE recommended repositories</a>.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 11,
+      "name": "Data sharing",
+      "slug": "data-sharing",
+      "description": "<ul><li>How will you share the data, e.g., deposit in a data repository, use a secure data service, handle data requests directly, or use another mechanism? The methods used will depend on various factors such as the type, size, complexity, and sensitivity of the data.</li><li>When will you make the data available? Research funders expect timely release. They typically allow embargoes but not prolonged exclusive use.</li><li>Who will be able to use your data? If you need to restrict access to certain communities or apply data sharing agreements, explain why.</li><li>Consider strategies to minimize restrictions on sharing. These may include anonymizing or aggregating data, gaining participant consent for data sharing, gaining copyright permissions, and agreeing a limited embargo period.</li><li>How might your data be reused in other contexts? Where there is potential for reuse, you should use standards and formats that facilitate this, and ensure that appropriate metadata is available online so your data can be discovered. Persistent identifiers should be applied so people can reliably and efficiently find your data. They also help you to track citations and reuse.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 12,
+      "name": "Metadata & documentation",
+      "slug": "metadata-documentation",
+      "description": "<ul><li>What metadata will be provided to help others identify and discover the data?</li><li>Researchers are strongly encouraged to use community metadata standards where these are in place. The Research Data Alliance offers a&nbsp;<a href=\"http://rd-alliance.github.io/metadata-directory/\">Directory of Metadata Standards</a>. Data repositories may also provide guidance about appropriate metadata standards.</li><li>Consider what other documentation is needed to enable reuse. This may include information on the methodology used to collect the data, analytical and procedural information, definitions of variables, units of measurement, any assumptions made, the format and file type of the data and software used to collect and/or process the data.</li><li>Consider how you will capture this information and where it will be recorded, e.g., in a database with links to each item, in a \"readme\" text file, in file headers, etc.</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 13,
+      "name": "Data volume",
+      "slug": "data-volume",
+      "description": "<ul><li>Note what volume of data you will create in MB/GB/TB. Indicate the proportions of raw data, processed data, and other secondary outputs (e.g., reports).</li><li>Consider the implications of data volumes in terms of storage, access, and preservation. Do you need to include additional costs?</li><li>Consider whether the scale of the data will pose challenges when sharing or transferring data between sites; if so, how will you address these challenges?</li></ul>"
+    },
+    {
+      "__typename": "Tag",
+      "id": 14,
+      "name": "Data description",
+      "slug": "data-description",
+      "description": "<ul><li>Give a summary of the data you will collect or create, noting the content, coverage and data type, e.g., tabular data, survey data, experimental measurements, models, software, audiovisual data, physical samples, etc.</li><li>Consider how your data could complement and integrate with existing data, or whether there are any existing data or methods that you could reuse.</li><li>Indicate which data are of long-term value and should be shared and/or preserved.</li><li>If purchasing or reusing existing data, explain how issues such as copyright and IPR have been addressed. You should aim to minimize any restrictions on the reuse (and subsequent sharing) of third-party data.</li></ul>"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/__tests__/page.spec.tsx b/app/[locale]/admin/guidance/__tests__/page.spec.tsx
index 25cc45e1e..7914f717d 100644
--- a/app/[locale]/admin/guidance/__tests__/page.spec.tsx
+++ b/app/[locale]/admin/guidance/__tests__/page.spec.tsx
@@ -1,10 +1,26 @@
 import React from "react";
 import { render, screen, waitFor } from "@testing-library/react";
 import "@testing-library/jest-dom";
-import { axe, toHaveNoViolations } from "jest-axe";
+import { MockedProvider } from "@apollo/client/testing";
+import { useFormatter, useTranslations } from "next-intl";
+import {
+  MeDocument,
+  TagsDocument,
+  GuidanceGroupsDocument
+} from "@/generated/graphql";
 
+import { axe, toHaveNoViolations } from "jest-axe";
+import mockMeData from "../__mocks__/mockMeData.json";
+import mockTagsData from "../__mocks__/mockTagsData.json";
+import mockGuidanceGroupsData from "../__mocks__/mockGuidanceGroupsData.json";
 import GuidancePage from "../page";
 
+// Mock next-intl hooks
+jest.mock("next-intl", () => ({
+  useFormatter: jest.fn(),
+  useTranslations: jest.fn(),
+}));
+
 // Mock Next.js navigation
 jest.mock("next/navigation", () => ({
   useRouter: () => ({
@@ -17,84 +33,187 @@ jest.mock("next/navigation", () => ({
 
 expect.extend(toHaveNoViolations);
 
+const mocks = [
+  {
+    request: {
+      query: MeDocument,
+    },
+    result: {
+      data: mockMeData,
+    },
+  },
+  {
+    request: {
+      query: TagsDocument,
+    },
+    result: {
+      data: mockTagsData,
+    },
+  },
+  {
+    request: {
+      query: GuidanceGroupsDocument,
+      variables: {
+        affiliationId: "https://ror.org/03yrm5c12",
+      }
+    },
+    result: {
+      data: mockGuidanceGroupsData,
+    },
+  },
+]
 describe("GuidancePage", () => {
   beforeEach(() => {
     window.scrollTo = jest.fn();
+    (useFormatter as jest.Mock).mockReturnValue({
+      dateTime: jest.fn((date) => date.toLocaleDateString()),
+    });
+
+    (useTranslations as jest.Mock).mockImplementation((namespace) => {
+      return (key: string) => `${namespace}.${key}`;
+    });
   });
 
-  afterEach(() => {
-    jest.clearAllMocks();
+  it("should render the create group button", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText("Guidance.pages.index.createGroup")).toBeInTheDocument();
+    });
   });
 
-  it("should render the create group button", () => {
-    render(<GuidancePage />);
+  it("should initially render loading message", () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    expect(screen.getByText("pages.index.createGroup")).toBeInTheDocument();
+    expect(screen.getByText("Loading...")).toBeInTheDocument();
   });
 
-  it("should render guidance groups list", () => {
-    render(<GuidancePage />);
+  it("should render guidance groups list", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const listContainer = screen.getByLabelText("Guidance groups list");
-    expect(listContainer).toBeInTheDocument();
-    expect(listContainer).toHaveAttribute("role", "list");
+    await waitFor(() => {
+      const listContainer = screen.getByLabelText("Guidance groups list");
+      expect(listContainer).toBeInTheDocument();
+      expect(listContainer.tagName).toBe('UL');
+
+    });
   });
 
-  it("should render guidance group items", () => {
-    render(<GuidancePage />);
+  it("should render guidance group items", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const listItems = document.querySelectorAll('[role="listitem"], .guidance-content');
-    expect(listItems.length).toBeGreaterThan(0);
+    await waitFor(() => {
+      const listItems = document.querySelectorAll('.guidanceContent');
+      expect(listItems.length).toBeGreaterThan(0);
+    })
   });
 
-  it("should render guidance group metadata", () => {
-    render(<GuidancePage />);
+  it("should render guidance group metadata", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const lastRevisedElements = screen.getAllByText(/lastRevisedBy/);
-    const lastUpdatedElements = screen.getAllByText(/lastUpdated/);
-    expect(lastRevisedElements.length).toBeGreaterThan(0);
-    expect(lastUpdatedElements.length).toBeGreaterThan(0);
+    await waitFor(() => {
+      const lastUpdatedElement = screen.getAllByText(/Global\.lastUpdated\s*:\s*11-25-2025/i);
+      const statusElement = screen.getAllByText(/Guidance\.status\.status\s*:\s*Guidance.status.unpublishedChanges/i);
+      const guidanceTextCountElement = screen.getByText(/10\s*\/\s*14\s*Tags with Guidance/i);
+      expect(lastUpdatedElement.length).toBeGreaterThan(0);
+      expect(statusElement.length).toBeGreaterThan(0);
+      expect(guidanceTextCountElement).toBeInTheDocument();
+    });
   });
 
-  it("should render guidance group descriptions", () => {
-    render(<GuidancePage />);
+  it("should render guidance group descriptions", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const descriptions = document.querySelectorAll(".description");
-    expect(descriptions.length).toBeGreaterThan(0);
+    await waitFor(() => {
+      const descriptions = document.querySelectorAll(".description");
+      expect(descriptions.length).toBeGreaterThan(0);
+    });
   });
 
-  it("should render guidance group status information", () => {
-    render(<GuidancePage />);
+  it("should render guidance group status information", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const publishedElements = screen.getAllByText(/status\.status\s*:\s*Published/);
-    const draftElements = screen.getAllByText(/status\.status\s*:\s*Draft/);
-    expect(publishedElements.length).toBeGreaterThan(0);
-    expect(draftElements.length).toBeGreaterThan(0);
+    await waitFor(() => {
+      const publishedElements = screen.getAllByText(/Guidance\.status\.status\s*:\s*Guidance.status.published/);
+      const draftElements = screen.getAllByText(/Guidance\.status\.status\s*:\s*Guidance.status.draft/);
+      expect(publishedElements.length).toBeGreaterThan(0);
+      expect(draftElements.length).toBeGreaterThan(0);
+    });
   });
 
-  it("should render multiple guidance groups", () => {
-    render(<GuidancePage />);
+  it("should render multiple guidance groups", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const guidanceItems = document.querySelectorAll(".guidance-list > *");
-    expect(guidanceItems.length).toBeGreaterThan(1);
+    await waitFor(() => {
+      const guidanceItems = document.querySelectorAll(".guidanceList > *");
+      expect(guidanceItems.length).toBeGreaterThan(1);
+    })
   });
 
-  it("should have guidance-specific structure", () => {
-    render(<GuidancePage />);
+  it("should have guidance-specific structure", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const guidanceList = document.querySelector(".guidance-list");
-    expect(guidanceList).toBeInTheDocument();
+    await waitFor(() => {
+      const guidanceList = document.querySelector(".guidanceList");
+      expect(guidanceList).toBeInTheDocument();
+    });
   });
 
-  it("should render author information in metadata", () => {
-    render(<GuidancePage />);
+  it("should render author information in metadata", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
-    const metadata = document.querySelectorAll(".metadata");
-    expect(metadata.length).toBeGreaterThan(0);
+    await waitFor(() => {
+      const metadata = document.querySelectorAll(".metadata");
+      expect(metadata.length).toBeGreaterThan(0);
+    });
   });
 
   it("should pass accessibility tests", async () => {
-    const { container } = render(<GuidancePage />);
+    const { container } = render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidancePage />
+      </MockedProvider>,
+    );
 
     await waitFor(() => {
       expect(screen.getByLabelText("Guidance groups list")).toBeInTheDocument();
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/__mocks__/mockGuidanceByGroupData.json b/app/[locale]/admin/guidance/groups/[groupId]/__mocks__/mockGuidanceByGroupData.json
new file mode 100644
index 000000000..e3d03f102
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/__mocks__/mockGuidanceByGroupData.json
@@ -0,0 +1,44 @@
+{
+  "guidanceByGroup": [
+    {
+      "__typename": "Guidance",
+      "modifiedBy": {
+        "__typename": "User",
+        "givenName": "Super",
+        "surName": "Admin",
+        "id": 1
+      },
+      "guidanceText": "<p>This is the guidance for storage &amp; security</p>",
+      "id": 976,
+      "tagId": 1,
+      "errors": {
+        "__typename": "GuidanceErrors",
+        "general": null,
+        "tagId": null,
+        "guidanceText": null,
+        "guidanceGroupId": null
+      },
+      "modified": "2025-12-01 19:58:23"
+    },
+    {
+      "__typename": "Guidance",
+      "modifiedBy": {
+        "__typename": "User",
+        "givenName": "Super",
+        "surName": "Admin",
+        "id": 1
+      },
+      "guidanceText": "<p>This is the guidance for Preservation</p>",
+      "id": 977,
+      "tagId": 2,
+      "errors": {
+        "__typename": "GuidanceErrors",
+        "general": null,
+        "tagId": null,
+        "guidanceText": null,
+        "guidanceGroupId": null
+      },
+      "modified": "2025-12-01 20:00:36"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/__mocks__/mockGuidanceGroupData.json b/app/[locale]/admin/guidance/groups/[groupId]/__mocks__/mockGuidanceGroupData.json
new file mode 100644
index 000000000..723e88d83
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/__mocks__/mockGuidanceGroupData.json
@@ -0,0 +1,41 @@
+{
+  "guidanceGroup": {
+    "__typename": "GuidanceGroup",
+    "id": 2398,
+    "name": "CDL Guidance Group",
+    "description": "The guidance group for CDL",
+    "bestPractice": false,
+    "latestPublishedVersion": "2",
+    "latestPublishedDate": "2025-12-01 20:00:45",
+    "isDirty": false,
+    "guidance": [
+      {
+        "__typename": "Guidance",
+        "guidanceText": "<p>This is the guidance for storage &amp; security</p>",
+        "id": 976,
+        "tagId": 1
+      },
+      {
+        "__typename": "Guidance",
+        "guidanceText": "<p>This is the guidance for Preservation</p>",
+        "id": 977,
+        "tagId": 2
+      }
+    ],
+    "versionedGuidanceGroup": [
+      {
+        "__typename": "VersionedGuidanceGroup",
+        "active": true,
+        "id": 213,
+        "version": 2
+      },
+      {
+        "__typename": "VersionedGuidanceGroup",
+        "active": false,
+        "id": 212,
+        "version": 1
+      }
+    ],
+    "optionalSubset": false
+  }
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/__tests__/page.spec.tsx b/app/[locale]/admin/guidance/groups/[groupId]/__tests__/page.spec.tsx
index 5bb62c461..a17ee21c5 100644
--- a/app/[locale]/admin/guidance/groups/[groupId]/__tests__/page.spec.tsx
+++ b/app/[locale]/admin/guidance/groups/[groupId]/__tests__/page.spec.tsx
@@ -1,104 +1,907 @@
 import React from "react";
-import { render, screen, waitFor } from "@testing-library/react";
+import {
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+  waitForElementToBeRemoved,
+  within
+} from "@testing-library/react";
 import "@testing-library/jest-dom";
-import { axe, toHaveNoViolations } from "jest-axe";
+import { MockedProvider } from "@apollo/client/testing";
+import { useFormatter, useTranslations } from "next-intl";
+import { useParams, useRouter } from 'next/navigation';
+import logECS from '@/utils/clientLogger';
+import {
+  MeDocument,
+  TagsDocument,
+  GuidanceGroupDocument,
+  GuidanceByGroupDocument,
+} from "@/generated/graphql";
+
+import {
+  addGuidanceTextAction,
+  publishGuidanceGroupAction,
+  unPublishGuidanceGroupAction,
+  updateGuidanceAction
+} from '../actions';
 
+import { axe, toHaveNoViolations } from "jest-axe";
+import { useToast } from '@/context/ToastContext';
+import { mockScrollIntoView } from '@/__mocks__/common';
+import mockMeData from "../../../__mocks__/mockMeData.json";
+import mockTagsData from "../../../__mocks__/mockTagsData.json";
+import mockGuidanceByGroupData from "../__mocks__/mockGuidanceByGroupData.json";
+import mockGuidanceGroupData from "../__mocks__/mockGuidanceGroupData.json";
 import GuidanceGroupIndexPage from "../page";
 
-// Mock Next.js navigation
-jest.mock("next/navigation", () => ({
-  useParams: () => ({
-    groupId: "1",
-  }),
-  useRouter: () => ({
-    back: jest.fn(),
-    push: jest.fn(),
-    replace: jest.fn(),
-    refresh: jest.fn(),
-  }),
+// Mock TinyMCEEditor to simplify content updates in tests
+jest.mock('@/components/TinyMCEEditor', () => {
+  const TinyMCEEditorMock = ({ content, setContent, id }: { content: string; setContent: (v: string) => void; id: string }) => (
+    <textarea
+      data-testid={`editor-${id}`}
+      aria-label={`editor-${id}`}
+      value={content}
+      onChange={(e) => setContent(e.target.value)}
+    />
+  );
+  TinyMCEEditorMock.displayName = 'TinyMCEEditorMock';
+  return TinyMCEEditorMock;
+});
+
+jest.mock('../actions/index', () => ({
+  addGuidanceTextAction: jest.fn(),
+  publishGuidanceGroupAction: jest.fn(),
+  unPublishGuidanceGroupAction: jest.fn(),
+  updateGuidanceAction: jest.fn(),
 }));
 
+// Mock next-intl hooks
+jest.mock("next-intl", () => ({
+  useFormatter: jest.fn(),
+  useTranslations: jest.fn(),
+}));
+
+jest.mock('next/navigation', () => ({
+  useRouter: jest.fn(),
+  useParams: jest.fn()
+}));
+
+const mockRouter = {
+  push: jest.fn(),
+};
+
+const mockToast = {
+  add: jest.fn(),
+};
+
+
 expect.extend(toHaveNoViolations);
 
+const mocks = [
+  {
+    request: {
+      query: MeDocument,
+    },
+    result: {
+      data: mockMeData,
+    },
+  },
+  {
+    request: {
+      query: TagsDocument,
+    },
+    result: {
+      data: mockTagsData,
+      loading: false,
+    },
+  },
+  // GuidanceGroup query is executed with fetchPolicy 'cache-and-network', so we need two mocks
+  {
+    request: {
+      query: GuidanceGroupDocument,
+      variables: {
+        guidanceGroupId: 2397,
+      }
+    },
+    result: {
+      data: mockGuidanceGroupData
+    },
+  },
+  {
+    request: {
+      query: GuidanceGroupDocument,
+      variables: {
+        guidanceGroupId: 2397,
+      }
+    },
+    result: {
+      data: mockGuidanceGroupData
+    },
+  },
+  // GuidanceByGroup also uses 'cache-and-network', supply two mocks
+  {
+    request: {
+      query: GuidanceByGroupDocument,
+      variables: {
+        guidanceGroupId: 2397,
+      }
+    },
+    result: {
+      data: mockGuidanceByGroupData,
+      loading: false,
+    },
+  },
+  {
+    request: {
+      query: GuidanceByGroupDocument,
+      variables: {
+        guidanceGroupId: 2397,
+      }
+    },
+    result: {
+      data: mockGuidanceByGroupData,
+      loading: false,
+    },
+  }
+]
+
+// Build a variant with active: false on the latest version
+const guidanceGroupInactive = JSON.parse(JSON.stringify(mockGuidanceGroupData));
+guidanceGroupInactive.guidanceGroup.versionedGuidanceGroup[0].active = false;
+
+// Provide two mocks for cache-and-network
+const inactiveGroupMocks = [
+  {
+    request: {
+      query: GuidanceGroupDocument,
+      variables: { guidanceGroupId: 2397 }, // match your useParams for this test
+    },
+    result: { data: guidanceGroupInactive },
+  },
+  {
+    request: {
+      query: GuidanceGroupDocument,
+      variables: { guidanceGroupId: 2397 },
+    },
+    result: { data: guidanceGroupInactive },
+  },
+  {
+    request: {
+      query: MeDocument,
+    },
+    result: {
+      data: mockMeData,
+    },
+  },
+  {
+    request: {
+      query: TagsDocument,
+    },
+    result: {
+      data: mockTagsData,
+      loading: false,
+    },
+  },
+  {
+    request: {
+      query: GuidanceByGroupDocument,
+      variables: {
+        guidanceGroupId: 2397,
+      }
+    },
+    result: {
+      data: mockGuidanceByGroupData,
+      loading: false,
+    },
+  },
+  {
+    request: {
+      query: GuidanceByGroupDocument,
+      variables: {
+        guidanceGroupId: 2397,
+      }
+    },
+    result: {
+      data: mockGuidanceByGroupData,
+      loading: false,
+    },
+  }
+];
+
 describe("GuidanceGroupIndexPage", () => {
   beforeEach(() => {
     window.scrollTo = jest.fn();
+    HTMLElement.prototype.scrollIntoView = mockScrollIntoView;
+
+    const mockUseParams = useParams as jest.Mock;
+    // Mock the return value of useParams
+    mockUseParams.mockReturnValue({ groupId: 2397 });
+
+    // Mock Toast
+    (useToast as jest.Mock).mockReturnValue(mockToast);
+
+    (useRouter as jest.Mock).mockReturnValue(mockRouter);
+
+    (useFormatter as jest.Mock).mockReturnValue({
+      dateTime: jest.fn((date) => date.toLocaleDateString()),
+    });
+
+    (useTranslations as jest.Mock).mockImplementation((namespace) => {
+      return (key: string) => `${namespace}.${key}`;
+    });
   });
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
-  it("should render action buttons", () => {
-    render(<GuidanceGroupIndexPage />);
+  it("should initially render loading spinner", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText("Global.messaging.loading")).toBeInTheDocument();
+    });
+  });
+
+
+  it("should render guidance text fields", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
+
+    await waitFor(() => {
+      // Check for all tags
+      expect(screen.getByRole("heading", { name: "Storage & security" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Preservation" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Data collection" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Data format" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Roles & responsibilities" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Ethics & privacy" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Intellectual property rights" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Related policies" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Budget" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Data repository" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Data sharing" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Metadata & documentation" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Data volume" })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Data description" })).toBeInTheDocument();
+
+      //Check for textArea 
+      // Check for 14 info icon buttons
+      expect(screen.getAllByRole("button", { name: "Click for more info" })).toHaveLength(14);
+
+      // Check for sidebar
+      const sidebar = screen.getByTestId("sidebar-panel");
+      const inSidebar = within(sidebar);
+      const publishBtn = inSidebar.getByRole("button", { name: "Global.buttons.publish" });
+      expect(publishBtn).toBeInTheDocument();
+      const publicationStatus = inSidebar.getByText("Guidance.status.publicationStatus");
+      expect(publicationStatus).toBeInTheDocument();
+      const status = inSidebar.getByText("Guidance.status.published");
+      expect(status).toBeInTheDocument();
+      const lastPublished = inSidebar.getByText("Guidance.status.lastPublished");
+      expect(lastPublished).toBeInTheDocument();
+      const lastPublishedDate = inSidebar.getByText("12-1-2025");
+      expect(lastPublishedDate).toBeInTheDocument();
+    });
+  });
+
+  it('should update existing guidance text locally when editor changes', async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    // Editor id pattern: content-<tagId>; we use tag id 1 which has existing guidance
+    const editor = screen.getByTestId('editor-content-1');
+    expect(editor).toHaveValue('<p>This is the guidance for storage &amp; security</p>');
+
+    fireEvent.change(editor, { target: { value: 'UPDATED TEXT FOR TAG 1' } });
+
+    // Value should reflect updated local state
+    expect(editor).toHaveValue('UPDATED TEXT FOR TAG 1');
+
+    // No server action called yet (updateGuidanceAction invoked only on save)
+    expect(updateGuidanceAction).not.toHaveBeenCalled();
+    expect(addGuidanceTextAction).not.toHaveBeenCalled();
+  });
+
+  it('should create temporary guidance for tag without guidance and calls addGuidanceTextAction on save', async () => {
+    (addGuidanceTextAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: { id: 999, errors: null },
+      redirect: undefined,
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    // Tag id 14 (Data description) has no guidance in mockGuidanceByGroupData
+    const editor = screen.getByTestId('editor-content-14');
+    expect(editor).toHaveValue(''); // starts empty
+
+    fireEvent.change(editor, { target: { value: 'New guidance for Data description' } });
+    expect(editor).toHaveValue('New guidance for Data description');
+
+    // Find save buttons; click the one corresponding to tag 14.
+    // We locate heading first then within its card look for button
+    const guidanceCard = editor.closest('div')?.parentElement; // textarea wrapper -> its parent is the card section
+    const saveBtn = within(guidanceCard as HTMLElement).getByRole('button', { name: 'Global.buttons.save' });
+    fireEvent.click(saveBtn);
+
+    await waitFor(() => {
+      expect(addGuidanceTextAction).toHaveBeenCalledTimes(1);
+      expect(addGuidanceTextAction).toHaveBeenCalledWith({
+        guidanceGroupId: 2397,
+        guidanceText: 'New guidance for Data description',
+        tagId: 14
+      });
+    });
+  });
+
+  it('should redirect if addGuidanceTextAction response includes a redirect', async () => {
+    (addGuidanceTextAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: { id: 999, errors: null },
+      redirect: "/en-US/admin/guidance/groups/2397/some-redirect-page",
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    // Tag id 14 (Data description) has no guidance in mockGuidanceByGroupData
+    const editor = screen.getByTestId('editor-content-14');
+    expect(editor).toHaveValue(''); // starts empty
+
+    fireEvent.change(editor, { target: { value: 'New guidance for Data description' } });
+    expect(editor).toHaveValue('New guidance for Data description');
+
+    // Find save buttons; click the one corresponding to tag 14.
+    // We locate heading first then within its card look for button
+    const guidanceCard = editor.closest('div')?.parentElement; // textarea wrapper -> its parent is the card section
+    const saveBtn = within(guidanceCard as HTMLElement).getByRole('button', { name: 'Global.buttons.save' });
+    fireEvent.click(saveBtn);
+
+    await waitFor(() => {
+      expect(mockRouter.push).not.toHaveBeenCalledWith('/en-US/admin/guidance/groups/2397/some-redirect-page')
+    });
+  });
+
+  it('should display error if addGuidanceTextAction returns field-level errors', async () => {
+    (addGuidanceTextAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 999,
+        errors: {
+          general: "There was a general error"
+        },
+      },
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    // Tag id 14 (Data description) has no guidance in mockGuidanceByGroupData
+    const editor = screen.getByTestId('editor-content-14');
+    expect(editor).toHaveValue(''); // starts empty
+
+    fireEvent.change(editor, { target: { value: 'New guidance for Data description' } });
+    expect(editor).toHaveValue('New guidance for Data description');
+
+    // Find save buttons; click the one corresponding to tag 14.
+    // We locate heading first then within its card look for button
+    const guidanceCard = editor.closest('div')?.parentElement; // textarea wrapper -> its parent is the card section
+    const saveBtn = within(guidanceCard as HTMLElement).getByRole('button', { name: 'Global.buttons.save' });
+    fireEvent.click(saveBtn);
+
+    await waitFor(() => {
+      expect(screen.getByText('There was a general error')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'adding Guidance text',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/2397' },
+        })
+      )
+    });
+  });
+
+  it('should update existing guidance via updateGuidanceAction and shows success toast', async () => {
+    (updateGuidanceAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: { id: 1, errors: null },
+      redirect: undefined,
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    // Tag id 1 has existing guidance in mockGuidanceByGroupData
+    const editor = screen.getByTestId('editor-content-1');
+    fireEvent.change(editor, { target: { value: 'Updated text for Storage & security' } });
+
+    // Click Save within the corresponding card
+    const guidanceCard = editor.closest('div')?.parentElement; // textarea wrapper -> card section
+    const saveBtn = within(guidanceCard as HTMLElement).getByRole('button', { name: 'Global.buttons.save' });
+    fireEvent.click(saveBtn);
+
+    await waitFor(() => {
+      expect(updateGuidanceAction).toHaveBeenCalledTimes(1);
+      expect(updateGuidanceAction).toHaveBeenCalledWith({
+        guidanceId: 976,
+        guidanceText: 'Updated text for Storage & security',
+        tagId: 1
+      });
+
+      // Success toast
+      expect(mockToast.add).toHaveBeenCalledWith('Guidance.messages.success.guidanceTextUpdated', { type: 'success' });
+    });
+  });
+
+  it('should redirect if response to updateGuidanceAction includes a redirect', async () => {
+    (updateGuidanceAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: { id: 1, errors: null },
+      redirect: "/en-US/admin/guidance/groups/2397/some-redirect-page",
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
 
-    expect(screen.getByText("pages.groupIndex.editGroup")).toBeInTheDocument();
-    expect(screen.getByText("pages.groupIndex.createText")).toBeInTheDocument();
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    // Tag id 1 has existing guidance in mockGuidanceByGroupData
+    const editor = screen.getByTestId('editor-content-1');
+    fireEvent.change(editor, { target: { value: 'Updated text for Storage & security' } });
+
+    // Click Save within the corresponding card
+    const guidanceCard = editor.closest('div')?.parentElement; // textarea wrapper -> card section
+    const saveBtn = within(guidanceCard as HTMLElement).getByRole('button', { name: 'Global.buttons.save' });
+    fireEvent.click(saveBtn);
+
+
+    await waitFor(() => {
+      expect(mockRouter.push).not.toHaveBeenCalledWith('/en-US/admin/guidance/groups/2397/some-redirect-page')
+    });
   });
 
-  it("should render guidance texts list", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should display error message whenupdateGuidanceAction returns field-level', async () => {
+    (updateGuidanceAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 1,
+        errors: {
+          general: "There was a general error"
+        }
+      },
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    // Tag id 1 has existing guidance in mockGuidanceByGroupData
+    const editor = screen.getByTestId('editor-content-1');
+    fireEvent.change(editor, { target: { value: 'Updated text for Storage & security' } });
 
-    const listContainer = screen.getByLabelText("Guidance texts list");
-    expect(listContainer).toBeInTheDocument();
-    expect(listContainer).toHaveAttribute("role", "list");
+    // Click Save within the corresponding card
+    const guidanceCard = editor.closest('div')?.parentElement; // textarea wrapper -> card section
+    const saveBtn = within(guidanceCard as HTMLElement).getByRole('button', { name: 'Global.buttons.save' });
+    fireEvent.click(saveBtn);
+
+    await waitFor(() => {
+      expect(screen.getByText('There was a general error')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'updating Guidance text',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/2397' },
+        })
+      )
+    });
   });
 
-  it("should render guidance text items", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should show inline errors and no toast when updateGuidanceAction returns GraphQL errors', async () => {
+    (updateGuidanceAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 1,
+        errors: {
+          general: 'Something went wrong',
+          guidanceGroupId: null,
+          guidanceText: null,
+          tagId: null,
+        },
+      },
+      redirect: undefined,
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
 
-    const textItems = document.querySelectorAll('.guidance-texts-list > *, [role="listitem"]');
-    expect(textItems.length).toBeGreaterThan(0);
+    await waitForElementToBeRemoved(() => screen.getByText('Global.messaging.loading'));
+
+    const editor = screen.getByTestId('editor-content-1');
+    fireEvent.change(editor, { target: { value: 'Attempt update with server error' } });
+
+    const guidanceCard = editor.closest('div')?.parentElement;
+    const saveBtn = within(guidanceCard as HTMLElement).getByRole('button', { name: 'Global.buttons.save' });
+    fireEvent.click(saveBtn);
+
+    await waitFor(() => {
+      expect(updateGuidanceAction).toHaveBeenCalledTimes(1);
+      expect(mockToast.add).not.toHaveBeenCalled();
+      // Inline error rendered
+      expect(screen.getByText('Something went wrong')).toBeInTheDocument();
+    });
   });
 
-  it("should render guidance text metadata", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should handle unpublishing of guidance group', async () => {
+    (unPublishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 2397,
+        name: "CDL Guidance Group",
+        errors: {
+          affiliationId: null,
+          bestPractice: null,
+          description: null,
+          general: null,
+          name: null
+        },
+      },
+    });
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    expect(screen.getAllByText(/lastRevisedBy/)).toHaveLength(3);
-    expect(screen.getAllByText(/lastUpdated/)).toHaveLength(3);
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const unPublishBtn = inSidebar.getByRole("button", { name: "Global.buttons.unpublish" });
+    fireEvent.click(unPublishBtn);
+
+    await waitFor(() => {
+      expect(mockToast.add).toHaveBeenCalledWith('Guidance.messages.success.guidanceGroupUnpublished', { type: 'success' });
+      expect(mockRouter.push).toHaveBeenCalledWith('/en-US/admin/guidance');
+      expect(unPublishGuidanceGroupAction).toHaveBeenCalledWith({
+        guidanceGroupId: 2398
+      });
+    });
   });
 
-  it("should render guidance text authors", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should handle redirect if response contains redirect', async () => {
+    (unPublishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 2397,
+        name: "CDL Guidance Group",
+        errors: {
+          affiliationId: null,
+          bestPractice: null,
+          description: null,
+          general: null,
+          name: null
+        },
+      },
+      redirect: '/en-US/admin/guidance/redirect-page'
+    });
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    const metadata = document.querySelectorAll(".metadata");
-    expect(metadata.length).toBeGreaterThan(0);
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const unPublishBtn = inSidebar.getByRole("button", { name: "Global.buttons.unpublish" });
+    fireEvent.click(unPublishBtn);
+
+    await waitFor(() => {
+      expect(mockRouter.push).not.toHaveBeenCalledWith('/en-US/admin/guidance/redirect-page')
+    });
   });
 
-  it("should render guidance text status information", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should handle handleUnpublish when response is not successful', async () => {
+    (unPublishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: false,
+      errors: ['Some error occurred'],
+    });
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    expect(screen.getAllByText(/status\.status\s*:\s*Published/)).toHaveLength(2);
-    expect(screen.getByText(/status\.status\s*:\s*Draft/)).toBeInTheDocument();
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const unPublishBtn = inSidebar.getByRole("button", { name: "Global.buttons.unpublish" });
+    fireEvent.click(unPublishBtn);
+
+    // Since guidanceGroupId is undefined, we expect an inline error message and no side effects
+    await waitFor(() => {
+      expect(screen.getByText('Some error occurred')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'Unpublishing Guidance Group',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/create' },
+        })
+      )
+    });
   });
 
-  it("should render multiple guidance texts", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should display error if field-level errors returned from handleUnpublish', async () => {
+    (unPublishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 2397,
+        name: "CDL Guidance Group",
+        errors: {
+          affiliationId: null,
+          bestPractice: null,
+          description: null,
+          general: "There was a general error",
+          name: null
+        },
+      },
+    });
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    const textItems = document.querySelectorAll(".guidance-texts-list > *");
-    expect(textItems.length).toBeGreaterThan(1);
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const unPublishBtn = inSidebar.getByRole("button", { name: "Global.buttons.unpublish" });
+    fireEvent.click(unPublishBtn);
+
+    await waitFor(() => {
+      expect(screen.getByText('There was a general error')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'Unpublishing Guidance Group',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/create' },
+        })
+      )
+    });
   });
 
-  it("should have group-specific structure", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should handle publishing of guidance group', async () => {
+    (publishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 2397,
+        name: "CDL Guidance Group",
+        errors: {
+          affiliationId: null,
+          bestPractice: null,
+          description: null,
+          general: null,
+          name: null
+        },
+      },
+    });
+    render(
+      <MockedProvider mocks={inactiveGroupMocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
+
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const publishBtn = inSidebar.getByRole("button", { name: "Global.buttons.publish" });
+    fireEvent.click(publishBtn);
 
-    const textsList = document.querySelector(".guidance-texts-list");
-    expect(textsList).toBeInTheDocument();
+    await waitFor(() => {
+      expect(mockToast.add).toHaveBeenCalledWith('Guidance.messages.success.guidanceGroupPublished', { type: 'success' });
+      expect(mockRouter.push).toHaveBeenCalledWith('/en-US/admin/guidance');
+      expect(publishGuidanceGroupAction).toHaveBeenCalledWith({
+        guidanceGroupId: 2398
+      });
+    });
+    // Button should be disabled for unpublish now
+    const unpublishBtn = inSidebar.getByRole("button", { name: "Global.buttons.unpublish" });
+    expect(unpublishBtn).toBeInTheDocument();
+    expect(unpublishBtn).toHaveAttribute("aria-disabled", "true");
+    expect(unpublishBtn).toHaveClass("buttonSmallDisabled", "secondary");
   });
 
-  it("should render date information", () => {
-    render(<GuidanceGroupIndexPage />);
+  it('should handle redirect if response from handlePublish contains redirect', async () => {
+    (publishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 2397,
+        name: "CDL Guidance Group",
+        errors: {
+          affiliationId: null,
+          bestPractice: null,
+          description: null,
+          general: null,
+          name: null
+        },
+      },
+      redirect: '/en-US/admin/guidance/redirect-page'
+    });
+    render(
+      <MockedProvider mocks={inactiveGroupMocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
+
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const publishBtn = inSidebar.getByRole("button", { name: "Global.buttons.publish" });
+    fireEvent.click(publishBtn);
 
-    const metadata = document.querySelectorAll(".metadata");
-    expect(metadata.length).toBeGreaterThan(0);
+    // Since guidanceGroupId is undefined, we expect an inline error message and no side effects
+    await waitFor(() => {
+      expect(mockRouter.push).not.toHaveBeenCalledWith('/en-US/admin/guidance/redirect-page')
+    });
   });
 
-  it("should pass accessibility tests", async () => {
-    const { container } = render(<GuidanceGroupIndexPage />);
+  it('should handle handlepublish when response is not successful', async () => {
+    (publishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: false,
+      errors: ['Some error occurred'],
+    });
+    render(
+      <MockedProvider mocks={inactiveGroupMocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const publishBtn = inSidebar.getByRole("button", { name: "Global.buttons.publish" });
+    fireEvent.click(publishBtn);
+
+    // Since guidanceGroupId is undefined, we expect an inline error message and no side effects
     await waitFor(() => {
-      expect(screen.getByLabelText("Guidance texts list")).toBeInTheDocument();
+      expect(screen.getByText('Some error occurred')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'publishing Guidance Group',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/create' },
+        })
+      )
     });
+  });
+
+  it('should display error if field-level errors returned from handlepublish', async () => {
+    (publishGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 2397,
+        name: "CDL Guidance Group",
+        errors: {
+          affiliationId: null,
+          bestPractice: null,
+          description: null,
+          general: "There was a general error",
+          name: null
+        },
+      },
+    });
+    render(
+      <MockedProvider mocks={inactiveGroupMocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
+
+    const sidebar = screen.getByTestId("sidebar-panel");
+    const inSidebar = within(sidebar);
+    const publishBtn = inSidebar.getByRole("button", { name: "Global.buttons.publish" });
+    fireEvent.click(publishBtn);
+
+
+    // Since guidanceGroupId is undefined, we expect an inline error message and no side effects
+    await waitFor(() => {
+      expect(screen.getByText('There was a general error')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'publishing Guidance Group',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/create' },
+        })
+      )
+    });
+  });
+
+  it("should pass accessibility tests", async () => {
+    const { container } = render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupIndexPage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
     const results = await axe(container);
     expect(results).toHaveNoViolations();
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/actions/addGuidanceTextAction.tsx b/app/[locale]/admin/guidance/groups/[groupId]/actions/addGuidanceTextAction.tsx
new file mode 100644
index 000000000..b58597f32
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/actions/addGuidanceTextAction.tsx
@@ -0,0 +1,28 @@
+"use server";
+
+import { executeGraphQLMutation } from "@/utils/server/graphqlServerActionHandler";
+import { ActionResponse } from "@/app/types";
+import { AddGuidanceDocument } from "@/generated/graphql";
+
+export async function addGuidanceTextAction({
+  guidanceGroupId,
+  guidanceText,
+  tagId
+}: {
+  guidanceGroupId: number;
+  guidanceText: string;
+  tagId: number;
+}): Promise<ActionResponse> {
+  // Execute the mutation using the shared handler
+  return await executeGraphQLMutation({
+    document: AddGuidanceDocument,
+    variables: {
+      input: {
+        guidanceGroupId,
+        guidanceText,
+        tagId
+      }
+    },
+    dataPath: "addGuidanceText"
+  });
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/actions/index.tsx b/app/[locale]/admin/guidance/groups/[groupId]/actions/index.tsx
new file mode 100644
index 000000000..5d49c1908
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/actions/index.tsx
@@ -0,0 +1,4 @@
+export { addGuidanceTextAction } from './addGuidanceTextAction';
+export { updateGuidanceAction } from './updateGuidanceAction';
+export { publishGuidanceGroupAction } from './publishGuidanceGroupAction';
+export { unPublishGuidanceGroupAction } from './unpublishGuidanceGroupAction';
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/actions/publishGuidanceGroupAction.tsx b/app/[locale]/admin/guidance/groups/[groupId]/actions/publishGuidanceGroupAction.tsx
new file mode 100644
index 000000000..7bacdcaeb
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/actions/publishGuidanceGroupAction.tsx
@@ -0,0 +1,20 @@
+"use server";
+
+import { executeGraphQLMutation } from "@/utils/server/graphqlServerActionHandler";
+import { ActionResponse } from "@/app/types";
+import { PublishGuidanceGroupDocument } from "@/generated/graphql";
+
+export async function publishGuidanceGroupAction({
+  guidanceGroupId
+}: {
+  guidanceGroupId: number;
+}): Promise<ActionResponse> {
+  // Execute the mutation using the shared handler
+  return await executeGraphQLMutation({
+    document: PublishGuidanceGroupDocument,
+    variables: {
+      guidanceGroupId
+    },
+    dataPath: "publishGuidanceGroup"
+  });
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/actions/unpublishGuidanceGroupAction.tsx b/app/[locale]/admin/guidance/groups/[groupId]/actions/unpublishGuidanceGroupAction.tsx
new file mode 100644
index 000000000..06c6ba6ee
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/actions/unpublishGuidanceGroupAction.tsx
@@ -0,0 +1,20 @@
+"use server";
+
+import { executeGraphQLMutation } from "@/utils/server/graphqlServerActionHandler";
+import { ActionResponse } from "@/app/types";
+import { UnpublishGuidanceGroupDocument } from "@/generated/graphql";
+
+export async function unPublishGuidanceGroupAction({
+  guidanceGroupId
+}: {
+  guidanceGroupId: number;
+}): Promise<ActionResponse> {
+  // Execute the mutation using the shared handler
+  return await executeGraphQLMutation({
+    document: UnpublishGuidanceGroupDocument,
+    variables: {
+      guidanceGroupId
+    },
+    dataPath: "unpublishGuidanceGroup"
+  });
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/actions/updateGuidanceAction.tsx b/app/[locale]/admin/guidance/groups/[groupId]/actions/updateGuidanceAction.tsx
new file mode 100644
index 000000000..2731e98a9
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/actions/updateGuidanceAction.tsx
@@ -0,0 +1,28 @@
+"use server";
+
+import { executeGraphQLMutation } from "@/utils/server/graphqlServerActionHandler";
+import { ActionResponse } from "@/app/types";
+import { UpdateGuidanceDocument } from "@/generated/graphql";
+
+export async function updateGuidanceAction({
+  guidanceId,
+  guidanceText,
+  tagId
+}: {
+  guidanceId: number;
+  guidanceText?: string;
+  tagId: number;
+}): Promise<ActionResponse> {
+  // Execute the mutation using the shared handler
+  return await executeGraphQLMutation({
+    document: UpdateGuidanceDocument,
+    variables: {
+      input: {
+        guidanceId,
+        tagId,
+        guidanceText
+      }
+    },
+    dataPath: "updateGuidance"
+  });
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/create/__tests__/page.spec.tsx b/app/[locale]/admin/guidance/groups/[groupId]/create/__tests__/page.spec.tsx
deleted file mode 100644
index a2be964ec..000000000
--- a/app/[locale]/admin/guidance/groups/[groupId]/create/__tests__/page.spec.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import React from "react";
-import { render, screen, waitFor, fireEvent } from "@testing-library/react";
-import "@testing-library/jest-dom";
-import { axe, toHaveNoViolations } from "jest-axe";
-
-import GuidanceTextCreatePage from "../page";
-
-// Mock Next.js navigation
-jest.mock("next/navigation", () => ({
-  useParams: () => ({
-    groupId: "1",
-  }),
-  useRouter: () => ({
-    back: jest.fn(),
-    push: jest.fn(),
-    replace: jest.fn(),
-    refresh: jest.fn(),
-  }),
-}));
-
-// Mock TinyMCE Editor
-jest.mock("@/components/TinyMCEEditor", () => {
-  return function MockTinyMCEEditor({
-    content,
-    setContent,
-    id,
-    labelId,
-  }: {
-    content: string;
-    setContent: (content: string) => void;
-    id: string;
-    labelId: string;
-  }) {
-    return (
-      <textarea
-        id={id}
-        aria-labelledby={labelId}
-        value={content}
-        onChange={(e) => setContent(e.target.value)}
-        data-testid="tinymce-editor"
-      />
-    );
-  };
-});
-
-expect.extend(toHaveNoViolations);
-
-describe("GuidanceTextCreatePage", () => {
-  beforeEach(() => {
-    window.scrollTo = jest.fn();
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("should render the form with title input", () => {
-    render(<GuidanceTextCreatePage />);
-
-    const titleInput = screen.getByLabelText("fields.title.label");
-    expect(titleInput).toBeInTheDocument();
-    expect(titleInput).toHaveAttribute("placeholder", "fields.title.placeholder");
-  });
-
-  it("should render the content editor", () => {
-    render(<GuidanceTextCreatePage />);
-
-    expect(screen.getByText("fields.guidanceText.label")).toBeInTheDocument();
-    const editor = screen.getByTestId("tinymce-editor");
-    expect(editor).toBeInTheDocument();
-  });
-
-  it("should render the themes section", () => {
-    render(<GuidanceTextCreatePage />);
-
-    expect(screen.getByText("fields.themes.label")).toBeInTheDocument();
-  });
-
-  it("should render theme checkboxes", () => {
-    render(<GuidanceTextCreatePage />);
-
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes.length).toBeGreaterThan(5); // Should have multiple themes
-  });
-
-  it("should render info buttons for themes", () => {
-    render(<GuidanceTextCreatePage />);
-
-    const infoButtons = document.querySelectorAll('button[aria-label*="info"], .info-button, [data-tooltip]');
-    expect(infoButtons.length).toBeGreaterThan(0);
-  });
-
-  it("should render the create button", () => {
-    render(<GuidanceTextCreatePage />);
-
-    // Check for any button in the sidebar (likely the create button)
-    const sidebarButtons = document.querySelectorAll(".buttonContainer button, .sidePanel button");
-    expect(sidebarButtons.length).toBeGreaterThan(0);
-  });
-
-  it("should render the sidebar panel", () => {
-    render(<GuidanceTextCreatePage />);
-
-    expect(screen.getByText("status.status")).toBeInTheDocument();
-    expect(screen.getByText("status.draft")).toBeInTheDocument();
-  });
-
-  it("should have form element present", () => {
-    render(<GuidanceTextCreatePage />);
-
-    const form = document.querySelector("form");
-    expect(form).toBeInTheDocument();
-  });
-
-  it("should handle title input changes", () => {
-    render(<GuidanceTextCreatePage />);
-
-    const titleInput = screen.getByLabelText("fields.title.label") as HTMLInputElement;
-    fireEvent.change(titleInput, { target: { value: "Test Title" } });
-
-    expect(titleInput.value).toBe("Test Title");
-  });
-
-  it("should handle content editor changes", () => {
-    render(<GuidanceTextCreatePage />);
-
-    const contentEditor = screen.getByTestId("tinymce-editor") as HTMLTextAreaElement;
-    fireEvent.change(contentEditor, { target: { value: "Test content" } });
-
-    expect(contentEditor.value).toBe("Test content");
-  });
-
-  it("should handle theme checkbox selection", () => {
-    render(<GuidanceTextCreatePage />);
-
-    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
-    const firstCheckbox = checkboxes[0];
-
-    fireEvent.click(firstCheckbox);
-    // Just verify the click doesn't cause errors
-    expect(firstCheckbox).toBeInTheDocument();
-  });
-
-  it("should render checkbox group in two-column layout", () => {
-    render(<GuidanceTextCreatePage />);
-
-    // Check that checkboxes are organized in some layout structure
-    const checkboxContainer = document.querySelector('.checkbox-group, .themes-container, [role="group"]');
-    expect(checkboxContainer).toBeInTheDocument();
-  });
-
-  it("should render theme help text", () => {
-    render(<GuidanceTextCreatePage />);
-
-    // Check that themes section exists
-    expect(screen.getByText("fields.themes.label")).toBeInTheDocument();
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes.length).toBeGreaterThan(0);
-  });
-
-  it("should render content help text", () => {
-    render(<GuidanceTextCreatePage />);
-
-    // Check that the content editor section exists
-    expect(screen.getByText("fields.guidanceText.label")).toBeInTheDocument();
-    const editor = screen.getByTestId("tinymce-editor");
-    expect(editor).toBeInTheDocument();
-  });
-
-  it("should render theme descriptions via info buttons", () => {
-    render(<GuidanceTextCreatePage />);
-
-    // Check that theme section has interactive elements
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes.length).toBeGreaterThan(0);
-
-    // Check for any info/help elements
-    const helpElements = document.querySelectorAll("button, .info, [data-tooltip], [aria-describedby]");
-    expect(helpElements.length).toBeGreaterThan(0);
-  });
-
-  it("should pass accessibility tests", async () => {
-    const { container } = render(<GuidanceTextCreatePage />);
-
-    await waitFor(() => {
-      expect(screen.getByLabelText("fields.title.label")).toBeInTheDocument();
-    });
-
-    const results = await axe(container);
-    expect(results).toHaveNoViolations();
-  });
-});
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/create/guidanceTextCreate.module.scss b/app/[locale]/admin/guidance/groups/[groupId]/create/guidanceTextCreate.module.scss
deleted file mode 100644
index 1cad9e681..000000000
--- a/app/[locale]/admin/guidance/groups/[groupId]/create/guidanceTextCreate.module.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@use '@/styles/responsive.scss' as r;
-
-.createForm {
-    max-width: 800px;
-    margin: 0 auto;
-}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/create/page.tsx b/app/[locale]/admin/guidance/groups/[groupId]/create/page.tsx
deleted file mode 100644
index c6dcf8c08..000000000
--- a/app/[locale]/admin/guidance/groups/[groupId]/create/page.tsx
+++ /dev/null
@@ -1,326 +0,0 @@
-"use client";
-
-import React, { useState } from "react";
-import {
-  Breadcrumb,
-  Breadcrumbs,
-  Link,
-  Button,
-  Label,
-  Checkbox,
-  Dialog,
-  DialogTrigger,
-  OverlayArrow,
-  Popover,
-  Form,
-  ListBoxItem,
-} from "react-aria-components";
-import { useTranslations } from "next-intl";
-import { useParams } from "next/navigation";
-
-// Components
-import PageHeader from "@/components/PageHeader";
-import { ContentContainer, LayoutWithPanel, SidebarPanel } from "@/components/Container";
-import TinyMCEEditor from "@/components/TinyMCEEditor";
-import { DmpIcon } from "@/components/Icons";
-import { FormInput, CheckboxGroupComponent, FormSelect } from "@/components/Form";
-
-import { routePath } from "@/utils/routes";
-import styles from "./guidanceTextCreate.module.scss";
-
-interface GuidanceText {
-  title: string;
-  content: string;
-  selectedTags: string[];
-  status: "Published" | "Draft";
-}
-
-interface Tag {
-  id: number;
-  name: string;
-  description: string;
-}
-
-const GuidanceTextCreatePage: React.FC = () => {
-  const params = useParams();
-  const groupId = String(params.groupId);
-  const [guidanceText, setGuidanceText] = useState<GuidanceText>({
-    title: "",
-    content: "",
-    selectedTags: [],
-    status: "Draft",
-  });
-
-  const [isEditingStatus, setIsEditingStatus] = useState(false);
-
-  // For translations
-  const t = useTranslations("Guidance");
-  const Global = useTranslations("Global");
-
-  // Status options for dropdown
-  const statusOptions = [
-    { id: "Published", name: t("status.published") },
-    { id: "Draft", name: t("status.draft") },
-  ];
-
-  // Fake tags data (same as edit page)
-  const tags: Tag[] = [
-    {
-      id: 1,
-      name: "Data description",
-      description: "The types of data that will be collected along with their formats and estimated volumes.",
-    },
-    {
-      id: 2,
-      name: "Data organization & documentation",
-      description:
-        "Descriptions naming conventions, metadata standards that will be used along with data dictionaries and glossaries",
-    },
-    {
-      id: 3,
-      name: "Security & privacy",
-      description:
-        "Who will have access to the data and how that access will be controlled, how the data will be encrypted and relevant compliance with regulations or standards (e.g. HIPAA, GDPR)",
-    },
-    {
-      id: 4,
-      name: "Ethical considerations",
-      description:
-        "Ethical considerations during data collection, use or sharing and how informed consent will be obtained from participants",
-    },
-    {
-      id: 5,
-      name: "Training & support",
-      description:
-        "Training that will be provided to team members on data management practices and support for data issues",
-    },
-    {
-      id: 6,
-      name: "Budget",
-      description: "Costs associated with data management activities and resources needed",
-    },
-    {
-      id: 7,
-      name: "Data Collection",
-      description: "Methods and procedures for collecting research data",
-    },
-    {
-      id: 8,
-      name: "Data format",
-      description: "File formats and data structures used for storing research data",
-    },
-    {
-      id: 9,
-      name: "Data repository",
-      description: "Where and how research data will be stored and archived",
-    },
-    {
-      id: 10,
-      name: "Data sharing",
-      description: "Policies and procedures for sharing research data with other researchers",
-    },
-  ];
-
-  const handleStatusChange = () => {
-    setIsEditingStatus(true);
-  };
-
-  const handleStatusForm = async (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    setIsEditingStatus(false);
-    // TODO: Implement status update functionality
-  };
-
-  const handleSave = () => {
-    // TODO: Implement save functionality
-    // console.log("Creating guidance text:", guidanceText);
-  };
-
-  return (
-    <>
-      <PageHeader
-        title={t("pages.textCreate.title")}
-        description={t("pages.textCreate.description")}
-        showBackButton={true}
-        breadcrumbs={
-          <Breadcrumbs>
-            <Breadcrumb>
-              <Link href={routePath("app.home")}>{Global("breadcrumbs.home")}</Link>
-            </Breadcrumb>
-            <Breadcrumb>
-              <Link href={routePath("admin.guidance.index")}>{t("breadcrumbs.guidanceGroups")}</Link>
-            </Breadcrumb>
-            <Breadcrumb>
-              <Link href={routePath("admin.guidance.groups.index", { groupId })}>{t("breadcrumbs.group")}</Link>
-            </Breadcrumb>
-            <Breadcrumb>{t("breadcrumbs.createText")}</Breadcrumb>
-          </Breadcrumbs>
-        }
-        className="page-guidance-text-create"
-      />
-
-      <LayoutWithPanel>
-        <ContentContainer>
-          <form className={styles.createForm}>
-            {/* Guidance Text Content Section */}
-            <div className="sectionContainer mt-0">
-              <div className="sectionContent">
-                <div className={styles.formGroup}>
-                  <FormInput
-                    name="title"
-                    label={t("fields.title.label")}
-                    value={guidanceText.title}
-                    onChange={(e) => setGuidanceText({ ...guidanceText, title: e.target.value })}
-                    placeholder={t("fields.title.placeholder")}
-                  />
-                </div>
-
-                <div>
-                  <Label
-                    htmlFor="content"
-                    id="contentLabel"
-                  >
-                    {t("fields.guidanceText.label")}
-                  </Label>
-                  <TinyMCEEditor
-                    content={guidanceText.content}
-                    setContent={(value) => setGuidanceText({ ...guidanceText, content: value })}
-                    id="content"
-                    labelId="contentLabel"
-                    helpText={t("fields.guidanceText.helpText")}
-                  />
-                </div>
-
-                <div>
-                  <CheckboxGroupComponent
-                    name="guidanceTags"
-                    checkboxGroupLabel={t("fields.themes.label")}
-                    checkboxGroupDescription={t("fields.themes.helpText")}
-                    value={guidanceText.selectedTags}
-                    onChange={(value) => setGuidanceText({ ...guidanceText, selectedTags: value })}
-                  >
-                    <div className="checkbox-group-two-column">
-                      {tags &&
-                        tags.map((tag) => {
-                          const id = tag.id?.toString();
-                          return (
-                            <Checkbox
-                              value={tag.name}
-                              key={tag.name}
-                              id={id}
-                            >
-                              <div className="checkbox">
-                                <svg
-                                  viewBox="0 0 18 18"
-                                  aria-hidden="true"
-                                >
-                                  <polyline points="1 9 7 14 15 4" />
-                                </svg>
-                              </div>
-                              <span
-                                className="checkbox-label"
-                                data-testid="checkboxLabel"
-                              >
-                                <div className="checkbox-wrapper">
-                                  <div>{tag.name}</div>
-                                  <DialogTrigger>
-                                    <Button
-                                      className="popover-btn"
-                                      aria-label={`More information about ${tag.name}`}
-                                    >
-                                      <div className="icon">
-                                        <DmpIcon icon="info" />
-                                      </div>
-                                    </Button>
-                                    <Popover>
-                                      <OverlayArrow>
-                                        <svg
-                                          width={12}
-                                          height={12}
-                                          viewBox="0 0 12 12"
-                                        >
-                                          <path d="M0 0 L6 6 L12 0" />
-                                        </svg>
-                                      </OverlayArrow>
-                                      <Dialog>
-                                        <div className="flex-col">{tag.description}</div>
-                                      </Dialog>
-                                    </Popover>
-                                  </DialogTrigger>
-                                </div>
-                              </span>
-                            </Checkbox>
-                          );
-                        })}
-                    </div>
-                  </CheckboxGroupComponent>
-                </div>
-
-                <div className={styles.formGroup}>
-                  <Button
-                    onPress={handleSave}
-                    className="button button--primary"
-                  >
-                    {t("actions.createText")}
-                  </Button>
-                </div>
-              </div>
-            </div>
-          </form>
-        </ContentContainer>
-
-        <SidebarPanel>
-          <div className={`statusPanelContent sidePanel`}>
-            <div className="sidePanelContent">
-              {isEditingStatus ? (
-                <div>
-                  <Form
-                    onSubmit={handleStatusForm}
-                    className="statusForm"
-                  >
-                    <FormSelect
-                      label={t("status.status")}
-                      ariaLabel="Select status"
-                      isRequired
-                      name="status"
-                      items={statusOptions}
-                      onChange={(selected) =>
-                        setGuidanceText({ ...guidanceText, status: selected as "Published" | "Draft" })
-                      }
-                      selectedKey={guidanceText.status}
-                    >
-                      {(item) => <ListBoxItem key={item.id}>{item.name}</ListBoxItem>}
-                    </FormSelect>
-                    {isEditingStatus && <Button type="submit">Save</Button>}
-                  </Form>
-                </div>
-              ) : (
-                <div className={`panelRow mb-5`}>
-                  <div>
-                    <p
-                      className="sidebar-label"
-                      role="heading"
-                      aria-level={2}
-                    >
-                      {t("status.status")}
-                    </p>
-                    <p>{guidanceText.status === "Published" ? t("status.published") : t("status.draft")}</p>
-                  </div>
-                  <Button
-                    className={`buttonLink link`}
-                    onPress={handleStatusChange}
-                    aria-label="Change status"
-                  >
-                    {t("actions.edit")}
-                  </Button>
-                </div>
-              )}
-            </div>
-          </div>
-        </SidebarPanel>
-      </LayoutWithPanel>
-    </>
-  );
-};
-
-export default GuidanceTextCreatePage;
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/__tests__/page.spec.tsx b/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/__tests__/page.spec.tsx
deleted file mode 100644
index 0dc6314a4..000000000
--- a/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/__tests__/page.spec.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import React from "react";
-import { render, screen, waitFor, fireEvent } from "@testing-library/react";
-import "@testing-library/jest-dom";
-import { axe, toHaveNoViolations } from "jest-axe";
-
-import GuidanceTextEditPage from "../page";
-
-// Mock Next.js navigation
-jest.mock("next/navigation", () => ({
-  useParams: () => ({
-    groupId: "1",
-    textId: "1",
-  }),
-  useRouter: () => ({
-    back: jest.fn(),
-    push: jest.fn(),
-    replace: jest.fn(),
-    refresh: jest.fn(),
-  }),
-}));
-
-// Mock TinyMCE Editor
-jest.mock("@/components/TinyMCEEditor", () => {
-  return function MockTinyMCEEditor({
-    content,
-    setContent,
-    id,
-    labelId,
-  }: {
-    content: string;
-    setContent: (content: string) => void;
-    id: string;
-    labelId: string;
-  }) {
-    return (
-      <textarea
-        id={id}
-        aria-labelledby={labelId}
-        value={content}
-        onChange={(e) => setContent(e.target.value)}
-        data-testid="tinymce-editor"
-      />
-    );
-  };
-});
-
-expect.extend(toHaveNoViolations);
-
-describe("GuidanceTextEditPage", () => {
-  beforeEach(() => {
-    window.scrollTo = jest.fn();
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("should render the form with title input", () => {
-    render(<GuidanceTextEditPage />);
-
-    const titleInput = screen.getByLabelText("fields.title.label") as HTMLInputElement;
-    expect(titleInput).toBeInTheDocument();
-    expect(titleInput).toHaveValue();
-    expect(titleInput.value.length).toBeGreaterThan(0);
-  });
-
-  it("should render the content editor with existing content", () => {
-    render(<GuidanceTextEditPage />);
-
-    expect(screen.getByText("fields.guidanceText.label")).toBeInTheDocument();
-    const editor = screen.getByTestId("tinymce-editor") as HTMLTextAreaElement;
-    expect(editor).toBeInTheDocument();
-    expect(editor).toHaveValue();
-    expect(editor.value.length).toBeGreaterThan(0);
-  });
-
-  it("should render the themes section", () => {
-    render(<GuidanceTextEditPage />);
-
-    expect(screen.getByText("fields.themes.label")).toBeInTheDocument();
-  });
-
-  it("should render theme checkboxes", () => {
-    render(<GuidanceTextEditPage />);
-
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes.length).toBeGreaterThan(5); // Should have multiple themes
-  });
-
-  it("should show some pre-selected theme checkboxes", () => {
-    render(<GuidanceTextEditPage />);
-
-    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
-    const checkedBoxes = checkboxes.filter((cb) => cb.checked);
-    expect(checkedBoxes.length).toBeGreaterThan(0);
-  });
-
-  it("should render info buttons for themes", () => {
-    render(<GuidanceTextEditPage />);
-
-    const infoButtons = document.querySelectorAll('button[aria-label*="info"], .info-button, [data-tooltip]');
-    expect(infoButtons.length).toBeGreaterThan(0);
-  });
-
-  it("should render the save changes button for published status", () => {
-    render(<GuidanceTextEditPage />);
-
-    // Check for any button in the sidebar (likely the save button)
-    const sidebarButtons = screen.getByRole("button", { name: "actions.saveChanges" });
-    expect(sidebarButtons).toBeInTheDocument();
-  });
-
-  it("should have form element present", () => {
-    render(<GuidanceTextEditPage />);
-
-    const form = document.querySelector("form");
-    expect(form).toBeInTheDocument();
-  });
-
-  it("should handle title input changes", () => {
-    render(<GuidanceTextEditPage />);
-
-    const titleInput = screen.getByLabelText("fields.title.label") as HTMLInputElement;
-    fireEvent.change(titleInput, { target: { value: "Updated Title" } });
-
-    expect(titleInput.value).toBe("Updated Title");
-  });
-
-  it("should handle content editor changes", () => {
-    render(<GuidanceTextEditPage />);
-
-    const contentEditor = screen.getByTestId("tinymce-editor") as HTMLTextAreaElement;
-    fireEvent.change(contentEditor, { target: { value: "Updated content" } });
-
-    expect(contentEditor).toHaveValue("Updated content");
-  });
-
-  it("should handle theme checkbox selection changes", () => {
-    render(<GuidanceTextEditPage />);
-
-    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
-    const uncheckedBox = checkboxes.find((cb) => !cb.checked);
-
-    if (uncheckedBox) {
-      fireEvent.click(uncheckedBox);
-      // Just verify the click doesn't cause errors
-      expect(uncheckedBox).toBeInTheDocument();
-    } else {
-      // If all are checked, just verify checkboxes exist
-      expect(checkboxes.length).toBeGreaterThan(0);
-    }
-  });
-
-  it("should render checkbox group in two-column layout", () => {
-    render(<GuidanceTextEditPage />);
-
-    // Check that checkboxes are organized in some layout structure
-    const checkboxContainer = document.querySelector('.checkbox-group, .themes-container, [role="group"]');
-    expect(checkboxContainer).toBeInTheDocument();
-  });
-
-  it("should render theme help text", () => {
-    render(<GuidanceTextEditPage />);
-
-    // Check that themes section exists
-    expect(screen.getByText("fields.themes.label")).toBeInTheDocument();
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes.length).toBeGreaterThan(0);
-  });
-
-  it("should render content help text", () => {
-    render(<GuidanceTextEditPage />);
-
-    // Check that the content editor section exists
-    expect(screen.getByText("fields.guidanceText.label")).toBeInTheDocument();
-    const editor = screen.getByTestId("tinymce-editor");
-    expect(editor).toBeInTheDocument();
-  });
-
-  it("should render theme descriptions via info buttons", () => {
-    render(<GuidanceTextEditPage />);
-
-    // Check that theme section has interactive elements
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes.length).toBeGreaterThan(0);
-
-    // Check for any info/help elements
-    const helpElements = document.querySelectorAll("button, .info, [data-tooltip], [aria-describedby]");
-    expect(helpElements.length).toBeGreaterThan(0);
-  });
-
-  it("should pass accessibility tests", async () => {
-    const { container } = render(<GuidanceTextEditPage />);
-
-    await waitFor(() => {
-      expect(screen.getByLabelText("fields.title.label")).toBeInTheDocument();
-    });
-
-    const results = await axe(container);
-    expect(results).toHaveNoViolations();
-  });
-});
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/guidanceTextEdit.module.scss b/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/guidanceTextEdit.module.scss
deleted file mode 100644
index 358a3d631..000000000
--- a/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/guidanceTextEdit.module.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@use '@/styles/responsive.scss' as r;
-
-.editForm {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-.formGroup {
-    margin-bottom: 2rem;
-}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/page.tsx b/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/page.tsx
deleted file mode 100644
index d6f94f015..000000000
--- a/app/[locale]/admin/guidance/groups/[groupId]/edit/[textId]/page.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-"use client";
-
-import React, { useState } from "react";
-import {
-  Breadcrumb,
-  Breadcrumbs,
-  Link,
-  Button,
-  Label,
-  Checkbox,
-  Dialog,
-  DialogTrigger,
-  OverlayArrow,
-  Popover,
-} from "react-aria-components";
-import { useTranslations } from "next-intl";
-import { useParams } from "next/navigation";
-
-// Components
-import PageHeader from "@/components/PageHeader";
-import { ContentContainer, LayoutWithPanel } from "@/components/Container";
-import TinyMCEEditor from "@/components/TinyMCEEditor";
-import { DmpIcon } from "@/components/Icons";
-import { FormInput, CheckboxGroupComponent } from "@/components/Form";
-
-import { routePath } from "@/utils/routes";
-import styles from "./guidanceTextEdit.module.scss";
-
-interface GuidanceText {
-  id: string;
-  title: string;
-  content: string;
-  status: "Published" | "Draft" | "Archived";
-  selectedTags: string[];
-}
-
-interface Tag {
-  id: number;
-  name: string;
-  description: string;
-}
-
-const GuidanceTextEditPage: React.FC = () => {
-  const params = useParams();
-  const groupId = String(params.groupId);
-  const textId = String(params.textId);
-
-  // For translations
-  const t = useTranslations("Guidance");
-  const Global = useTranslations("Global");
-
-  const [guidanceText, setGuidanceText] = useState<GuidanceText>({
-    id: textId,
-    title: "Research Ethics Guidelines",
-    content:
-      "This guidance text covers the ethical considerations that researchers must take into account when conducting health sciences research...",
-    status: "Published",
-    selectedTags: ["Data description", "Ethical considerations"],
-  });
-
-  // Fake tags data
-  const tags: Tag[] = [
-    {
-      id: 1,
-      name: "Data description",
-      description: "The types of data that will be collected along with their formats and estimated volumes.",
-    },
-    {
-      id: 2,
-      name: "Data organization & documentation",
-      description:
-        "Descriptions naming conventions, metadata standards that will be used along with data dictionaries and glossaries",
-    },
-    {
-      id: 3,
-      name: "Security & privacy",
-      description:
-        "Who will have access to the data and how that access will be controlled, how the data will be encrypted and relevant compliance with regulations or standards (e.g. HIPAA, GDPR)",
-    },
-    {
-      id: 4,
-      name: "Ethical considerations",
-      description:
-        "Ethical considerations during data collection, use or sharing and how informed consent will be obtained from participants",
-    },
-    {
-      id: 5,
-      name: "Training & support",
-      description:
-        "Training that will be provided to team members on data management practices and support for data issues",
-    },
-    {
-      id: 6,
-      name: "Budget",
-      description: "Costs associated with data management activities and resources needed",
-    },
-    {
-      id: 7,
-      name: "Data Collection",
-      description: "Methods and procedures for collecting research data",
-    },
-    {
-      id: 8,
-      name: "Data format",
-      description: "File formats and data structures used for storing research data",
-    },
-    {
-      id: 9,
-      name: "Data repository",
-      description: "Where and how research data will be stored and archived",
-    },
-    {
-      id: 10,
-      name: "Data sharing",
-      description: "Policies and procedures for sharing research data with other researchers",
-    },
-  ];
-
-  const handleSave = () => {
-    // TODO: Implement save functionality
-    // console.log("Saving guidance text:", guidanceText);
-  };
-
-  const handlePublish = () => {
-    // TODO: Implement publish functionality
-    // console.log("Publishing guidance text:", guidanceText);
-  };
-
-  return (
-    <>
-      <PageHeader
-        title={`${t("pages.textEdit.title")} ${guidanceText.title}`}
-        description={t("pages.textEdit.description")}
-        showBackButton={true}
-        breadcrumbs={
-          <Breadcrumbs>
-            <Breadcrumb>
-              <Link href={routePath("app.home")}>{Global("breadcrumbs.home")}</Link>
-            </Breadcrumb>
-            <Breadcrumb>
-              <Link href={routePath("admin.guidance.index")}>{t("breadcrumbs.guidanceGroups")}</Link>
-            </Breadcrumb>
-            <Breadcrumb>
-              <Link href={routePath("admin.guidance.groups.index", { groupId })}>{t("breadcrumbs.group")}</Link>
-            </Breadcrumb>
-            <Breadcrumb>{t("breadcrumbs.editText")}</Breadcrumb>
-          </Breadcrumbs>
-        }
-        className="page-guidance-text-edit"
-      />
-
-      <LayoutWithPanel>
-        <ContentContainer>
-          <form className={styles.editForm}>
-            {/* Guidance Text Content Section */}
-            <div className="sectionContainer mt-0">
-              <div className="sectionContent">
-                <div className={styles.formGroup}>
-                  <FormInput
-                    name="title"
-                    label={t("fields.title.label")}
-                    value={guidanceText.title}
-                    onChange={(e) => setGuidanceText({ ...guidanceText, title: e.target.value })}
-                    placeholder={t("fields.title.placeholder")}
-                  />
-                </div>
-
-                <div className={styles.formGroup}>
-                  <Label
-                    htmlFor="content"
-                    id="contentLabel"
-                  >
-                    {t("fields.guidanceText.label")}
-                  </Label>
-                  <TinyMCEEditor
-                    content={guidanceText.content}
-                    setContent={(value) => setGuidanceText({ ...guidanceText, content: value })}
-                    id="content"
-                    labelId="contentLabel"
-                    helpText={t("fields.guidanceText.helpText")}
-                  />
-                </div>
-
-                <div className={styles.formGroup}>
-                  <CheckboxGroupComponent
-                    name="guidanceTags"
-                    checkboxGroupLabel={t("fields.themes.label")}
-                    checkboxGroupDescription={t("fields.themes.helpText")}
-                    value={guidanceText.selectedTags}
-                    onChange={(value) => setGuidanceText({ ...guidanceText, selectedTags: value })}
-                  >
-                    <div className="checkbox-group-two-column">
-                      {tags &&
-                        tags.map((tag) => {
-                          const id = tag.id?.toString();
-                          return (
-                            <Checkbox
-                              value={tag.name}
-                              key={tag.name}
-                              id={id}
-                            >
-                              <div className="checkbox">
-                                <svg
-                                  viewBox="0 0 18 18"
-                                  aria-hidden="true"
-                                >
-                                  <polyline points="1 9 7 14 15 4" />
-                                </svg>
-                              </div>
-                              <span
-                                className="checkbox-label"
-                                data-testid="checkboxLabel"
-                              >
-                                <div className="checkbox-wrapper">
-                                  <div>{tag.name}</div>
-                                  <DialogTrigger>
-                                    <Button
-                                      className="popover-btn"
-                                      aria-label={`More information about ${tag.name}`}
-                                    >
-                                      <div className="icon">
-                                        <DmpIcon icon="info" />
-                                      </div>
-                                    </Button>
-                                    <Popover>
-                                      <OverlayArrow>
-                                        <svg
-                                          width={12}
-                                          height={12}
-                                          viewBox="0 0 12 12"
-                                        >
-                                          <path d="M0 0 L6 6 L12 0" />
-                                        </svg>
-                                      </OverlayArrow>
-                                      <Dialog>
-                                        <div className="flex-col">{tag.description}</div>
-                                      </Dialog>
-                                    </Popover>
-                                  </DialogTrigger>
-                                </div>
-                              </span>
-                            </Checkbox>
-                          );
-                        })}
-                    </div>
-                  </CheckboxGroupComponent>
-                </div>
-
-                <div className={styles.formGroup}>
-                  {guidanceText.status === "Draft" ? (
-                    <Button
-                      onPress={handlePublish}
-                      className="button button--primary"
-                    >
-                      {t("actions.publish")}
-                    </Button>
-                  ) : (
-                    <Button
-                      onPress={handleSave}
-                      className="button button--primary"
-                    >
-                      {t("actions.saveChanges")}
-                    </Button>
-                  )}
-                </div>
-              </div>
-            </div>
-          </form>
-        </ContentContainer>
-      </LayoutWithPanel>
-    </>
-  );
-};
-
-export default GuidanceTextEditPage;
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/edit/__tests__/page.spec.tsx b/app/[locale]/admin/guidance/groups/[groupId]/edit/__tests__/page.spec.tsx
index 6686fdf28..a8e646076 100644
--- a/app/[locale]/admin/guidance/groups/[groupId]/edit/__tests__/page.spec.tsx
+++ b/app/[locale]/admin/guidance/groups/[groupId]/edit/__tests__/page.spec.tsx
@@ -1,112 +1,284 @@
 import React from "react";
-import { render, screen, waitFor, fireEvent } from "@testing-library/react";
+import { render, screen, fireEvent, waitFor } from "@testing-library/react";
 import "@testing-library/jest-dom";
 import { axe, toHaveNoViolations } from "jest-axe";
-
 import GuidanceGroupEditPage from "../page";
+import logECS from "@/utils/clientLogger";
+import { useTranslations } from "next-intl";
+import { MockedProvider } from "@apollo/client/testing";
+import { useParams, useRouter } from "next/navigation";
+import { GuidanceGroupDocument } from "@/generated/graphql";
+import { updateGuidanceGroupAction } from "../actions";
+import { useToast } from "@/context/ToastContext";
+// Use a minimal mock aligned to GuidanceGroupDocument's shape
+
+// Extend jest-axe
+expect.extend(toHaveNoViolations);
 
-// Mock Next.js navigation
+// Mocks
 jest.mock("next/navigation", () => ({
-  useParams: () => ({
-    groupId: "1",
-  }),
-  useRouter: () => ({
-    back: jest.fn(),
-    push: jest.fn(),
-    replace: jest.fn(),
-    refresh: jest.fn(),
-  }),
+  useRouter: jest.fn(),
+  useParams: jest.fn(),
 }));
 
-expect.extend(toHaveNoViolations);
+jest.mock("next-intl", () => ({
+  useTranslations: jest.fn(),
+}));
+
+// Do NOT mock generated GraphQL when using MockedProvider
+
+jest.mock("../actions", () => ({
+  updateGuidanceGroupAction: jest.fn(),
+}));
+
+jest.mock("@/context/ToastContext", () => ({
+  useToast: jest.fn(),
+}));
+
+jest.mock("@/utils/clientLogger", () => jest.fn());
 
+const mockRouter = { push: jest.fn(), replace: jest.fn(), refresh: jest.fn(), back: jest.fn() };
+const mockToast = { add: jest.fn() };
+
+
+const mocks = [
+  {
+    request: {
+      query: GuidanceGroupDocument,
+      variables: { guidanceGroupId: 2397 },
+    },
+    result: {
+      data: {
+        guidanceGroup: {
+          __typename: "GuidanceGroup",
+          id: 2397,
+          name: "Existing Guidance Group",
+          description: "Existing description",
+          optionalSubset: false,
+          bestPractice: false,
+          latestPublishedDate: null,
+          latestPublishedVersion: null,
+          isDirty: false,
+          versionedGuidanceGroup: null,
+          guidance: [],
+        },
+      },
+    },
+  },
+];
 describe("GuidanceGroupEditPage", () => {
   beforeEach(() => {
+    // General DOM mocks
     window.scrollTo = jest.fn();
+    HTMLElement.prototype.scrollIntoView = jest.fn();
+
+    // Params: groupId
+    (useParams as jest.Mock).mockReturnValue({ groupId: 2397 });
+
+    // Router
+    (useRouter as jest.Mock).mockReturnValue(mockRouter);
+
+    // Translations: return namespace.key
+    (useTranslations as jest.Mock).mockImplementation((ns: string) => (key: string) => `${ns}.${key}`);
+
+    // Toast
+    (useToast as jest.Mock).mockReturnValue(mockToast);
+
+    jest.clearAllMocks();
   });
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
-  it("should render the form with group name input", () => {
-    render(<GuidanceGroupEditPage />);
+  const getNameInput = () => screen.getByLabelText("Guidance.fields.groupName.label", { exact: false }) as HTMLInputElement;
+  const getDescriptionInput = () => screen.getByLabelText("Guidance.fields.groupDescription.label", { exact: false }) as HTMLInputElement;
 
-    const nameInput = screen.getByLabelText("fields.groupName.label") as HTMLInputElement;
-    expect(nameInput).toBeInTheDocument();
-    expect(nameInput).toHaveValue();
-    expect(nameInput.value.length).toBeGreaterThan(0);
-  });
+  it("should render form with loaded guidance group data", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
 
-  it("should render the settings section", () => {
-    render(<GuidanceGroupEditPage />);
+    // Wait for heading to appear indicating data rendered
+    await waitFor(() => {
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    });
 
-    expect(screen.getByText("fields.settings.label")).toBeInTheDocument();
+    expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    expect(screen.getByText("Guidance.pages.groupEdit.description")).toBeInTheDocument();
+    expect(screen.getByLabelText("Guidance.fields.groupName.label", { exact: false })).toBeInTheDocument();
+    expect(screen.getByLabelText("Guidance.fields.groupDescription.label", { exact: false })).toBeInTheDocument();
+    const nameInput = getNameInput();
+    const descriptionInput = getDescriptionInput();
+    expect(nameInput.value).toBe("Existing Guidance Group");
+    expect(descriptionInput.value).toBe("Existing description");
+    expect(screen.getByRole("button", { name: "Guidance.actions.saveChanges" })).toBeInTheDocument();
   });
 
-  it("should render settings checkboxes with current states", () => {
-    render(<GuidanceGroupEditPage />);
+  it("should update group name input value", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
 
-    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
-    expect(checkboxes.length).toBeGreaterThan(0);
+    // Wait for heading to appear indicating data rendered
+    await waitFor(() => {
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    });
 
-    // Check that some checkboxes have different states (some checked, some not)
-    const checkedBoxes = checkboxes.filter((cb) => cb.checked);
-    const uncheckedBoxes = checkboxes.filter((cb) => !cb.checked);
-    expect(checkedBoxes.length).toBeGreaterThan(0);
-    expect(uncheckedBoxes.length).toBeGreaterThan(0);
+    const nameInput = getNameInput();
+    expect(nameInput).toBeInTheDocument();
+    fireEvent.change(nameInput, { target: { value: "Updated Name" } });
+    expect(nameInput.value).toBe("Updated Name");
   });
 
-  it("should have form element present", () => {
-    render(<GuidanceGroupEditPage />);
+  it("should update group description input value", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
+
+    // Wait for heading to appear indicating data rendered
+    await waitFor(() => {
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    });
 
-    const form = document.querySelector("form");
-    expect(form).toBeInTheDocument();
+    const descriptionInput = getDescriptionInput();
+    expect(descriptionInput).toBeInTheDocument();
+    fireEvent.change(descriptionInput, { target: { value: "Updated description" } });
+    expect(descriptionInput.value).toBe("Updated description");
   });
 
-  it("should handle group name input changes", () => {
-    render(<GuidanceGroupEditPage />);
+  it("should handle successful update with toast and redirect", async () => {
+    (updateGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: { id: 2397, errors: {} },
+      redirect: undefined,
+    });
 
-    const nameInput = screen.getByLabelText("fields.groupName.label") as HTMLInputElement;
-    fireEvent.change(nameInput, { target: { value: "Updated Group Name" } });
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
+    await waitFor(() => {
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    });
+    const nameInput = getNameInput();
+    fireEvent.change(nameInput, { target: { value: "Changed Name" } });
+    const saveButton = screen.getByRole("button", { name: "Guidance.actions.saveChanges" });
+    fireEvent.click(saveButton);
 
-    expect(nameInput.value).toBe("Updated Group Name");
+    await waitFor(() => {
+      expect(updateGuidanceGroupAction).toHaveBeenCalledTimes(1);
+      expect(updateGuidanceGroupAction).toHaveBeenCalledWith({
+        guidanceGroupId: 2397,
+        name: "Changed Name",
+        description: "Existing description",
+        optionalSubset: false,
+        bestPractice: false,
+      });
+      expect(mockToast.add).toHaveBeenCalledWith("Guidance.messages.success.guidanceGroupUpdated", { type: "success" });
+      expect(mockRouter.push).toHaveBeenCalled();
+    });
   });
 
-  it("should handle checkbox interactions", () => {
-    render(<GuidanceGroupEditPage />);
+  it("should show errors when update action fails (success false)", async () => {
+    (updateGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: false,
+      errors: ["Name already exists."],
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
+    await waitFor(() => {
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    });
 
-    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
-    const firstCheckbox = checkboxes[0];
+    const saveButton = screen.getByRole("button", { name: "Guidance.actions.saveChanges" });
+    fireEvent.click(saveButton);
 
-    fireEvent.click(firstCheckbox);
-    // Just verify the click doesn't cause errors
-    expect(firstCheckbox).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByText("Name already exists.")).toBeInTheDocument();
+      expect(logECS).toHaveBeenCalledWith(
+        "error",
+        "publishing Guidance Group",
+        expect.objectContaining({ errors: expect.anything(), url: expect.objectContaining({ path: expect.any(String) }) })
+      );
+    });
   });
 
-  it("should render setting descriptions", () => {
-    render(<GuidanceGroupEditPage />);
+  it("should show field-level errors when returned in data.errors", async () => {
+    (updateGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: { id: 2397, errors: { general: "There was a general error" } },
+      redirect: undefined,
+    });
 
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
+    await waitFor(() => {
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    });
 
-    // Check that setting descriptions are rendered inline within checkbox labels
-    // Based on the HTML structure, descriptions are shown in parentheses after the setting names
-    expect(screen.getByText(/e\.g\. School\/ Department/)).toBeInTheDocument();
-    expect(screen.getByText(/for optimal guidance creation/)).toBeInTheDocument();
-    expect(screen.getByText(/for enhanced readability/)).toBeInTheDocument();
+    const saveButton = screen.getByRole("button", { name: "Guidance.actions.saveChanges" });
+    fireEvent.click(saveButton);
 
-    // Alternative approach: Check for the complete label text including descriptions
-    expect(screen.getByText(/Optional subset.*\(.*e\.g\. School\/ Department.*\)/)).toBeInTheDocument();
-    expect(screen.getByText(/Requires coffee.*\(.*for optimal guidance creation.*\)/)).toBeInTheDocument();
-    expect(screen.getByText(/Includes emojis.*\(.*for enhanced readability.*\)/)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByText("There was a general error")).toBeInTheDocument();
+      expect(logECS).toHaveBeenCalledWith(
+        "error",
+        "publishing Guidance Group",
+        expect.objectContaining({ errors: expect.anything(), url: expect.objectContaining({ path: expect.any(String) }) })
+      );
+      expect(mockToast.add).not.toHaveBeenCalled();
+    });
   });
 
-  it("should pass accessibility tests", async () => {
-    const { container } = render(<GuidanceGroupEditPage />);
+  it("should redirect if update action returns redirect", async () => {
+    (updateGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: { id: 2397, errors: {} },
+      redirect: "/en-US/admin/guidance/groups",
+    });
 
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
     await waitFor(() => {
-      expect(screen.getByLabelText("fields.groupName.label")).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
     });
 
+    const saveButton = screen.getByRole("button", { name: "Guidance.actions.saveChanges" });
+    fireEvent.click(saveButton);
+
+    await waitFor(() => {
+      expect(mockRouter.push).toHaveBeenCalledWith("/en-US/admin/guidance/groups");
+    });
+  });
+
+  it("should pass accessibility check", async () => {
+    const { container } = render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupEditPage />
+      </MockedProvider>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByRole("heading", { name: "Guidance.pages.groupEdit.title" })).toBeInTheDocument();
+    });
     const results = await axe(container);
     expect(results).toHaveNoViolations();
   });
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/edit/actions/index.tsx b/app/[locale]/admin/guidance/groups/[groupId]/edit/actions/index.tsx
new file mode 100644
index 000000000..06657e820
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/edit/actions/index.tsx
@@ -0,0 +1 @@
+export { updateGuidanceGroupAction } from './updateGuidanceGroupAction';  
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/edit/actions/updateGuidanceGroupAction.tsx b/app/[locale]/admin/guidance/groups/[groupId]/edit/actions/updateGuidanceGroupAction.tsx
new file mode 100644
index 000000000..9ea4f8743
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/[groupId]/edit/actions/updateGuidanceGroupAction.tsx
@@ -0,0 +1,34 @@
+"use server";
+
+import { executeGraphQLMutation } from "@/utils/server/graphqlServerActionHandler";
+import { ActionResponse } from "@/app/types";
+import { UpdateGuidanceGroupDocument } from "@/generated/graphql";
+
+export async function updateGuidanceGroupAction({
+  guidanceGroupId,
+  name,
+  description,
+  optionalSubset,
+  bestPractice
+}: {
+  guidanceGroupId: number;
+  name: string;
+  description: string;
+  optionalSubset: boolean;
+  bestPractice: boolean;
+}): Promise<ActionResponse> {
+  // Execute the mutation using the shared handler
+  return await executeGraphQLMutation({
+    document: UpdateGuidanceGroupDocument,
+    variables: {
+      input: {
+        guidanceGroupId,
+        name,
+        description,
+        optionalSubset,
+        bestPractice
+      }
+    },
+    dataPath: "updateGuidanceGroup"
+  });
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/edit/page.tsx b/app/[locale]/admin/guidance/groups/[groupId]/edit/page.tsx
index eb859ecdd..7c09076aa 100644
--- a/app/[locale]/admin/guidance/groups/[groupId]/edit/page.tsx
+++ b/app/[locale]/admin/guidance/groups/[groupId]/edit/page.tsx
@@ -1,82 +1,145 @@
 "use client";
 
-import React, { useState } from "react";
-import { Breadcrumb, Breadcrumbs, Link, Button, Checkbox } from "react-aria-components";
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import { Breadcrumb, Breadcrumbs, Link, Button } from "react-aria-components";
 import { useTranslations } from "next-intl";
-import { useParams } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
+
+// GraphQL
+import {
+  useGuidanceGroupQuery,
+} from '@/generated/graphql';
+import { updateGuidanceGroupAction } from "./actions";
 
 // Components
 import PageHeader from "@/components/PageHeader";
 import { ContentContainer, LayoutWithPanel } from "@/components/Container";
-import { FormInput, CheckboxGroupComponent } from "@/components/Form";
+import { FormInput } from "@/components/Form";
+import ErrorMessages from "@/components/ErrorMessages";
 
+// Utils, other
+import logECS from "@/utils/clientLogger";
 import { routePath } from "@/utils/routes";
+import { extractErrors } from "@/utils/errorHandler";
+import { useToast } from "@/context/ToastContext";
+import Loading from "@/components/Loading";
 import styles from "./guidanceGroupEdit.module.scss";
 
-interface GuidanceGroupSetting {
-  id: string;
+enum GuidanceStatus {
+  PUBLISHED = "Published",
+  DRAFT = "Draft",
+}
+interface GuidanceGroup {
+  guidanceGroupId: number;
   name: string;
   description: string;
-  enabled: boolean;
+  optionalSubset: boolean;
+  bestPractice?: boolean;
+  status?: GuidanceStatus;
 }
 
-interface GuidanceGroup {
-  id: string;
-  title: string;
-  settings: GuidanceGroupSetting[];
-  status: "Published" | "Draft";
-}
+type UpdateGuidanceGroupErrors = {
+  general?: string;
+  affiliationId?: string;
+  bestPractice?: string;
+  name?: string;
+  description?: string;
+};
 
 const GuidanceGroupEditPage: React.FC = () => {
   const params = useParams();
+  const router = useRouter();
+  const toastState = useToast();
+
   const groupId = String(params.groupId);
 
   // For translations
   const t = useTranslations("Guidance");
+  const Global = useTranslations("Global");
 
-  const [guidanceGroup, setGuidanceGroup] = useState<GuidanceGroup>({
-    id: groupId,
-    title: "School of Health Sciences",
-    settings: [
-      {
-        id: "optional-subset",
-        name: "Optional subset",
-        description: "e.g. School/ Department",
-        enabled: false,
-      },
-      {
-        id: "requires-coffee",
-        name: "Requires coffee",
-        description: "for optimal guidance creation",
-        enabled: true,
-      },
-      {
-        id: "includes-emojis",
-        name: "Includes emojis",
-        description: "for enhanced readability",
-        enabled: false,
-      },
-      {
-        id: "has-secret-sauce",
-        name: "Has secret sauce",
-        description: "for that extra sparkle",
-        enabled: false,
-      },
-    ],
-    status: "Draft",
-  });
+  //For scrolling to error in page
+  const errorRef = useRef<HTMLDivElement | null>(null);
 
+  const [guidanceGroup, setGuidanceGroup] = useState<GuidanceGroup>();
+  const [errorMessages, setErrorMessages] = useState<string[]>([]);
 
-  const handleSave = () => {
-    // TODO: Implement save functionality
-    // console.log("Saving guidance group:", guidanceGroup);
-  };
-
-  const handlePublish = () => {
-    // TODO: Implement publish functionality
-    // console.log("Publishing guidance group:", guidanceGroup);
-  };
+  // Fetch guidance group data
+  const { data: guidanceGroupData, loading } = useGuidanceGroupQuery({
+    variables: {
+      guidanceGroupId: parseInt(groupId, 10)
+    },
+  });
 
+  // Handle update of guidance group
+  const handleUpdate = useCallback(async () => {
+    setErrorMessages([]);
+
+    if (guidanceGroup?.guidanceGroupId === undefined) {
+      setErrorMessages(['Guidance Group ID is undefined']);
+      return;
+    }
+
+    const response = await updateGuidanceGroupAction({
+      guidanceGroupId: guidanceGroup.guidanceGroupId,
+      name: guidanceGroup.name,
+      description: guidanceGroup.description,
+      optionalSubset: guidanceGroup.optionalSubset,
+      bestPractice: guidanceGroup.bestPractice || false
+    });
+
+    if (response.redirect) {
+      router.push(response.redirect);
+      return;
+    }
+
+    if (!response.success) {
+      setErrorMessages(
+        response.errors?.length ? response.errors : [Global("messaging.somethingWentWrong")]
+      )
+      logECS("error", "publishing Guidance Group", {
+        errors: response.errors,
+        url: { path: routePath("admin.guidance.groups.edit", { groupId: guidanceGroup.guidanceGroupId }) },
+      });
+      return;
+    } else {
+      if (response?.data?.errors) {
+        const errs = extractErrors<UpdateGuidanceGroupErrors>(response?.data?.errors, ["general", "affiliationId", "bestPractice", "name", "description"]);
+
+        if (errs.length > 0) {
+          setErrorMessages(errs);
+          logECS("error", "publishing Guidance Group", {
+            errors: errs,
+            url: { path: routePath("admin.guidance.groups.edit", { groupId: guidanceGroup.guidanceGroupId }) },
+          });
+          return; // Don't proceed to success message if there are errors
+        }
+      }
+      const successMessage = t("messages.success.guidanceGroupUpdated", { groupName: guidanceGroup?.name });
+      toastState.add(successMessage, { type: "success" });
+      router.push(routePath("admin.guidance.groups.index", { groupId: guidanceGroup.guidanceGroupId }));
+    }
+  }, [guidanceGroup, Global, router]);
+
+  useEffect(() => {
+    // Set Guidance Group data in state when fetched
+    if (guidanceGroupData && guidanceGroupData.guidanceGroup) {
+
+      const transformedGuidanceGroup: GuidanceGroup = {
+        guidanceGroupId: Number(guidanceGroupData.guidanceGroup?.id),
+        name: guidanceGroupData.guidanceGroup.name || 'Untitled Guidance Group',
+        description: guidanceGroupData.guidanceGroup.description || '',
+        optionalSubset: guidanceGroupData.guidanceGroup.optionalSubset || false,
+        bestPractice: guidanceGroupData.guidanceGroup.bestPractice || false,
+        status: guidanceGroupData.guidanceGroup.latestPublishedDate ? GuidanceStatus.PUBLISHED : GuidanceStatus.DRAFT
+      }
+
+      setGuidanceGroup(transformedGuidanceGroup);
+    };
+  }, [guidanceGroupData]);
+
+  if (loading) {
+    return <Loading />;
+  }
   return (
     <>
       <PageHeader
@@ -92,7 +155,7 @@ const GuidanceGroupEditPage: React.FC = () => {
               <Link href={routePath("admin.guidance.index")}>{t("breadcrumbs.guidance")}</Link>
             </Breadcrumb>
             <Breadcrumb>
-              <Link href={routePath("admin.guidance.groups.index", { groupId })}>{guidanceGroup.title}</Link>
+              <Link href={routePath("admin.guidance.groups.index", { groupId })}>{guidanceGroup?.name}</Link>
             </Breadcrumb>
             <Breadcrumb>{t("breadcrumbs.editGroup")}</Breadcrumb>
           </Breadcrumbs>
@@ -100,6 +163,8 @@ const GuidanceGroupEditPage: React.FC = () => {
         className="page-guidance-group-edit"
       />
 
+      <ErrorMessages errors={errorMessages} ref={errorRef} />
+
       <LayoutWithPanel>
         <ContentContainer>
           <form className={styles.editForm}>
@@ -108,73 +173,50 @@ const GuidanceGroupEditPage: React.FC = () => {
               <div className="sectionContent">
                 <div className={styles.formGroup}>
                   <FormInput
-                    name="title"
+                    name="name"
                     label={t("fields.groupName.label")}
-                    value={guidanceGroup.title}
-                    onChange={(e) => setGuidanceGroup({ ...guidanceGroup, title: e.target.value })}
+                    value={guidanceGroup?.name}
+                    isRequired={true}
+                    onChange={(e) => {
+                      if (guidanceGroup) {
+                        setGuidanceGroup({ ...guidanceGroup, name: e.target.value });
+                        setErrorMessages([]);
+                      }
+                    }}
                     placeholder={t("fields.groupName.placeholder")}
                   />
-                </div>
 
-                <div className={styles.formGroup}>
-                  <CheckboxGroupComponent
-                    name="guidanceGroupSettings"
-                    checkboxGroupLabel={t("fields.settings.label")}
-                    value={guidanceGroup.settings.filter((s) => s.enabled).map((s) => s.id)}
-                    onChange={(value) => {
-                      // Update all settings based on the new value array
-                      const updatedSettings = guidanceGroup.settings.map((setting) => ({
-                        ...setting,
-                        enabled: value.includes(setting.id),
-                      }));
-                      setGuidanceGroup({ ...guidanceGroup, settings: updatedSettings });
+                  <FormInput
+                    name="description"
+                    id="description"
+                    label={t("fields.groupDescription.label")}
+                    value={guidanceGroup?.description}
+                    onChange={(e) => {
+                      if (guidanceGroup) {
+                        setGuidanceGroup({ ...guidanceGroup, description: e.target.value });
+                        setErrorMessages([]);
+                      }
                     }}
-                  >
-                    <div className="">
-                      {guidanceGroup.settings.map((setting) => (
-                        <Checkbox
-                          key={setting.id}
-                          value={setting.id}
-                        >
-                          <div className="checkbox">
-                            <svg
-                              viewBox="0 0 18 18"
-                              aria-hidden="true"
-                            >
-                              <polyline points="1 9 7 14 15 4" />
-                            </svg>
-                          </div>
-                          <span className="checkbox-label">
-                            {setting.name} ({setting.description})
-                          </span>
-                        </Checkbox>
-                      ))}
-                    </div>
-                  </CheckboxGroupComponent>
+                    placeholder={t("fields.groupDescription.placeholder")}
+                    helpMessage={t("fields.groupDescription.helpText")}
+                  />
                 </div>
 
                 <div className={styles.formGroup}>
-                  {guidanceGroup.status === "Draft" ? (
-                    <Button
-                      onPress={handlePublish}
-                      className="button button--primary"
-                    >
-                      {t("actions.publish")}
-                    </Button>
-                  ) : (
-                    <Button
-                      onPress={handleSave}
-                      className="button button--primary"
-                    >
-                      {t("actions.saveChanges")}
-                    </Button>
-                  )}
+                  <Button
+                    type="button"
+                    onPress={handleUpdate}
+                    className="button button--primary"
+                  >
+                    {t("actions.saveChanges")}
+                  </Button>
+
                 </div>
               </div>
             </div>
           </form>
         </ContentContainer>
-      </LayoutWithPanel>
+      </LayoutWithPanel >
     </>
   );
 };
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/guidanceGroupIndex.module.scss b/app/[locale]/admin/guidance/groups/[groupId]/guidanceGroupIndex.module.scss
index 1dbcd5474..62dd4c38c 100644
--- a/app/[locale]/admin/guidance/groups/[groupId]/guidanceGroupIndex.module.scss
+++ b/app/[locale]/admin/guidance/groups/[groupId]/guidanceGroupIndex.module.scss
@@ -1,9 +1,56 @@
 @use '@/styles/responsive.scss' as r;
 
-// Removed duplicate .guidanceContent - using shared styles from parent guidance.module.scss
-
 .editGroupButton {
     @include r.device(lg) {
         margin-right: 1rem;
     }
+}
+
+.tagWrapper {
+  display: flex;
+}
+
+.tagDescription {
+  max-height: 200px;
+  max-width: 300px;
+  overflow-y: auto;
+}
+
+.tagInfoPopover {
+  max-width: 500px;
+  section {
+    padding: var(--space-4);
+    margin-bottom: var(--space-4);
+  }
+}
+
+.publishButton {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: var(--space-4);
+}
+
+.guidanceListCard {
+  max-width: 600px;
+  border-bottom: 1px solid var(--gray-100);
+
+}
+
+.buttonWrapper {
+  display: flex;
+  justify-content: flex-end;
+  margin: var(--space-4) 0;
+}
+
+.buttonSmallDisabled {
+  opacity: 0.5; // visually indicate disabled state because tooltip does not work with disabled button
+}
+
+.tooltip {
+  background-color: var(--gray-500);
+  color: var(--gray-50);
+  border-radius: 0.375rem;
+  font-size: var(--fs-small);
 }
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/[groupId]/page.tsx b/app/[locale]/admin/guidance/groups/[groupId]/page.tsx
index b39c88220..83b9e03bd 100644
--- a/app/[locale]/admin/guidance/groups/[groupId]/page.tsx
+++ b/app/[locale]/admin/guidance/groups/[groupId]/page.tsx
@@ -1,40 +1,88 @@
 "use client";
 
-import React, { useEffect, useState } from "react";
-import { Breadcrumb, Breadcrumbs, Link } from "react-aria-components";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
-import { useParams } from "next/navigation";
+import {
+  Breadcrumb,
+  Breadcrumbs,
+  Button,
+  Dialog,
+  DialogTrigger,
+  Link,
+  OverlayArrow,
+  Popover,
+  Tooltip,
+  TooltipTrigger
+} from "react-aria-components";
+import { useParams, useRouter } from "next/navigation";
+
+// GraphQL
+import {
+  useMeQuery,
+  useGuidanceGroupQuery,
+  useGuidanceByGroupQuery,
+  useTagsQuery,
+} from '@/generated/graphql';
+import {
+  addGuidanceTextAction,
+  publishGuidanceGroupAction,
+  unPublishGuidanceGroupAction,
+  updateGuidanceAction
+} from "./actions";
 
 // Components
 import PageHeader from "@/components/PageHeader";
-import DashboardListItem from "@/components/DashboardListItem";
-import { ContentContainer, LayoutContainer } from "@/components/Container";
+import { Card, } from "@/components/Card/card";
+import TinyMCEEditor from "@/components/TinyMCEEditor";
+import { DmpIcon } from "@/components/Icons";
+import Loading from "@/components/Loading";
+import ErrorMessages from "@/components/ErrorMessages";
+
+// Hooks
+import { useFormatDate } from '@/hooks/useFormatDate';
 
+// Utils, other
+import { ContentContainer, LayoutWithPanel, SidebarPanel } from "@/components/Container";
+import { stripHtmlTags } from '@/utils/general';
 import { routePath } from "@/utils/routes";
+import { useToast } from "@/context/ToastContext";
+import logECS from "@/utils/clientLogger";
+import { extractErrors } from "@/utils/errorHandler";
+
+// Types
+import {
+  GuidanceGroup,
+  GuidanceText,
+  TagGuidanceItem,
+  AddGuidanceResponse,
+  UpdateGuidanceTextErrors,
+  AddGuidanceTextErrors,
+  PublishGuidanceGroupErrors,
+  GuidanceGroupStatus
+} from "@/app/types/guidance";
+
 import styles from "./guidanceGroupIndex.module.scss";
-import parentStyles from "../../guidance.module.scss";
-
-// Types for guidance texts
-interface GuidanceText {
-  id: string;
-  title: string;
-  lastUpdated: string;
-  lastUpdatedBy: string;
-  status: "Published" | "Draft" | "Archived";
-  url: string;
-}
-
-interface GuidanceGroup {
-  id: string;
-  title: string;
-  description: string;
-}
 
 const GuidanceGroupIndexPage: React.FC = () => {
   const params = useParams();
+  const router = useRouter();
+  const toastState = useToast();
+  const formatDate = useFormatDate();
+
   const groupId = String(params.groupId);
+
+  //For scrolling to error in page
+  const errorRef = useRef<HTMLDivElement | null>(null);
+
+  // States for guidance group and texts
+  const [guidanceGroup, setGuidanceGroup] = useState<GuidanceGroup>();
   const [guidanceTexts, setGuidanceTexts] = useState<GuidanceText[]>([]);
-  const [guidanceGroup, setGuidanceGroup] = useState<GuidanceGroup | null>(null);
+  const [tagGuidanceList, setTagGuidanceList] = useState<TagGuidanceItem[]>([]);
+  const [savingGuidanceId, setSavingGuidanceId] = useState<string | null>(null);
+  // State for error messages
+  const [errorMessages, setErrorMessages] = useState<string[]>([]);
+  // Track whether there are unsaved changes
+  const [hasUnsavedChanges, setHasUnsavedChanges] = useState<boolean>(false);
 
   // For translations
   const t = useTranslations("Guidance");
@@ -42,55 +90,452 @@ const GuidanceGroupIndexPage: React.FC = () => {
 
   // Set URLs
   const GROUP_EDIT_URL = routePath("admin.guidance.groups.edit", { groupId });
-  const TEXT_CREATE_URL = routePath("admin.guidance.groups.texts.create", { groupId });
 
-  // Fake guidance group data
-  const fakeGuidanceGroup: GuidanceGroup = {
-    id: groupId,
-    title: "School of Health Sciences",
-    description: "Comprehensive guidance for health sciences research and clinical practice",
+  // Helper function to get translated status label
+  const getStatusLabel = (status: GuidanceGroupStatus): string => {
+    switch (status) {
+      case GuidanceGroupStatus.DRAFT:
+        return t('status.draft');
+      case GuidanceGroupStatus.PUBLISHED:
+        return t('status.published');
+      case GuidanceGroupStatus.UNPUBLISHED_CHANGES:
+        return t('status.unpublishedChanges');
+      default:
+        return status;
+    }
   };
 
-  // Fake guidance texts data
-  const fakeGuidanceTexts: GuidanceText[] = [
-    {
-      id: "1",
-      title: "Research Ethics Guidelines",
-      lastUpdated: "2024-01-15",
-      lastUpdatedBy: "Dr. Sarah Johnson",
-      status: "Published",
-      url: routePath("admin.guidance.groups.texts.edit", { groupId, textId: "1" }),
-    },
-    {
-      id: "2",
-      title: "Data Collection Standards",
-      lastUpdated: "2024-01-12",
-      lastUpdatedBy: "Dr. Michael Chen",
-      status: "Published",
-      url: routePath("admin.guidance.groups.texts.edit", { groupId, textId: "2" }),
+  // Query for all tags
+  const { data: tagsData, loading: tagsLoading } = useTagsQuery();
+
+  // Run me query to get user's name
+  const { data: me } = useMeQuery();
+
+  // Fetch guidance group data
+  const { data: guidanceGroupData } = useGuidanceGroupQuery({
+    variables: {
+      guidanceGroupId: Number(groupId)
     },
-    {
-      id: "3",
-      title: "Publication Guidelines",
-      lastUpdated: "2024-01-10",
-      lastUpdatedBy: "Dr. Emily Rodriguez",
-      status: "Draft",
-      url: routePath("admin.guidance.groups.texts.edit", { groupId, textId: "3" }),
+    fetchPolicy: "cache-and-network",
+  });
+
+  // Fetch Guidance Texts by Group Id
+  const { data: guidance, loading: guidanceLoading } = useGuidanceByGroupQuery({
+    variables: {
+      guidanceGroupId: Number(groupId)
     },
-  ];
+    fetchPolicy: "cache-and-network",
+  });
+
+  // Handler to update guidance text in state
+  const handleGuidanceTextChange = (tagId: number, newText: string) => {
+    setTagGuidanceList(prevList =>
+      prevList.map(item => {
+        if (item.tag.id === tagId) {
+          if (item.guidance) {
+            // Update existing guidance
+            return { ...item, guidance: { ...item.guidance, guidanceText: newText } };
+          } else {
+            // Create temporary guidance object for tags without existing guidance
+            return {
+              ...item,
+              guidance: {
+                id: `temp-${tagId}`,
+                guidanceText: newText,
+                lastUpdated: '',
+                lastUpdatedBy: '',
+                url: '',
+                tagId,
+              }
+            };
+          }
+        }
+        return item;
+      })
+    );
+  };
+
+  const handleUnpublish = useCallback(async () => {
+    setErrorMessages([]);
+
+    if (hasUnsavedChanges) {
+      const confirmProceed = window.confirm(
+        Global("messaging.unsavedChangesWarning") + " " + Global("messaging.continueAnyway")
+      );
+      if (!confirmProceed) {
+        return;
+      }
+    }
+
+    if (guidanceGroup?.guidanceGroupId === undefined) {
+      setErrorMessages(['Guidance Group ID is undefined']);
+      return;
+    }
+
+    const response = await unPublishGuidanceGroupAction({
+      guidanceGroupId: guidanceGroup.guidanceGroupId
+    });
+
+    if (response.redirect) {
+      router.push(response.redirect);
+      return;
+    }
+
+    if (!response.success) {
+      setErrorMessages(
+        response.errors?.length ? response.errors : [Global("messaging.somethingWentWrong")]
+      )
+      logECS("error", "Unpublishing Guidance Group", {
+        errors: response.errors,
+        url: { path: routePath("admin.guidance.groups.create") },
+      });
+      return;
+    } else {
+      if (response?.data?.errors) {
+        const errs = extractErrors<PublishGuidanceGroupErrors>(response?.data?.errors, ["general", "affiliationId", "bestPractice", "name", "description"]);
+
+        if (errs.length > 0) {
+          setErrorMessages(errs);
+          logECS("error", "Unpublishing Guidance Group", {
+            errors: errs,
+            url: { path: routePath("admin.guidance.groups.create") },
+          });
+        } else {
+          const successMessage = t("messages.success.guidanceGroupUnpublished", { groupName: guidanceGroup?.name });
+          toastState.add(successMessage, { type: "success" });
+          router.push(routePath("admin.guidance.index"));
+        }
+      }
+    }
+  }, [guidanceGroup, Global, router, hasUnsavedChanges, t, toastState]);
+
+
+  const handlePublish = useCallback(async () => {
+    setErrorMessages([]);
+
+    if (hasUnsavedChanges) {
+      const confirmProceed = window.confirm(
+        Global("messaging.unsavedChangesWarning") + " " + Global("messaging.continueAnyway")
+      );
+      if (!confirmProceed) {
+        return;
+      }
+    }
+
+    if (guidanceGroup?.guidanceGroupId === undefined) {
+      setErrorMessages(['Guidance Group ID is undefined']);
+      return;
+    }
+
+    const response = await publishGuidanceGroupAction({
+      guidanceGroupId: guidanceGroup.guidanceGroupId
+    });
+
+    if (response.redirect) {
+      router.push(response.redirect);
+      return;
+    }
+
+    if (!response.success) {
+      setErrorMessages(
+        response.errors?.length ? response.errors : [Global("messaging.somethingWentWrong")]
+      )
+      logECS("error", "publishing Guidance Group", {
+        errors: response.errors,
+        url: { path: routePath("admin.guidance.groups.create") },
+      });
+      return;
+    } else {
+      if (response?.data?.errors) {
+        const errs = extractErrors<PublishGuidanceGroupErrors>(response?.data?.errors, ["general", "affiliationId", "bestPractice", "name", "description"]);
+
+        if (errs.length > 0) {
+          setErrorMessages(errs);
+          logECS("error", "publishing Guidance Group", {
+            errors: errs,
+            url: { path: routePath("admin.guidance.groups.create") },
+          });
+        } else {
+          const successMessage = t("messages.success.guidanceGroupPublished", { groupName: guidanceGroup?.name });
+          toastState.add(successMessage, { type: "success" });
+          router.push(routePath("admin.guidance.index"));
+        }
+      }
+    }
+  }, [guidanceGroup, Global, router, hasUnsavedChanges, t, toastState]);
+
+  // Handler to update guidance or add new one based on the tagId
+  const handleSaveGuidance = async (tagId: number) => {
+    setErrorMessages([]);
+
+    // Find the guidance based on the tagId
+    const tagItem = tagGuidanceList.find(item => item.tag.id === tagId);
+
+    // If none exists then return
+    if (!tagItem) {
+      return;
+    }
+
+    // Get the text to save from the guidance object
+    const textToSave = tagItem.guidance?.guidanceText ?? "";
+
+    // Use a temporary ID for new guidance that's being saved
+    const savingId = tagItem.guidance?.id ?? `new-${tagId}`;
+    setSavingGuidanceId(savingId);
+
+    // Check if this is a real guidance (has a numeric ID) or a temporary one
+    const isExistingGuidance = tagItem.guidance && !tagItem.guidance.id.startsWith('temp-');
+
+    // If guidance exists, update it; otherwise, create new guidance
+    if (isExistingGuidance && tagItem.guidance) {
+      // Don't need a try-catch block here, as the error is handled in the action
+      const response = await updateGuidanceAction({
+        guidanceId: parseInt(tagItem.guidance.id, 10),
+        guidanceText: textToSave,
+        tagId,
+      });
+
+      if (response.redirect) {
+        router.push(response.redirect);
+        return;
+      }
+
+      if (!response.success) {
+        setErrorMessages(
+          response.errors?.length ? response.errors : [Global("messaging.somethingWentWrong")]
+        )
+        logECS("error", "updating Guidance text", {
+          errors: response.errors,
+          url: { path: routePath("admin.guidance.groups.index", { groupId }) },
+        });
+        return;
+      } else {
+        // Check if there are any GraphQL errors
+        if (response?.data?.errors) {
+          const errs = extractErrors<UpdateGuidanceTextErrors>(response?.data?.errors, ["general", "guidanceGroupId", "guidanceText", "tagId"]);
+
+          if (errs.length > 0) {
+            setErrorMessages(errs);
+            logECS("error", "updating Guidance text", {
+              errors: errs,
+              url: { path: routePath("admin.guidance.groups.index", { groupId }) },
+            });
+            return; // Don't show success if there are errors
+          }
+        }
+
+        // Success case - no errors
+        setHasUnsavedChanges(false);
+        const successMessage = t("messages.success.guidanceTextUpdated", { tagName: tagItem.tag.name });
+        toastState.add(successMessage, { type: "success" });
+
+        // Optimistically update guidance group status if it was previously published
+        setGuidanceGroup(prev => prev && prev.status === GuidanceGroupStatus.PUBLISHED
+          ? { ...prev, status: GuidanceGroupStatus.UNPUBLISHED_CHANGES }
+          : prev);
+      }
+    } else {
+      // Create new guidance since none exists for this tag
+      // Don't need a try-catch block here, as the error is handled in the action
+      const response = await addGuidanceTextAction({
+        guidanceGroupId: Number(groupId),
+        guidanceText: textToSave,
+        tagId,
+      });
+
+      if (response.redirect) {
+        router.push(response.redirect);
+        return;
+      }
+
+      if (!response.success) {
+        setErrorMessages(
+          response.errors?.length ? response.errors : [Global("messaging.somethingWentWrong")]
+        )
+        logECS("error", "adding Guidance text", {
+          errors: response.errors,
+          url: { path: routePath("admin.guidance.groups.index", { groupId }) },
+        });
+        return;
+      } else {
+        // Check if there are any GraphQL errors
+        if (response?.data?.errors) {
+          const errs = extractErrors<AddGuidanceTextErrors>(response?.data?.errors, ["general", "guidanceGroupId", "guidanceText", "tagId"]);
+
+          if (errs.length > 0) {
+            setErrorMessages(errs);
+            logECS("error", "adding Guidance text", {
+              errors: errs,
+              url: { path: routePath("admin.guidance.groups.index", { groupId }) },
+            });
+            return; // Don't show success if there are errors
+          }
+        }
+        // Success case - no errors
+        setHasUnsavedChanges(false);
+        // Optimistically update the local state to reflect the new guidance
+        const newGuidanceId = String((response as AddGuidanceResponse)?.data?.id);
+        if (newGuidanceId) {
+          const newGuidance: GuidanceText = {
+            id: newGuidanceId,
+            guidanceText: textToSave,
+            lastUpdated: '',
+            lastUpdatedBy: `${me?.me?.givenName || ""} ${me?.me?.surName || ""}`.trim(),
+            url: routePath("admin.guidance.groups.texts.edit", { groupId, textId: Number(newGuidanceId) }),
+            tagId,
+          };
+
+          // Update guidanceTexts array
+          setGuidanceTexts(prev => [...prev, newGuidance]);
+
+          // Update tagGuidanceList to link the new guidance to this tag
+          setTagGuidanceList(prev =>
+            prev.map(item =>
+              item.tag.id === tagId
+                ? { ...item, guidance: newGuidance }
+                : item
+            )
+          );
+        }
+
+        // Optimistically update guidance group status if it was previously published
+        setGuidanceGroup(prev => prev && prev.status === GuidanceGroupStatus.PUBLISHED
+          ? { ...prev, status: GuidanceGroupStatus.UNPUBLISHED_CHANGES }
+          : prev);
+
+        const successMessage = t("messages.success.guidanceTextAdded", { tagName: tagItem.tag.name });
+        toastState.add(successMessage, { type: "success" });
+      }
+
+    }
+    setSavingGuidanceId(null);
+  };
+
+  // Set Guidance Texts data in state when fetched
+  useEffect(() => {
+    if (guidance && guidance.guidanceByGroup.length > 0) {
+      const transformedGuidanceTexts = guidance.guidanceByGroup.map((g) => ({
+        id: String(g.id),
+        guidanceText: g.guidanceText || "",
+        lastUpdated: g.modified ? formatDate(g.modified) : "",
+        lastUpdatedBy: `${g.modifiedBy?.givenName} ${g.modifiedBy?.surName}`,
+        url: routePath("admin.guidance.groups.texts.edit", { groupId, textId: Number(g.id) }),
+        tagId: typeof g.tagId === 'number' ? g.tagId : 0,
+      }));
+
+      setGuidanceTexts(transformedGuidanceTexts);
+    }
+  }, [guidance]);
+
+  // Build the tag-guidance mapping whenever tags or guidance data changes
+  useEffect(() => {
+    if (tagsData?.tags && guidanceTexts) {
+      // Only include tags that have a valid numeric id to avoid runtime/type errors downstream
+      const validTags = tagsData.tags.filter((tag) => typeof tag.id === 'number');
+
+      const tagGuidanceMap: TagGuidanceItem[] = validTags.map(tag => {
+        // Find the guidance that has this tag
+        const matchingGuidance = guidanceTexts.find(g => g.tagId === (tag.id as number));
+
+        return {
+          tag: {
+            id: tag.id as number,
+            name: tag.name,
+            description: tag.description || undefined,
+          },
+          guidance: matchingGuidance || null,
+        };
+      });
+
+      setTagGuidanceList(tagGuidanceMap);
+    }
+  }, [tagsData, guidanceTexts]);
+
+
+  useEffect(() => {
+    // Set Guidance Group data in state when fetched. We need this for publishing the group
+    if (guidanceGroupData && guidanceGroupData.guidanceGroup) {
+
+      // Get the latest version and check if it's active
+      const latestVersion = guidanceGroupData.guidanceGroup.versionedGuidanceGroup?.[0];
+      const isLatestVersionActive = latestVersion?.active ?? false;
+
+      // Publish status is determined based on isDirty and latestPublishedDate, and on whether the latest version of versionedGuidanceGroup is active
+      const currentStatus = guidanceGroupData.guidanceGroup.isDirty && guidanceGroupData.guidanceGroup.latestPublishedDate
+        ? GuidanceGroupStatus.UNPUBLISHED_CHANGES
+        : !guidanceGroupData.guidanceGroup.latestPublishedDate || !isLatestVersionActive
+          ? GuidanceGroupStatus.DRAFT
+          : GuidanceGroupStatus.PUBLISHED;
 
+      const transformedGuidanceGroup: GuidanceGroup = {
+        guidanceGroupId: Number(guidanceGroupData.guidanceGroup?.id),
+        name: guidanceGroupData.guidanceGroup.name || 'Untitled Guidance Group',
+        description: guidanceGroupData.guidanceGroup.description || '',
+        optionalSubset: guidanceGroupData.guidanceGroup.optionalSubset || false,
+        bestPractice: guidanceGroupData.guidanceGroup.bestPractice || false,
+        status: currentStatus,
+        lastPublishedDate: guidanceGroupData.guidanceGroup.latestPublishedDate ? formatDate(guidanceGroupData.guidanceGroup.latestPublishedDate) : '',
+      }
+
+      setGuidanceGroup(transformedGuidanceGroup);
+    };
+  }, [guidanceGroupData]);
+
+  // Intercept browser back/forward navigation to warn user of unsaved changes
   useEffect(() => {
-    // Set fake data on component mount
-    setGuidanceGroup(fakeGuidanceGroup);
-    setGuidanceTexts(fakeGuidanceTexts);
-  }, [groupId]);
+    if (!hasUnsavedChanges) return;
+
+    const handlePopState = () => {
+      const confirmLeave = window.confirm(
+        Global("messaging.unsavedChangesWarning"));
+
+      if (!confirmLeave) {
+        // Push current state back to prevent navigation
+        window.history.pushState(null, '', window.location.href);
+      } else {
+        // User confirmed - allow navigation by going back
+        setHasUnsavedChanges(false);
+        window.history.back();
+      }
+    };
+
+    // Push a state to enable popstate detection
+    window.history.pushState(null, '', window.location.href);
+    window.addEventListener('popstate', handlePopState);
+
+    return () => {
+      window.removeEventListener('popstate', handlePopState);
+    };
+  }, [hasUnsavedChanges, Global]);
+
+  // Warn user of unsaved changes if they try to leave the page if they click on links or refresh/close the tab
+  useEffect(() => {
+    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
+      if (hasUnsavedChanges) {
+        e.preventDefault();
+        e.returnValue = ''; // Required for Chrome/Firefox to show the confirm dialog
+      }
+    };
+
+    window.addEventListener('beforeunload', handleBeforeUnload);
+    return () => {
+      window.removeEventListener('beforeunload', handleBeforeUnload);
+    };
+  }, [hasUnsavedChanges]);
+
+
+  // Determine button disabled states
+  const isUnpublishUnavailable =
+    !guidanceGroup || guidanceGroup.status === GuidanceGroupStatus.DRAFT;
+
+  const isPublishUnavailable = !guidanceGroup || guidanceGroup.status === GuidanceGroupStatus.PUBLISHED;
 
   return (
     <>
       <PageHeader
-        title={guidanceGroup?.title || t("pages.groupIndex.title")}
-        description={guidanceGroup?.description || t("pages.groupIndex.description")}
-        showBackButton={true}
+        title={t("pages.groupIndex.title", { groupName: guidanceGroup?.name || "" })}
+        description={t("pages.groupIndex.description")}
+        showBackButton={false}
         breadcrumbs={
           <Breadcrumbs>
             <Breadcrumb>
@@ -99,7 +544,7 @@ const GuidanceGroupIndexPage: React.FC = () => {
             <Breadcrumb>
               <Link href={routePath("admin.guidance.index")}>{t("breadcrumbs.guidanceGroups")}</Link>
             </Breadcrumb>
-            <Breadcrumb>{guidanceGroup?.title || t("breadcrumbs.group")}</Breadcrumb>
+            <Breadcrumb>{t("breadcrumbs.group")}</Breadcrumb>
           </Breadcrumbs>
         }
         actions={
@@ -110,48 +555,179 @@ const GuidanceGroupIndexPage: React.FC = () => {
             >
               {t("pages.groupIndex.editGroup")}
             </Link>
-            <Link
-              href={TEXT_CREATE_URL}
-              className="button-link button--primary"
-            >
-              {t("pages.groupIndex.createText")}
-            </Link>
           </>
         }
         className="page-guidance-group-index"
       />
 
-      <LayoutContainer>
+      <ErrorMessages ref={errorRef} errors={errorMessages} />
+
+      <LayoutWithPanel>
         <ContentContainer>
-          <div
-            className="guidance-texts-list"
-            aria-label="Guidance texts list"
-            role="list"
-          >
-            {guidanceTexts.map((text) => (
-              <DashboardListItem
-                key={text.id}
-                heading={text.title}
-                url={text.url}
-              >
-                <div className={parentStyles.guidanceContent}>
-                  <div className={parentStyles.metadata}>
-                    <span>
-                      {Global("lastRevisedBy")}: {text.lastUpdatedBy}
-                    </span>
-                    <span className={parentStyles.separator}>
-                      {Global("lastUpdated")}: {text.lastUpdated}
-                    </span>
-                    <span className={parentStyles.separator}>
-                      {t("status.status")}: {text.status}
-                    </span>
-                  </div>
+          {tagsLoading || guidanceLoading ? (
+            <Loading />
+          ) : (
+            <Card data-testid='guidance-card'>
+              {tagGuidanceList
+                .filter((it) => typeof it.tag.id === 'number')
+                .map((item) => {
+                  const tagId = item.tag.id as number;
+                  return (
+                    <div
+                      key={tagId}
+                      className={styles.guidanceListCard}
+                    >
+
+                      <div className={styles.tagWrapper}>
+                        <h2 id={`contentLabel-${item.tag.id}`} className="h3">
+                          {item.tag.name}
+                        </h2>
+                        {/*Display tooltip to user when they click the info icon*/}
+                        <DialogTrigger>
+                          <Button className="popover-btn" aria-label="Click for more info"><div className="icon info"><DmpIcon icon="info" /></div></Button>
+                          <Popover className={`${styles.tagInfoPopover} react-aria-Popover`}>
+                            <OverlayArrow>
+                              <svg width={12} height={12} viewBox="0 0 12 12">
+                                <path d="M0 0 L6 6 L12 0" />
+                              </svg>
+                            </OverlayArrow>
+                            <Dialog>
+                              <div className={styles.tagDescription}>
+                                {stripHtmlTags(item.tag.description)}
+                              </div>
+                            </Dialog>
+                          </Popover>
+                        </DialogTrigger>
+                      </div>
+
+
+                      <div>
+                        <TinyMCEEditor
+                          content={item.guidance?.guidanceText ?? ""}
+                          setContent={(value) => {
+                            handleGuidanceTextChange(tagId, value);
+                            setHasUnsavedChanges(true);
+                          }}
+                          id={`content-${tagId}`}
+                          labelId={`contentLabel-${tagId}`}
+                        />
+                      </div>
+
+                      <div className={styles.buttonWrapper}>
+                        <Button
+                          onPress={() => handleSaveGuidance(tagId)}
+                          isDisabled={savingGuidanceId === item.guidance?.id || savingGuidanceId === `new-${tagId}`}
+                          className="button--primary"
+                        >
+                          {(savingGuidanceId === item.guidance?.id || savingGuidanceId === `new-${tagId}`)
+                            ? Global("buttons.saving") || "Saving..."
+                            : Global("buttons.save") || "Save"}
+                        </Button>
+                      </div>
+                    </div>
+                  )
+                })}
+
+              {tagGuidanceList.length === 0 && (
+                <div style={{ padding: '2rem', textAlign: 'center' }}>
+                  <p>{t("pages.groupIndex.noTags") || "No tags available."}</p>
                 </div>
-              </DashboardListItem>
-            ))}
-          </div>
+              )}
+            </Card>
+          )}
         </ContentContainer>
-      </LayoutContainer>
+        <SidebarPanel>
+          <div className={`statusPanelContent sidePanel`}>
+            <div className="button-container withBorder  mb-5">
+              {/*Unpublish Button*/}
+              {(isUnpublishUnavailable) ? (
+                <>
+                  <TooltipTrigger delay={0}>
+                    <Button
+                      className={`${styles.buttonSmallDisabled} secondary`}
+                      aria-disabled={true}
+                      aria-describedby="unpublish-help"
+                      onPress={() => {
+                        // Block activation when disabled
+                        return;
+                      }}
+                    >
+                      {Global("buttons.unpublish")}
+                    </Button>
+                    <Tooltip
+                      placement="bottom"
+                      className={`${styles.tooltip} py-2 px-2`}
+                    >
+                      {t('messages.unPublishBtnTooltipMessage')}
+                    </Tooltip>
+                  </TooltipTrigger>
+                  {/* Persistent description for screen readers */}
+                  <span id="unpublish-help" className="hidden-accessibly">
+                    {t('messages.unPublishBtnTooltipMessage')}
+                  </span>
+                </>
+              ) : (
+                <Button
+                  onPress={handleUnpublish}
+                  className="secondary"
+                >
+                  {Global("buttons.unpublish")}
+                </Button>
+              )}
+
+              {/*Publish Button*/}
+              {(isPublishUnavailable) ? (
+                <>
+                  <TooltipTrigger delay={0}>
+                    <Button
+                      className={`${styles.buttonSmallDisabled}`}
+                      aria-disabled={true}
+                      aria-describedby="publish-help"
+                      onPress={() => {
+                        // Block activation when disabled
+                        return;
+                      }}
+                    >
+                      {Global("buttons.publish")}
+                    </Button>
+                    <Tooltip
+                      placement="bottom"
+                      className={`${styles.tooltip} py-2 px-2`}
+                    >
+                      {t('messages.publishBtnTooltipMessage')}
+                    </Tooltip>
+                  </TooltipTrigger>
+                  {/* Persistent description for screen readers */}
+                  <span id="publish-help" className="hidden-accessibly">
+                    {t('messages.publishBtnTooltipMessage')}
+                  </span>
+                </>
+              ) : (
+                <Button
+                  onPress={handlePublish}
+                >
+                  {Global("buttons.publish")}
+                </Button>
+              )}
+            </div>
+            <div className="sidePanelContent">
+              <div className={`panelRow mb-5`}>
+                <div>
+                  <h3>{t('status.publicationStatus')}</h3>
+                  <p>{guidanceGroup?.status ? getStatusLabel(guidanceGroup.status) : ''}</p>
+                </div>
+              </div>
+            </div>
+
+            <div className={`panelRow mb-5`}>
+              <div>
+                <h3>{t('status.lastPublished')}</h3>
+                <p>{guidanceGroup?.lastPublishedDate || t('status.notYetPublished')}</p>
+              </div>
+            </div>
+          </div>
+        </SidebarPanel>
+      </LayoutWithPanel >
     </>
   );
 };
diff --git a/app/[locale]/admin/guidance/groups/create/__tests__/page.spec.tsx b/app/[locale]/admin/guidance/groups/create/__tests__/page.spec.tsx
index f0fe10713..ed0e3ff22 100644
--- a/app/[locale]/admin/guidance/groups/create/__tests__/page.spec.tsx
+++ b/app/[locale]/admin/guidance/groups/create/__tests__/page.spec.tsx
@@ -1,8 +1,21 @@
 import React from "react";
-import { render, screen, waitFor, fireEvent } from "@testing-library/react";
+import { render, screen, waitFor, fireEvent, waitForElementToBeRemoved } from "@testing-library/react";
 import "@testing-library/jest-dom";
 import { axe, toHaveNoViolations } from "jest-axe";
+import {
+  MeDocument,
+} from "@/generated/graphql";
+import {
+  addGuidanceGroupAction
+} from '../actions';
+import { MockedProvider } from "@apollo/client/testing";
+import { useFormatter, useTranslations } from "next-intl";
+import { useParams, useRouter } from 'next/navigation';
+import logECS from '@/utils/clientLogger';
+import { useToast } from '@/context/ToastContext';
+import { mockScrollIntoView } from '@/__mocks__/common';
 
+import mockMeData from "../../../__mocks__/mockMeData.json";
 import GuidanceGroupCreatePage from "../page";
 
 // Mock Next.js navigation
@@ -15,105 +28,284 @@ jest.mock("next/navigation", () => ({
   }),
 }));
 
+jest.mock('../actions/index', () => ({
+  addGuidanceGroupAction: jest.fn(),
+}));
+
+// Mock next-intl hooks
+jest.mock("next-intl", () => ({
+  useFormatter: jest.fn(),
+  useTranslations: jest.fn(),
+}));
+
+jest.mock('next/navigation', () => ({
+  useRouter: jest.fn(),
+  useParams: jest.fn()
+}));
+
+const mockRouter = {
+  push: jest.fn(),
+};
+
+const mockToast = {
+  add: jest.fn(),
+};
+
+
 expect.extend(toHaveNoViolations);
 
+const mocks = [
+  {
+    request: {
+      query: MeDocument,
+    },
+    result: {
+      data: mockMeData,
+    },
+  },
+]
+
 describe("GuidanceGroupCreatePage", () => {
   beforeEach(() => {
     window.scrollTo = jest.fn();
+    HTMLElement.prototype.scrollIntoView = mockScrollIntoView;
+
+    const mockUseParams = useParams as jest.Mock;
+    // Mock the return value of useParams
+    mockUseParams.mockReturnValue({ groupId: 2397 });
+
+    // Mock Toast
+    (useToast as jest.Mock).mockReturnValue(mockToast);
+
+    (useRouter as jest.Mock).mockReturnValue(mockRouter);
+
+    (useFormatter as jest.Mock).mockReturnValue({
+      dateTime: jest.fn((date) => date.toLocaleDateString()),
+    });
+
+    (useTranslations as jest.Mock).mockImplementation((namespace) => {
+      return (key: string) => `${namespace}.${key}`;
+    });
   });
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
-  it("should render the form with group name input", () => {
-    render(<GuidanceGroupCreatePage />);
-
-    const nameInput = screen.getByLabelText("fields.groupName.label");
+  it("should render the correct form data", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
+    expect(screen.getByRole("heading", { name: "Guidance.pages.groupCreate.title" })).toBeInTheDocument();
+    expect(screen.getByText("Guidance.pages.groupCreate.description")).toBeInTheDocument();
+    expect(screen.getByLabelText("Guidance.fields.groupName.label", { exact: false })).toBeInTheDocument();
+    const nameInput = document.querySelector('#name');
     expect(nameInput).toBeInTheDocument();
-    expect(nameInput).toHaveAttribute("placeholder", "fields.groupName.placeholder");
+    expect(screen.getByLabelText("Guidance.fields.groupDescription.label")).toBeInTheDocument();
+    const descriptionInput = document.querySelector('#description');
+    expect(descriptionInput).toBeInTheDocument();
+    const createButton = screen.getByRole("button", { name: "Guidance.actions.createGroup" });
+    expect(createButton).toBeInTheDocument();
   });
 
-  it("should render the settings section", () => {
-    render(<GuidanceGroupCreatePage />);
-
-    expect(screen.getByText("fields.settings.label")).toBeInTheDocument();
-  });
+  it("should handle group name input changes", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
 
-  it("should render settings checkboxes", () => {
-    render(<GuidanceGroupCreatePage />);
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes.length).toBeGreaterThan(0);
+    const nameInput = document.querySelector('#name');
+    expect(nameInput).toBeInTheDocument();
+    fireEvent.change(nameInput!, { target: { value: "New Group Name" } });
+    expect((nameInput as HTMLInputElement).value).toBe("New Group Name");
   });
 
-  it("should render the create button", () => {
-    render(<GuidanceGroupCreatePage />);
+  it("should handle group description input changes", async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
+
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    expect(screen.getByText("actions.createGroup")).toBeInTheDocument();
+    const descriptionInput = document.querySelector('#description');
+    expect(descriptionInput).toBeInTheDocument();
+    fireEvent.change(descriptionInput!, { target: { value: "New Group Description" } });
+    expect((descriptionInput as HTMLInputElement).value).toBe("New Group Description");
   });
 
-  it("should have form element present", () => {
-    render(<GuidanceGroupCreatePage />);
+  it("should handle submittal of the form", async () => {
+    (addGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 999, errors: {
+          general: null
+        }
+      },
+      redirect: undefined,
+    });
 
-    const form = document.querySelector("form");
-    expect(form).toBeInTheDocument();
-  });
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
 
-  it("should handle group name input changes", () => {
-    render(<GuidanceGroupCreatePage />);
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    const nameInput = screen.getByLabelText("fields.groupName.label") as HTMLInputElement;
-    fireEvent.change(nameInput, { target: { value: "Test Group" } });
+    const nameInput = document.querySelector('#name');
+    expect(nameInput).toBeInTheDocument();
+    fireEvent.change(nameInput!, { target: { value: "New Group Name" } });
+    expect((nameInput as HTMLInputElement).value).toBe("New Group Name");
+    const createButton = screen.getByRole("button", { name: "Guidance.actions.createGroup" });
+    fireEvent.click(createButton);
+    await waitFor(() => {
+      expect(addGuidanceGroupAction).toHaveBeenCalledTimes(1);
+      expect(addGuidanceGroupAction).toHaveBeenCalledWith({
+        affiliationId: "https://ror.org/03yrm5c12",
+        bestPractice: false,
+        name: "New Group Name",
+        description: "",
+      });
+    });
+    expect(mockToast.add).toHaveBeenCalledWith('Guidance.messages.success.guidanceGroupCreated', { type: 'success' });
 
-    expect(nameInput.value).toBe("Test Group");
   });
 
-  it("should handle checkbox interactions", () => {
-    render(<GuidanceGroupCreatePage />);
+  it("should display error if call to addGuidanceGroupAction fails", async () => {
+    (addGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: false,
+      errors: ["Name already exists."],
+    });
 
-    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
-    const firstCheckbox = checkboxes[0];
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
 
-    fireEvent.click(firstCheckbox);
-    // Just verify the click doesn't cause errors
-    expect(firstCheckbox).toBeInTheDocument();
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
+
+    const nameInput = document.querySelector('#name');
+    expect(nameInput).toBeInTheDocument();
+    fireEvent.change(nameInput!, { target: { value: "New Group Name" } });
+    expect((nameInput as HTMLInputElement).value).toBe("New Group Name");
+    const createButton = screen.getByRole("button", { name: "Guidance.actions.createGroup" });
+    fireEvent.click(createButton);
+    await waitFor(() => {
+      expect(screen.getByText('Name already exists.')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'creating Guidance Group',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/create' },
+        })
+      )
+    });
   });
 
-  it("should handle checkbox selection", () => {
-    render(<GuidanceGroupCreatePage />);
+  it("should display error if addGuidanceGroupAction returns field-level errors", async () => {
+    (addGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 999,
+        errors: {
+          general: "There was a general error"
+        }
+      },
+      redirect: undefined,
+    });
 
-    const checkboxes = screen.getAllByRole("checkbox") as HTMLInputElement[];
-    expect(checkboxes.length).toBeGreaterThan(0);
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
 
-    const firstCheckbox = checkboxes[0];
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    fireEvent.click(firstCheckbox);
-    // The checkbox state should potentially change (depends on implementation)
-    expect(firstCheckbox).toBeInTheDocument();
+    const nameInput = document.querySelector('#name');
+    expect(nameInput).toBeInTheDocument();
+    fireEvent.change(nameInput!, { target: { value: "New Group Name" } });
+    expect((nameInput as HTMLInputElement).value).toBe("New Group Name");
+    const createButton = screen.getByRole("button", { name: "Guidance.actions.createGroup" });
+    fireEvent.click(createButton);
+    await waitFor(() => {
+      expect(screen.getByText('There was a general error')).toBeInTheDocument();
+      //Check that error logged
+      expect(logECS).toHaveBeenCalledWith(
+        'error',
+        'creating Guidance Group',
+        expect.objectContaining({
+          errors: expect.anything(),
+          url: { path: '/en-US/admin/guidance/groups/create' },
+        })
+      )
+    });
   });
 
-  it("should render setting descriptions", () => {
-    render(<GuidanceGroupCreatePage />);
+  it("should redirect if addGuidanceGroupAction returns a redirect", async () => {
+    (addGuidanceGroupAction as jest.Mock).mockResolvedValue({
+      success: true,
+      data: {
+        id: 999,
+        errors: {
+          general: null
+        }
+      },
+      redirect: "/en-US/admin/guidance/groups",
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
 
-    // Check that setting descriptions are rendered inline within checkbox labels
-    // Based on the HTML structure, descriptions are shown in parentheses after the setting names
-    expect(screen.getByText(/e\.g\. School\/ Department/)).toBeInTheDocument();
-    expect(screen.getByText(/for optimal guidance creation/)).toBeInTheDocument();
-    expect(screen.getByText(/for enhanced readability/)).toBeInTheDocument();
+    // Wait for loading to be gone (tagsLoading and guidanceLoading both false)
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    // Alternative approach: Check for the complete label text including descriptions
-    expect(screen.getByText(/Optional subset.*\(.*e\.g\. School\/ Department.*\)/)).toBeInTheDocument();
-    expect(screen.getByText(/Requires coffee.*\(.*for optimal guidance creation.*\)/)).toBeInTheDocument();
-    expect(screen.getByText(/Includes emojis.*\(.*for enhanced readability.*\)/)).toBeInTheDocument();
+    const nameInput = document.querySelector('#name');
+    expect(nameInput).toBeInTheDocument();
+    fireEvent.change(nameInput!, { target: { value: "New Group Name" } });
+    expect((nameInput as HTMLInputElement).value).toBe("New Group Name");
+    const createButton = screen.getByRole("button", { name: "Guidance.actions.createGroup" });
+    fireEvent.click(createButton);
+    await waitFor(() => {
+      expect(mockRouter.push).toHaveBeenCalledWith("/en-US/admin/guidance/groups");
+      expect(addGuidanceGroupAction).toHaveBeenCalledWith({
+        affiliationId: "https://ror.org/03yrm5c12",
+        bestPractice: false,
+        name: "New Group Name",
+        description: "",
+      });
+    });
   });
 
   it("should pass accessibility tests", async () => {
-    const { container } = render(<GuidanceGroupCreatePage />);
+    const { container } = render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <GuidanceGroupCreatePage />
+      </MockedProvider>,
+    );
+
+    await waitForElementToBeRemoved(() => screen.getByText("Global.messaging.loading"));
 
-    await waitFor(() => {
-      expect(screen.getByLabelText("fields.groupName.label")).toBeInTheDocument();
-    });
 
     const results = await axe(container);
     expect(results).toHaveNoViolations();
diff --git a/app/[locale]/admin/guidance/groups/create/actions/addGuidanceGroupAction.tsx b/app/[locale]/admin/guidance/groups/create/actions/addGuidanceGroupAction.tsx
new file mode 100644
index 000000000..bb0a0e066
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/create/actions/addGuidanceGroupAction.tsx
@@ -0,0 +1,31 @@
+"use server";
+
+import { executeGraphQLMutation } from "@/utils/server/graphqlServerActionHandler";
+import { ActionResponse } from "@/app/types";
+import { AddGuidanceGroupDocument } from "@/generated/graphql";
+
+export async function addGuidanceGroupAction({
+  affiliationId,
+  bestPractice,
+  name,
+  description,
+}: {
+  affiliationId: string;
+  bestPractice: boolean;
+  name: string;
+  description: string;
+}): Promise<ActionResponse> {
+  // Execute the mutation using the shared handler
+  return await executeGraphQLMutation({
+    document: AddGuidanceGroupDocument,
+    variables: {
+      input: {
+        affiliationId,
+        bestPractice,
+        name,
+        description,
+      }
+    },
+    dataPath: "addGuidanceGroup"
+  });
+}
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/groups/create/actions/index.tsx b/app/[locale]/admin/guidance/groups/create/actions/index.tsx
new file mode 100644
index 000000000..c4ae958d3
--- /dev/null
+++ b/app/[locale]/admin/guidance/groups/create/actions/index.tsx
@@ -0,0 +1 @@
+export { addGuidanceGroupAction } from './addGuidanceGroupAction';
diff --git a/app/[locale]/admin/guidance/groups/create/page.tsx b/app/[locale]/admin/guidance/groups/create/page.tsx
index cb1f3849b..d83ff13d9 100644
--- a/app/[locale]/admin/guidance/groups/create/page.tsx
+++ b/app/[locale]/admin/guidance/groups/create/page.tsx
@@ -1,64 +1,138 @@
 "use client";
 
-import React, { useState } from "react";
-import { Breadcrumb, Breadcrumbs, Link, Button, Checkbox } from "react-aria-components";
+import React, { useCallback, useRef, useState } from "react";
+import {
+  Breadcrumb,
+  Breadcrumbs,
+  Button,
+  Form,
+  Link,
+} from "react-aria-components";
 import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+
+// GraphQL
+import {
+  useMeQuery,
+} from '@/generated/graphql';
+import { addGuidanceGroupAction } from "./actions";
 
 // Components
 import PageHeader from "@/components/PageHeader";
 import { ContentContainer, LayoutWithPanel } from "@/components/Container";
-import { FormInput, CheckboxGroupComponent } from "@/components/Form";
+import { FormInput } from "@/components/Form";
+import ErrorMessages from "@/components/ErrorMessages";
 
+// Utils, other
+import logECS from "@/utils/clientLogger";
 import { routePath } from "@/utils/routes";
+import { extractErrors } from "@/utils/errorHandler";
+import { useToast } from "@/context/ToastContext";
 import styles from "./guidanceGroupCreate.module.scss";
+import Loading from "@/components/Loading";
 
-interface GuidanceGroupSetting {
-  id: string;
+export interface GuidanceGroupInterface {
+  affiliationId: string;
+  bestPractice: boolean;
   name: string;
   description: string;
-  enabled: boolean;
 }
 
-interface GuidanceGroup {
-  title: string;
-  settings: GuidanceGroupSetting[];
-  status: "Published" | "Draft";
-}
+type AddGuidanceGroupErrors = {
+  general?: string;
+  affiliationId?: string;
+  bestPractice?: string;
+  name?: string;
+  description?: string;
+};
+
 
 const GuidanceGroupCreatePage: React.FC = () => {
+  const router = useRouter();
+  const toastState = useToast();
+
   // For translations
   const t = useTranslations("Guidance");
   const Global = useTranslations("Global");
 
-  const [guidanceGroup, setGuidanceGroup] = useState<GuidanceGroup>({
-    title: "",
-    settings: [
-      {
-        id: "optional-subset",
-        name: "Optional subset",
-        description: "e.g. School/ Department",
-        enabled: false,
-      },
-      {
-        id: "requires-coffee",
-        name: "Requires coffee",
-        description: "for optimal guidance creation",
-        enabled: false,
-      },
-      {
-        id: "includes-emojis",
-        name: "Includes emojis",
-        description: "for enhanced readability",
-        enabled: false,
-      },
-    ],
-    status: "Draft",
+  //For scrolling to error in page
+  const errorRef = useRef<HTMLDivElement | null>(null);
+
+  // Run me query to get user's affiliationId
+  const { data: me, loading } = useMeQuery();
+
+  const [errorMessages, setErrorMessages] = useState<string[]>([]);
+  const [guidanceGroup, setGuidanceGroup] = useState<GuidanceGroupInterface>({
+    affiliationId: "",
+    bestPractice: false,
+    name: "",
+    description: "",
   });
 
-  const handleSave = () => {
-    // TODO: Implement save functionality
-    // console.log("Creating guidance group:", guidanceGroup);
-  };
+  // Call Server Action addGuidanceGroupAction
+  const addGuidanceGroup = useCallback(async (guidanceGroup: GuidanceGroupInterface) => {
+    const response = await addGuidanceGroupAction(guidanceGroup);
+
+    if (response.redirect) {
+      router.push(response.redirect);
+    }
+
+    return {
+      success: response.success,
+      errors: response.errors,
+      data: response.data,
+    };
+  }, []);
+
+  const handleSubmit = useCallback(async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    const affiliationId = me?.me?.affiliation?.uri;
+
+    if (!affiliationId) {
+      logECS("error", "creating Guidance Group", {
+        error: "no affiliation found for user",
+        url: { path: routePath("admin.guidance.groups.create") },
+      });
+      setErrorMessages([Global("messages.somethingWentWrong")]);
+      return;
+    }
+
+    const response = await addGuidanceGroup({
+      ...guidanceGroup,
+      affiliationId,
+    });
+
+    if (!response.success) {
+      setErrorMessages(
+        response.errors?.length ? response.errors : [Global("messaging.somethingWentWrong")]
+      )
+      logECS("error", "creating Guidance Group", {
+        errors: response.errors,
+        url: { path: routePath("admin.guidance.groups.create") },
+      });
+      return;
+    } else {
+      if (response?.data?.errors) {
+        const errs = extractErrors<AddGuidanceGroupErrors>(response?.data?.errors, ["general", "affiliationId", "bestPractice", "name"]);
+
+        if (errs.length > 0) {
+          setErrorMessages(errs);
+          logECS("error", "creating Guidance Group", {
+            errors: errs,
+            url: { path: routePath("admin.guidance.groups.create") },
+          });
+        } else {
+          const successMessage = t("messages.success.guidanceGroupCreated", { groupName: guidanceGroup.name });
+          toastState.add(successMessage, { type: "success" });
+          router.push(routePath("admin.guidance.index"));
+        }
+      }
+    }
+  }, [me, guidanceGroup]);
+
+  if (loading) {
+    return <Loading />;
+  }
 
   return (
     <>
@@ -80,63 +154,46 @@ const GuidanceGroupCreatePage: React.FC = () => {
         className="page-guidance-group-create"
       />
 
+      <ErrorMessages errors={errorMessages} ref={errorRef} />
+
       <LayoutWithPanel>
         <ContentContainer>
-          <form className={styles.createForm}>
+          <Form className={styles.createForm} onSubmit={handleSubmit}>
             {/* Guidance Group Section */}
 
             <div className="sectionContainer mt-0">
               <div className="sectionContent">
                 <div className={styles.formGroup}>
                   <FormInput
-                    name="title"
+                    name="name"
+                    id="name"
                     label={t("fields.groupName.label")}
-                    value={guidanceGroup.title}
-                    onChange={(e) => setGuidanceGroup({ ...guidanceGroup, title: e.target.value })}
+                    value={guidanceGroup.name}
+                    onChange={(e) => {
+                      setGuidanceGroup({ ...guidanceGroup, name: e.target.value });
+                      setErrorMessages([]);
+                    }}
                     placeholder={t("fields.groupName.placeholder")}
+                    isRequiredVisualOnly={true}
                   />
-                </div>
 
-                <div className={styles.formGroup}>
-                  <CheckboxGroupComponent
-                    name="guidanceGroupSettings"
-                    checkboxGroupLabel={t("fields.settings.label")}
-                    value={guidanceGroup.settings.filter((s) => s.enabled).map((s) => s.id)}
-                    onChange={(value) => {
-                      // Update all settings based on the new value array
-                      const updatedSettings = guidanceGroup.settings.map((setting) => ({
-                        ...setting,
-                        enabled: value.includes(setting.id),
-                      }));
-                      setGuidanceGroup({ ...guidanceGroup, settings: updatedSettings });
+                  <FormInput
+                    name="description"
+                    id="description"
+                    label={t("fields.groupDescription.label")}
+                    value={guidanceGroup.description}
+                    onChange={(e) => {
+                      setGuidanceGroup({ ...guidanceGroup, description: e.target.value });
+                      setErrorMessages([]);
                     }}
-                  >
-                    <div className="">
-                      {guidanceGroup.settings.map((setting) => (
-                        <Checkbox
-                          key={setting.id}
-                          value={setting.id}
-                        >
-                          <div className="checkbox">
-                            <svg
-                              viewBox="0 0 18 18"
-                              aria-hidden="true"
-                            >
-                              <polyline points="1 9 7 14 15 4" />
-                            </svg>
-                          </div>
-                          <span className="checkbox-label">
-                            {setting.name} ({setting.description})
-                          </span>
-                        </Checkbox>
-                      ))}
-                    </div>
-                  </CheckboxGroupComponent>
+                    placeholder={t("fields.groupDescription.placeholder")}
+                    helpMessage={t("fields.groupDescription.helpText")}
+                  />
                 </div>
 
                 <div className={styles.formGroup}>
                   <Button
-                    onPress={handleSave}
+                    type="submit"
                     className="button button--primary"
                   >
                     {t("actions.createGroup")}
@@ -144,7 +201,7 @@ const GuidanceGroupCreatePage: React.FC = () => {
                 </div>
               </div>
             </div>
-          </form>
+          </Form>
         </ContentContainer>
       </LayoutWithPanel>
     </>
diff --git a/app/[locale]/admin/guidance/guidance.module.scss b/app/[locale]/admin/guidance/guidance.module.scss
index ececf941a..6777c73bc 100644
--- a/app/[locale]/admin/guidance/guidance.module.scss
+++ b/app/[locale]/admin/guidance/guidance.module.scss
@@ -30,4 +30,11 @@
             }
         }
     }
+}
+
+/* Remove default list bullets and spacing for guidance list */
+.guidanceList {
+  list-style: none;
+  margin: 0;
+  padding: 0;
 }
\ No newline at end of file
diff --git a/app/[locale]/admin/guidance/page.tsx b/app/[locale]/admin/guidance/page.tsx
index d4cc571a3..9d50906e0 100644
--- a/app/[locale]/admin/guidance/page.tsx
+++ b/app/[locale]/admin/guidance/page.tsx
@@ -1,31 +1,30 @@
 "use client";
 
-import React, { useEffect, useState } from "react";
+import React, { useMemo } from "react";
 import { Breadcrumb, Breadcrumbs, Link } from "react-aria-components";
 import { useTranslations } from "next-intl";
 
+// GraphQL
+import {
+  useMeQuery,
+  useTagsQuery,
+  useGuidanceGroupsQuery
+} from '@/generated/graphql';
+
+
 // Components
 import PageHeader from "@/components/PageHeader";
 import DashboardListItem from "@/components/DashboardListItem";
 import { ContentContainer, LayoutContainer } from "@/components/Container";
+import Loading from "@/components/Loading";
 
+// Hooks
+import { useFormatDate } from "@/hooks/useFormatDate";
 import { routePath } from "@/utils/routes";
 import styles from "./guidance.module.scss";
 
-// Types for guidance groups
-interface GuidanceGroup {
-  id: string;
-  title: string;
-  description: string;
-  lastUpdated: string;
-  lastUpdatedBy: string;
-  status: "Published" | "Draft" | "Archived";
-  textCount: number;
-  url: string;
-}
-
 const GuidancePage: React.FC = () => {
-  const [guidanceGroups, setGuidanceGroups] = useState<GuidanceGroup[]>([]);
+  const formatDate = useFormatDate();
 
   // For translations
   const t = useTranslations("Guidance");
@@ -34,89 +33,70 @@ const GuidancePage: React.FC = () => {
   // Set URLs
   const GUIDANCE_CREATE_URL = routePath("admin.guidance.groups.create");
 
-  // Fake guidance groups data
-  const fakeGuidanceGroups: GuidanceGroup[] = [
-    {
-      id: "1",
-      title: "School of Health Sciences",
-      description: "Comprehensive guidance for health sciences research and clinical practice",
-      lastUpdated: "2024-01-15",
-      lastUpdatedBy: "Dr. Sarah Johnson",
-      status: "Published",
-      textCount: 14,
-      url: routePath("admin.guidance.groups.index", { groupId: "1" }),
-    },
-    {
-      id: "2",
-      title: "Faculty of Engineering",
-      description: "Technical guidelines and best practices for engineering research",
-      lastUpdated: "2024-01-10",
-      lastUpdatedBy: "Prof. Michael Chen",
-      status: "Published",
-      textCount: 8,
-      url: routePath("admin.guidance.groups.index", { groupId: "2" }),
-    },
-    {
-      id: "3",
-      title: "Department of Computer Science",
-      description: "Software development and data science research guidelines",
-      lastUpdated: "2024-01-08",
-      lastUpdatedBy: "Dr. Emily Rodriguez",
-      status: "Draft",
-      textCount: 12,
-      url: routePath("admin.guidance.groups.index", { groupId: "3" }),
-    },
-    {
-      id: "4",
-      title: "School of Business",
-      description: "Business research methodologies and ethical guidelines",
-      lastUpdated: "2024-01-05",
-      lastUpdatedBy: "Dr. James Wilson",
-      status: "Published",
-      textCount: 6,
-      url: routePath("admin.guidance.groups.index", { groupId: "4" }),
-    },
-    {
-      id: "5",
-      title: "Faculty of Arts and Humanities",
-      description: "Research standards for humanities and social sciences",
-      lastUpdated: "2024-01-03",
-      lastUpdatedBy: "Prof. Lisa Anderson",
-      status: "Published",
-      textCount: 9,
-      url: routePath("admin.guidance.groups.index", { groupId: "5" }),
-    },
-    {
-      id: "6",
-      title: "Department of Physics",
-      description: "Laboratory safety and experimental design guidelines",
-      lastUpdated: "2024-01-01",
-      lastUpdatedBy: "Dr. Robert Kim",
-      status: "Published",
-      textCount: 5,
-      url: routePath("admin.guidance.groups.index", { groupId: "6" }),
+  // Run me query to get user's name
+  const { data: me, loading: meLoading } = useMeQuery();
+
+  // Query for all tags
+  const { data: tagsData, loading: tagsLoading } = useTagsQuery();
+
+  const { data: guidanceGroupsData, loading: guidanceGroupsLoading } = useGuidanceGroupsQuery({
+    variables: {
+      affiliationId: me?.me?.affiliation?.uri || null
     },
-  ];
+    fetchPolicy: "network-only",
+    skip: !me?.me?.affiliation?.uri // Prevent running until the me data exists
+  });
+
+  // Only show loading if we're actually fetching data (not skipped)
+  const isLoading = meLoading || tagsLoading || (guidanceGroupsLoading && !!me?.me?.affiliation?.uri);
+
+  const guidanceGroups = useMemo(() => {
+    if (!guidanceGroupsData?.guidanceGroups.length || !tagsData?.tags.length) {
+      return [];
+    }
+
+    return guidanceGroupsData.guidanceGroups.map((g) => {
+      // Get the latest version for this group and check if it's active
+      const latestVersionForGroup = g.versionedGuidanceGroup?.[0];
+      const isLatestVersionActiveForGroup = latestVersionForGroup?.active ?? false;
+
+      // Determine publish status for this specific group
+      const statusForGroup = g.isDirty && g.latestPublishedDate
+        ? t('status.unpublishedChanges')
+        : !g.latestPublishedDate || !isLatestVersionActiveForGroup
+          ? t('status.draft')
+          : t('status.published');
 
-  useEffect(() => {
-    // Set fake data on component mount
-    setGuidanceGroups(fakeGuidanceGroups);
-  }, []);
 
+      return {
+        id: String(g.id),
+        title: g.name || 'Untitled Guidance Group',
+        lastUpdated: g.modified ? formatDate(g.modified) : "",
+        lastUpdatedBy: `${g.modifiedBy?.givenName} ${g.modifiedBy?.surName}`,
+        latestPublishedVersion: `${g.latestPublishedVersion}` || '',
+        latestPublishedDate: g.latestPublishedDate ? formatDate(g.latestPublishedDate) : '',
+        status: statusForGroup,
+        description: g.description || '',
+        textCount: `${g.guidance?.filter(guidance => guidance.tagId !== null).length ?? 0} / ${tagsData?.tags.length || 0} Tags with Guidance`,
+        url: routePath("admin.guidance.groups.index", { groupId: String(g.id) }),
+      };
+    });
+  }, [guidanceGroupsData, tagsData, Global, formatDate]);
+
+  const title = t("pages.index.title");
+  const description = t("pages.index.description");
   return (
     <>
       <PageHeader
-        title={t("pages.index.title")}
-        description={t("pages.index.description")}
+        title={title}
+        description={description}
         showBackButton={false}
         breadcrumbs={
           <Breadcrumbs>
             <Breadcrumb>
               <Link href={routePath("app.home")}>{Global("breadcrumbs.home")}</Link>
             </Breadcrumb>
-            <Breadcrumb>
-              <Link href={routePath("admin.guidance.index")}>{t("breadcrumbs.guidance")}</Link>
-            </Breadcrumb>
+            <Breadcrumb>{t("breadcrumbs.guidanceGroups")}</Breadcrumb>
           </Breadcrumbs>
         }
         actions={
@@ -134,36 +114,40 @@ const GuidancePage: React.FC = () => {
 
       <LayoutContainer>
         <ContentContainer>
-          <div
-            className="guidance-list"
-            aria-label="Guidance groups list"
-            role="list"
-          >
-            {guidanceGroups.map((group) => (
-              <DashboardListItem
-                key={group.id}
-                heading={group.title}
-                url={group.url}
-              >
-                <div className={styles.guidanceContent}>
-                  <p className={styles.description}>{group.description}</p>
-                  <div className={styles.metadata}>
-                    <span>
-                      {Global("lastRevisedBy")}: {group.lastUpdatedBy}
-                    </span>
-                    <span className={styles.separator}>
-                      {Global("lastUpdated")}: {group.lastUpdated}
-                    </span>
-                    <span className={styles.separator}>
-                      {t("status.status")}: {group.status}
-                    </span>
+          {isLoading ? (
+            <Loading message="Loading..." />
+          ) : (
+            <ul
+              className={styles.guidanceList}
+              aria-label="Guidance groups list"
+            >
+              {guidanceGroups?.map((group) => (
+                <DashboardListItem
+                  key={group.id}
+                  heading={group.title}
+                  url={routePath("admin.guidance.groups.index", { groupId: Number(group.id) })}
+                  isFullyClickable={true}
+                >
+                  <div className={styles.guidanceContent}>
+                    <p className={styles.description}>{group.description}</p>
+                    <div className={styles.metadata}>
+                      <span>
+                        {group.textCount}
+                      </span>
+                      <span className={styles.separator}>
+                        {Global('lastUpdated')}: {group.lastUpdated}
+                      </span>
+                      <span className={styles.separator}>
+                        {t("status.status")}: {group.status}
+                      </span>
+                    </div>
                   </div>
-                </div>
-              </DashboardListItem>
-            ))}
-          </div>
+                </DashboardListItem>
+              ))}
+            </ul>
+          )}
         </ContentContainer>
-      </LayoutContainer>
+      </LayoutContainer >
     </>
   );
 };
diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx
index 652220147..0f9c8aa95 100644
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -1,4 +1,3 @@
-import type { Metadata } from "next";
 import { Poppins } from "next/font/google";
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages } from 'next-intl/server';
@@ -25,14 +24,6 @@ const font_sans_serif = Poppins({
   variable: '--font-sans-serif',
 });
 
-export const metadata: Metadata = {
-  title: "DMPTool",
-  description: "Best practice made easier. With a free, community- supported service that makes it easier to create machine-actionable data management and sharing plans(DMSPs) that meet funder requirements and follow open science best practice.",
-  icons: {
-    icon: '/favicon.ico',
-  }
-};
-
 export default async function LocaleLayout({
   children,
   params,
diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
index 3ced55b96..d7316dce4 100644
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -1,39 +1,41 @@
 'use client'
 
-import {ContentContainer, LayoutContainer} from '@/components/Container';
+import { useTranslations } from 'next-intl';
+import { ContentContainer, LayoutContainer } from '@/components/Container';
 import PageLinkCard, { PageLinkSection } from '@/components/PageLinkCard';
 import { routePath } from '@/utils/routes';
 
 const Home = () => {
+  const t = useTranslations('HomePage');
   const sections: PageLinkSection[] = [
     {
-      title: "Create & Manage",
-      description: "Create new templates and projects",
+      title: t('createAndManage.title'),
+      description: t('createAndManage.description'),
       items: [
         {
-          title: "Template Management",
-          description: "Create and manage templates (Must be Admin to access)",
+          title: t('sections.templateManagement.title'),
+          description: t('sections.templateManagement.description'),
           href: routePath('template.index')
         },
         {
-          title: "Project Management",
-          description: "Create and manage projects",
+          title: t('sections.planDashboard.title'),
+          description: t('sections.planDashboard.description'),
           href: routePath('projects.index')
         }
       ]
     },
     {
-      title: "Account & Administration",
-      description: "Manage your account and access admin features",
+      title: t('accountAndAdmin.title'),
+      description: t('accountAndAdmin.description'),
       items: [
         {
-          title: "Account Settings",
-          description: "View and manage your account",
+          title: t('sections.accountSettings.title'),
+          description: t('sections.accountSettings.description'),
           href: routePath('account.index')
         },
         {
-          title: "Admin Overview",
-          description: "Access administrative functions",
+          title: t('sections.adminOverview.title'),
+          description: t('sections.adminOverview.description'),
           href: routePath('admin.index')
         }
       ]
@@ -43,7 +45,7 @@ const Home = () => {
   return (
     <LayoutContainer>
       <ContentContainer>
-        <h1>Home Page</h1>
+        <h1>{t('title')}</h1>
         <PageLinkCard sections={sections} />
       </ContentContainer>
     </LayoutContainer>
diff --git a/app/[locale]/projects/[projectId]/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/__tests__/page.spec.tsx
index 3432424ad..0bd7953f3 100644
--- a/app/[locale]/projects/[projectId]/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/__tests__/page.spec.tsx
@@ -151,11 +151,6 @@ describe('ProjectOverviewPage', () => {
     expect(screen.getByText('projectMembers')).toBeInTheDocument();
   });
 
-  it('should render the research outputs', () => {
-    render(<ProjectOverviewPage />);
-    expect(screen.getByText('researchOutputs')).toBeInTheDocument();
-  });
-
   it('should render the plans', () => {
     render(<ProjectOverviewPage />);
     expect(screen.getByText('plans')).toBeInTheDocument();
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/__tests__/page.spec.tsx
index 0bab1a78c..8d9863adf 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/__tests__/page.spec.tsx
@@ -9,7 +9,7 @@ import {
   updatePlanStatusAction,
   updatePlanTitleAction
 } from '../actions';
-import { usePlanQuery } from '@/generated/graphql';
+import { usePlanQuery, usePlanFeedbackStatusQuery } from '@/generated/graphql';
 import { useToast } from '@/context/ToastContext';
 
 jest.mock('../actions/index', () => ({
@@ -57,6 +57,13 @@ jest.mock("@/generated/graphql", () => ({
     Organizational: 'ORGANIZATIONAL',
   },
   usePlanQuery: jest.fn(),
+
+  usePlanFeedbackStatusQuery: jest.fn().mockReturnValue({
+    data: { planFeedbackStatus: 'NONE' },
+    loading: false,
+    error: null,
+    refetch: jest.fn(),
+  }),
 }));
 
 import {
@@ -955,5 +962,55 @@ describe('PlanOverviewPage', () => {
     const results = await axe(container);
     expect(results).toHaveNoViolations();
   });
-});
 
+  it("should display 'No feedback' when planFeedbackStatus is NONE", async () => {
+    (usePlanFeedbackStatusQuery as jest.Mock).mockReturnValue({
+      data: { planFeedbackStatus: 'NONE' },
+      loading: false,
+      error: null,
+      refetch: jest.fn(),
+    });
+
+    render(<PlanOverviewPage />);
+
+    const sidebar = screen.getByTestId('sidebar-panel');
+    await waitFor(() => {
+      // translations are mocked, so we check for the translation key
+      expect(within(sidebar).getByText('status.feedback.none')).toBeInTheDocument();
+    });
+  });
+
+  it("should display 'Feedback requested' when planFeedbackStatus is REQUEST", async () => {
+    (usePlanFeedbackStatusQuery as jest.Mock).mockReturnValue({
+      data: { planFeedbackStatus: 'REQUEST' },
+      loading: false,
+      error: null,
+      refetch: jest.fn(),
+    });
+
+    render(<PlanOverviewPage />);
+
+    const sidebar = screen.getByTestId('sidebar-panel');
+    await waitFor(() => {
+      // translations are mocked, so we check for the translation key
+      expect(within(sidebar).getByText('status.feedback.request')).toBeInTheDocument();
+    });
+  });
+
+  it("should display 'Feedback received' when planFeedbackStatus is COMPLETE", async () => {
+    (usePlanFeedbackStatusQuery as jest.Mock).mockReturnValue({
+      data: { planFeedbackStatus: 'COMPLETE' },
+      loading: false,
+      error: null,
+      refetch: jest.fn(),
+    });
+
+    render(<PlanOverviewPage />);
+
+    const sidebar = screen.getByTestId('sidebar-panel');
+    await waitFor(() => {
+      // translations are mocked, so we check for the translation key
+      expect(within(sidebar).getByText('status.feedback.complete')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/ProjectsProjectPlanDownloadPage.module.scss b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/ProjectsProjectPlanDownloadPage.module.scss
index 774bf4607..91b9282f7 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/ProjectsProjectPlanDownloadPage.module.scss
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/ProjectsProjectPlanDownloadPage.module.scss
@@ -88,3 +88,13 @@
   font-size: 0.9375rem;
   margin-bottom: var(--space-4);
 }
+
+/* Best Practices Sidebar Style */
+.headerWithLogo {
+  display: flex;
+  align-items: center; // vertically center the image and text
+  gap: 0.5rem;
+}
+.Logo {
+  display: inline-block;
+}
\ No newline at end of file
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/__mocks__/mockedPlan.json b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/__mocks__/mockedPlan.json
new file mode 100644
index 000000000..ce27e5480
--- /dev/null
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/__mocks__/mockedPlan.json
@@ -0,0 +1,103 @@
+{
+  "__typename": "Plan",
+  "id": 10,
+  "versionedTemplate": {
+    "__typename": "VersionedTemplate",
+    "template": {
+      "__typename": "Template",
+      "id": 34,
+      "name": "Super Admin Template 6"
+    },
+    "name": "Super Admin Template 6",
+    "owner": {
+      "__typename": "Affiliation",
+      "uri": "https://ror.org/03yrm5c26",
+      "displayName": "California Digital Library (cdlib.org)"
+    },
+    "version": "v1",
+    "created": "2025-10-30 22:23:29"
+  },
+  "fundings": [
+    {
+      "__typename": "PlanFunding",
+      "id": 8,
+      "projectFunding": {
+        "__typename": "ProjectFunding",
+        "affiliation": {
+          "__typename": "Affiliation",
+          "displayName": "National Science Foundation (nsf.gov)"
+        }
+      }
+    }
+  ],
+  "visibility": "PRIVATE",
+  "status": "DRAFT",
+  "project": {
+    "__typename": "Project",
+    "fundings": [
+      {
+        "__typename": "ProjectFunding",
+        "affiliation": {
+          "__typename": "Affiliation",
+          "displayName": "National Science Foundation (nsf.gov)",
+          "name": "National Science Foundation"
+        },
+        "funderOpportunityNumber": null
+      }
+    ],
+    "title": "Butterfly Migration",
+    "collaborators": [
+      {
+        "__typename": "ProjectCollaborator",
+        "user": {
+          "__typename": "User",
+          "id": 1
+        },
+        "accessLevel": "OWN"
+      }
+    ]
+  },
+  "members": [
+    {
+      "__typename": "PlanMember",
+      "isPrimaryContact": true,
+      "projectMember": {
+        "__typename": "ProjectMember",
+        "givenName": "Super",
+        "surName": "Admin",
+        "email": "super@example.com",
+        "orcid": null,
+        "memberRoles": [
+          {
+            "__typename": "MemberRole",
+            "label": "Other"
+          }
+        ]
+      }
+    }
+  ],
+  "versionedSections": [
+    {
+      "__typename": "PlanSectionProgress",
+      "answeredQuestions": 1,
+      "displayOrder": 1,
+      "versionedSectionId": 164,
+      "title": "Section Two",
+      "totalQuestions": 1,
+      "tags": []
+    }
+  ],
+  "progress": {
+    "__typename": "PlanProgress",
+    "answeredQuestions": 1,
+    "percentComplete": 100,
+    "totalQuestions": 1
+  },
+  "created": "2025-10-31 23:34:02",
+  "createdById": 1,
+  "modified": "2025-10-31 23:34:02",
+  "dmpId": "https://doi.org/10.11111/ZZ10da46fd",
+  "registered": null,
+  "title": "Butterfly Migration",
+  "feedback": []
+}
\ No newline at end of file
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/__tests__/page.spec.tsx
index 08ebfd00a..2b3cb0ae6 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/__tests__/page.spec.tsx
@@ -1,85 +1,515 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+
+import { useParams } from 'next/navigation';
+import { MockedProvider } from "@apollo/client/testing";
+import { axe, toHaveNoViolations } from 'jest-axe';
+import mockedPlan from '../__mocks__/mockedPlan.json';
+import {
+  PlanDocument,
+} from '@/generated/graphql';
 import ProjectsProjectPlanDownloadPage from '../page';
+import {
+  mockScrollIntoView,
+} from "@/__mocks__/common";
+
+expect.extend(toHaveNoViolations);
+
+jest.mock('next/navigation', () => ({
+  useParams: jest.fn(),
+  useRouter: jest.fn(),
+}));
+
 
-// Currently, this page is just a static page. This unit test will be updated
-// when the page is implemented with functionality.
+const mocks = [
+  // Initial load mock
+  {
+    request: {
+      query: PlanDocument,
+      variables: {
+        planId: 1
+      },
+    },
+    result: {
+      data: {
+        plan: mockedPlan
+      },
+    },
+  },
+]
 describe('ProjectsProjectPlanDownloadPage', () => {
   beforeEach(() => {
     window.scrollTo = jest.fn(); // Called by the wrapping PageHeader
+
+    const mockUseParams = useParams as jest.Mock;
+    // Mock the return value of useParams
+    mockUseParams.mockReturnValue({ projectId: 1, dmpid: 1 });
   });
 
-  it('should render the page header with the correct title and description', () => {
-    render(<ProjectsProjectPlanDownloadPage />);
-    expect(screen.getByText('Download a plan')).toBeInTheDocument();
-    expect(
-      screen.getByText(
-        'You can download your Data Management Plan (DMP) in any of the formats listed below.'
-      )
-    ).toBeInTheDocument();
+  it('should render the page header with the correct info', async () => {
+    const marginLabels = ['Top margin', 'Bottom margin', 'Left margin', 'Right margin'];
+    const expectedOptions = ['15mm', '20mm', '25mm', '30mm'];
+    render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await waitFor(() => { // Wait for query to resolve so mocked data is rendered
+      expect(screen.getByText('title')).toBeInTheDocument();
+    });
+
+    expect(screen.getByText('title')).toBeInTheDocument();
+    expect(screen.getByText('description')).toBeInTheDocument();
+    expect(screen.getByRole('heading', { level: 2, name: 'headings.chooseFileFormat' })).toBeInTheDocument();
+
+    // Correct radio button options should be present
+    const pdfRadio = screen.getByRole('radio', { name: /PDF/i });
+    const docRadio = screen.getByRole('radio', { name: /DOC/i });
+    const htmlRadio = screen.getByRole('radio', { name: /HTML/i });
+    const csvRadio = screen.getByRole('radio', { name: /CSV/i });
+    const jsonRadio = screen.getByRole('radio', { name: /JSON/i });
+    const textRadio = screen.getByRole('radio', { name: /TEXT/i });
+
+    expect(pdfRadio).toBeInTheDocument();
+    expect(docRadio).toBeInTheDocument();
+    expect(htmlRadio).toBeInTheDocument();
+    expect(csvRadio).toBeInTheDocument();
+    expect(jsonRadio).toBeInTheDocument();
+    expect(textRadio).toBeInTheDocument();
+
+    // Settings checkboxes should be present
+    expect(screen.getByRole('heading', { level: 2, name: 'headings.settings' })).toBeInTheDocument();
+    const includeCoverSheet = screen.getByLabelText('labels.includeCoverSheet');
+    const includeSectionHeadings = screen.getByLabelText('labels.includeSectionHeadings');
+    const includeQuestionText = screen.getByLabelText('labels.includeQuestionText');
+    const includeUnansweredQuestions = screen.getByLabelText('labels.includeUnansweredQuestions');
+
+    expect(includeCoverSheet).toBeInTheDocument();
+    expect(includeSectionHeadings).toBeInTheDocument();
+    expect(includeQuestionText).toBeInTheDocument();
+    expect(includeUnansweredQuestions).toBeInTheDocument();
+
+    // Font options
+    expect(screen.getByRole('heading', { level: 2, name: 'headings.formattingOptions' })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { level: 3, name: 'headings.font' })).toBeInTheDocument();
+    const select = screen.getByLabelText('Font');
+    const tinosOption = screen.getByRole('option', { name: /Tinos, serif/i });
+    const robotoOption = screen.getByRole('option', { name: /Roboto, sans-serif/i });
+
+    expect(select).toBeInTheDocument();
+    expect(tinosOption).toBeInTheDocument();
+    expect(robotoOption).toBeInTheDocument();
+
+    // Font Size
+    expect(screen.getByRole('heading', { level: 3, name: 'headings.fontSize' })).toBeInTheDocument();
+    const selectFontSize = screen.getByLabelText('Font size');
+    const option8 = screen.getByRole('option', { name: '8pt' });
+    const option9 = screen.getByRole('option', { name: '9pt' });
+    const option10 = screen.getByRole('option', { name: '10pt' });
+    const option11 = screen.getByRole('option', { name: '11pt' });
+    const option12 = screen.getByRole('option', { name: '12pt' });
+    const option14 = screen.getByRole('option', { name: '14pt' });
+
+    expect(selectFontSize).toBeInTheDocument();
+    expect(option8).toBeInTheDocument();
+    expect(option9).toBeInTheDocument();
+    expect(option10).toBeInTheDocument();
+    expect(option11).toBeInTheDocument();
+    expect(option12).toBeInTheDocument();
+    expect(option14).toBeInTheDocument();
+
+    // Margins
+    expect(screen.getByRole('heading', { level: 3, name: 'headings.margins' })).toBeInTheDocument();
+
+    marginLabels.forEach(label => {
+      const select = screen.getByLabelText(label) as HTMLSelectElement;
+      expectedOptions.forEach(value => {
+        const option = Array.from(select.options).find(opt => opt.value === value);
+        expect(option).toBeDefined();
+        expect(option?.textContent).toBe(value);
+      });
+    });
+
+    // Download button
+    expect(screen.getByText(/Download "Butterfly Migration.pdf"/i)).toBeInTheDocument();
+    const downloadButton = screen.getByRole('button', { name: /Download PDF/i });
+    expect(downloadButton).toBeInTheDocument();
+
+    // Best Practice
+    expect(screen.getByRole('heading', { level: 2, name: 'bestPractice' })).toBeInTheDocument();
+    expect(screen.getByText('bestPracticep1')).toBeInTheDocument();
+    expect(screen.getByText('bestPracticep2')).toBeInTheDocument();
+
   });
 
-  it('should render file format options and allows selection', () => {
-    render(<ProjectsProjectPlanDownloadPage />);
-    const pdfOption = screen.getByLabelText('PDF');
-    const docOption = screen.getByLabelText('DOC');
+  it('should select Roboto font when selected', async () => {
+    render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await waitFor(() => { // Wait for query to resolve so mocked data is rendered
+      expect(screen.getByText('title')).toBeInTheDocument();
+    });
 
-    expect(pdfOption).toBeInTheDocument();
-    expect(docOption).toBeInTheDocument();
+    // Formatting options
+    expect(screen.getByRole('heading', { level: 2, name: 'headings.formattingOptions' })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { level: 3, name: 'headings.font' })).toBeInTheDocument();
+    const select = screen.getByLabelText('Font');
+    const tinosOption = screen.getByRole('option', { name: /Tinos, serif/i });
+    const robotoOption = screen.getByRole('option', { name: /Roboto, sans-serif/i });
 
-    fireEvent.click(docOption);
-    expect(docOption).toBeChecked();
+    expect(select).toBeInTheDocument();
+    expect(tinosOption).toBeInTheDocument();
+    expect(robotoOption).toBeInTheDocument();
+
+    // Simulate user selecting Roboto
+    fireEvent.change(select, { target: { value: 'roboto' } });
+
+    expect((robotoOption as HTMLOptionElement).selected).toBe(true);
   });
 
-  it('should render settings checkboxes', () => {
-    render(<ProjectsProjectPlanDownloadPage />);
-    const checkboxes = [
-      { label: 'Include a project details coversheet', checked: false },
-      { label: 'Include the section headings', checked: true },
-      { label: 'Include the question text', checked: true },
-      { label: 'Include any unanswered questions', checked: false },
-      { label: 'Remove HTML tags', checked: false },
-    ];
+  it('should select correct font size when selected', async () => {
+    render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
 
-    checkboxes.forEach(({ label, checked }) => {
-      const checkboxLabel = screen.getByText(label);
-      expect(checkboxLabel).toBeInTheDocument();
+    await waitFor(() => { // Wait for query to resolve so mocked data is rendered
+      expect(screen.getByText('title')).toBeInTheDocument();
+    });
 
-      // Query the input element within the label
-      const checkboxInput = checkboxLabel.closest('label')?.querySelector('input') as HTMLInputElement;
-      expect(checkboxInput).toBeInTheDocument();
-      expect(checkboxInput.checked).toBe(checked);
+    const selectFontSize = screen.getByLabelText('Font size');
+    const option8 = screen.getByRole('option', { name: '8pt' });
+    const option9 = screen.getByRole('option', { name: '9pt' });
+    const option10 = screen.getByRole('option', { name: '10pt' });
+    const option11 = screen.getByRole('option', { name: '11pt' });
+    const option12 = screen.getByRole('option', { name: '12pt' });
+    const option14 = screen.getByRole('option', { name: '14pt' });
 
-      fireEvent.click(checkboxInput);
-      expect(checkboxInput.checked).toBe(!checked);
+    expect(selectFontSize).toBeInTheDocument();
+    expect(option8).toBeInTheDocument();
+    expect(option9).toBeInTheDocument();
+    expect(option10).toBeInTheDocument();
+    expect(option11).toBeInTheDocument();
+    expect(option12).toBeInTheDocument();
+    expect(option14).toBeInTheDocument();
+
+    // Simulate user selecting 12pt
+    fireEvent.change(selectFontSize, { target: { value: '12pt' } });
+
+    expect((option12 as HTMLOptionElement).selected).toBe(true);
+  });
+
+  it('should select correct margin when selected', async () => {
+    render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await waitFor(() => { // Wait for query to resolve so mocked data is rendered
+      expect(screen.getByText('title')).toBeInTheDocument();
     });
+
+    const select = screen.getByLabelText('Top margin');
+    // Simulate user selecting 15mm
+    fireEvent.change(select, { target: { value: '15mm' } });
+
+    expect((select as HTMLSelectElement).value).toBe('15mm');
   });
 
-  it('should render PDF-specific formatting options when PDF is selected', () => {
-    render(<ProjectsProjectPlanDownloadPage />);
-    const pdfOption = screen.getByLabelText('PDF');
-    fireEvent.click(pdfOption);
+  it('should select correct settings when selected', async () => {
+    render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
 
-    expect(screen.getByText('Formatting options (PDF only)')).toBeInTheDocument();
-    expect(screen.getByLabelText('Font')).toBeInTheDocument();
-    expect(screen.getByLabelText('Font size')).toBeInTheDocument();
-    expect(screen.getByLabelText('Top margin')).toBeInTheDocument();
+    await waitFor(() => { // Wait for query to resolve so mocked data is rendered
+      expect(screen.getByText('title')).toBeInTheDocument();
+    });
+
+    // Settings checkboxes should be present
+    expect(screen.getByRole('heading', { level: 2, name: 'headings.settings' })).toBeInTheDocument();
+    const includeCoverSheet = screen.getByLabelText('labels.includeCoverSheet');
+    const includeSectionHeadings = screen.getByLabelText('labels.includeSectionHeadings');
+    const includeQuestionText = screen.getByLabelText('labels.includeQuestionText');
+    const includeUnansweredQuestions = screen.getByLabelText('labels.includeUnansweredQuestions');
+
+    expect(includeCoverSheet).toBeInTheDocument();
+    expect(includeSectionHeadings).toBeInTheDocument();
+    expect(includeQuestionText).toBeInTheDocument();
+    expect(includeUnansweredQuestions).toBeInTheDocument();
+    // Simulate user selecting options
+    fireEvent.click(includeCoverSheet);
+    expect(includeCoverSheet).toBeChecked();
+
+    fireEvent.click(includeSectionHeadings);
+    expect(includeSectionHeadings).not.toBeChecked();
+
+    fireEvent.click(includeQuestionText);
+    expect(includeQuestionText).not.toBeChecked();
+
+    fireEvent.click(includeUnansweredQuestions);
+    expect(includeUnansweredQuestions).toBeChecked();
   });
 
-  it('should render the download button with the correct file name and format', () => {
-    render(<ProjectsProjectPlanDownloadPage />);
-    const downloadButton = screen.getByRole('button', { name: /Download PDF/i });
+  it('should select radio button when clicked', async () => {
+    render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
 
-    expect(downloadButton).toBeInTheDocument();
-    expect(screen.getByText(/Download "Coastal Ocean Processes of North Greenland DMP.pdf"/i)).toBeInTheDocument();
+
+    await waitFor(() => { // Wait for query to resolve so mocked data is rendered
+      expect(screen.getByText('title')).toBeInTheDocument();
+    });
+
+    const pdfRadio = screen.getByRole('radio', { name: /PDF/i });
+    const docRadio = screen.getByRole('radio', { name: /DOC/i });
+    const jsonRadio = screen.getByRole('radio', { name: /JSON/i });
+
+    // Check default checked
+    expect(pdfRadio).toBeChecked();
+
+    // Simulate user selecting DOC
+    fireEvent.click(docRadio);
+    expect(docRadio).toBeChecked();
+
+    // Simulate user selecting DOC
+    fireEvent.click(jsonRadio);
+    expect(jsonRadio).toBeChecked();
   });
 
-  it('should update the file name and format in the download section when format changes', () => {
-    render(<ProjectsProjectPlanDownloadPage />);
-    const docOption = screen.getByLabelText('DOC');
-    fireEvent.click(docOption);
+  it('should update the file name and format in the download section when format changes', async () => {
+    render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
 
-    expect(screen.getByText(/Download "Coastal Ocean Processes of North Greenland DMP.doc"/i)).toBeInTheDocument();
+
+    await waitFor(() => { // Wait for query to resolve so mocked data is rendered
+      expect(screen.getByText('title')).toBeInTheDocument();
+    });
+
+    const docRadio = screen.getByRole('radio', { name: /DOC/i });
+
+    // Simulate user selecting DOC
+    fireEvent.click(docRadio);
+    expect(docRadio).toBeChecked();
+
+    expect(screen.getByText(/Download "Butterfly Migration.doc"/i)).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /Download DOC/i })).toBeInTheDocument();
   });
+
+  it('should pass accessibility tests', async () => {
+    const { container } = render(
+      <MockedProvider
+        mocks={mocks}
+        addTypename={false}
+      >
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+    await waitFor(async () => {
+      const results = await axe(container);
+      expect(results).toHaveNoViolations();
+    });
+  });
+});
+
+describe('handleDownload', () => {
+  let mockFetch: jest.Mock;
+  let mockCreateObjectURL: jest.Mock;
+  let mockRevokeObjectURL: jest.Mock;
+  let mockClick: jest.Mock;
+
+  beforeEach(() => {
+    // Mock anchor clicks due to jsdom limitations
+    jest.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(() => { });
+
+    HTMLElement.prototype.scrollIntoView = mockScrollIntoView;
+    window.scrollTo = jest.fn(); // Called by the wrapping PageHeader
+
+    const mockUseParams = useParams as jest.Mock;
+    // Mock the return value of useParams
+    mockUseParams.mockReturnValue({ projectId: 1, dmpid: 1 });
+
+    // Set up mockFetch to simulate fetch responses
+    const mockBlob = new Blob(['fake content'], { type: 'application/pdf' });
+    mockFetch = jest.fn().mockResolvedValue({
+      ok: true,
+      blob: async () => mockBlob,
+    });
+    global.fetch = mockFetch;
+
+    mockCreateObjectURL = jest.fn(() => 'blob:mock-url');
+    mockRevokeObjectURL = jest.fn();
+    global.URL.createObjectURL = mockCreateObjectURL;
+    global.URL.revokeObjectURL = mockRevokeObjectURL;
+
+    mockClick = jest.fn();
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('should download PDF with default settings', async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await screen.findByRole('button', { name: /download pdf/i });
+
+    const downloadButton = screen.getByRole('button', { name: /download pdf/i });
+    fireEvent.click(downloadButton);
+
+    await waitFor(() => {
+      expect(mockFetch).toHaveBeenCalled();
+    });
+
+    const fetchUrl = mockFetch.mock.calls[0][0];
+    expect(fetchUrl).toContain('includeCoverPage=false');
+    expect(fetchUrl).toContain('includeSectionHeadings=true');
+    expect(fetchUrl).toContain('includeQuestionText=true');
+  });
+
+  it('should download DOC format when DOC is selected', async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await screen.findByRole('radio', { name: /DOC/i });
+
+    // Select DOC format
+    const docRadio = screen.getByRole('radio', { name: /DOC/i });
+    fireEvent.click(docRadio);
+
+    const downloadButton = screen.getByRole('button', { name: /download doc/i });
+    fireEvent.click(downloadButton);
+
+    await waitFor(() => {
+      expect(mockFetch).toHaveBeenCalled();
+    });
+
+    // Verify correct Accept header for DOC
+    expect(mockFetch).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.objectContaining({
+        headers: {
+          Accept: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        },
+      })
+    );
+  });
+
+  it('should include changed settings in download', async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await screen.findByLabelText('labels.includeCoverSheet');
+
+    // Change some settings
+    const coverPageCheckbox = screen.getByLabelText('labels.includeCoverSheet');
+    fireEvent.click(coverPageCheckbox);
+
+    const fontSelect = screen.getByLabelText('Font');
+    fireEvent.change(fontSelect, { target: { value: 'roboto' } });
+
+    const downloadButton = screen.getByRole('button', { name: /download pdf/i });
+    fireEvent.click(downloadButton);
+
+    await waitFor(() => {
+      expect(mockFetch).toHaveBeenCalled();
+    });
+
+    const fetchUrl = mockFetch.mock.calls[0][0];
+    expect(fetchUrl).toContain('includeCoverPage=true');
+    expect(fetchUrl).toContain('fontFamily=roboto');
+  });
+
+  it('should handle download errors gracefully', async () => {
+    // Mock this so I don't get the console.warn about unhandled error in test output
+    jest.spyOn(console, 'warn').mockImplementation(() => { });
+
+    // Mock fetch to fail
+    mockFetch.mockResolvedValue({
+      ok: false,
+      json: async () => ({ error: 'Download failed' }),
+    });
+
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await screen.findByRole('button', { name: /download pdf/i });
+
+    const downloadButton = screen.getByRole('button', { name: /download pdf/i });
+    fireEvent.click(downloadButton);
+
+    await waitFor(() => {
+      expect(screen.getByText('messages.errors.downloadFailed')).toBeInTheDocument();
+    });
+
+    // Verify no download was attempted
+    expect(mockCreateObjectURL).not.toHaveBeenCalled();
+    expect(mockClick).not.toHaveBeenCalled();
+  });
+
+  it('should use correct filename from plan data', async () => {
+    render(
+      <MockedProvider mocks={mocks} addTypename={false}>
+        <ProjectsProjectPlanDownloadPage />
+      </MockedProvider>,
+    );
+
+    await screen.findByText(/Butterfly Migration/i);
+
+    const downloadButton = screen.getByRole('button', { name: /download pdf/i });
+    fireEvent.click(downloadButton);
+
+    await waitFor(() => {
+      expect(mockFetch).toHaveBeenCalled();
+    });
+
+    // Verify the download filename includes the plan title
+    expect(screen.getByText(/Butterfly Migration\.pdf/i)).toBeInTheDocument();
+  });
 });
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/page.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/page.tsx
index 04c369307..9b3f1e341 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/page.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/download/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import React, {ChangeEvent, useState} from 'react';
+import React, { ChangeEvent, useRef, useState } from 'react';
 import {
   Breadcrumb,
   Breadcrumbs,
@@ -9,24 +9,40 @@ import {
   Radio,
   RadioGroup
 } from "react-aria-components";
+import { useParams } from "next/navigation";
+import { useTranslations } from 'next-intl';
+import Image from 'next/image';
 
+import {
+  usePlanQuery
+} from "@/generated/graphql";
+
+// Components
 import PageHeader from "@/components/PageHeader";
 import {
   ContentContainer,
   LayoutWithPanel,
   SidebarPanel
 } from "@/components/Container";
+import ErrorMessages from '@/components/ErrorMessages';
+
+// Other
+import { DOI_REGEX } from "@/lib/constants";
+import { routePath } from "@/utils/routes";
+import logECS from "@/utils/clientLogger";
 import styles from './ProjectsProjectPlanDownloadPage.module.scss';
 
 // Define types
 interface SettingsState {
-  includeProjectDetails: boolean;
+  includeCoverPage: boolean;
   includeSectionHeadings: boolean;
   includeQuestionText: boolean;
   includeUnansweredQuestions: boolean;
-  removeHtmlTags: boolean;
-  font: string;
+  includeResearchOutputs: boolean;
+  includeRelatedWorks: boolean;
+  fontFamily: string;
   fontSize: string;
+  lineHeight: string;
   margins: {
     top: string;
     bottom: string;
@@ -35,18 +51,20 @@ interface SettingsState {
   };
 }
 
-type FileFormatType = 'pdf' | 'doc' | 'html' | 'csv' | 'json';
+type FileFormatType = 'pdf' | 'doc' | 'html' | 'csv' | 'json' | 'text';
 
 const ProjectsProjectPlanDownloadPage: React.FC = () => {
   // State for form values
   const [settings, setSettings] = useState<SettingsState>({
-    includeProjectDetails: false,
+    includeCoverPage: false,
     includeSectionHeadings: true,
     includeQuestionText: true,
     includeUnansweredQuestions: false,
-    removeHtmlTags: false,
-    font: 'Times-serif',
+    includeResearchOutputs: false,
+    includeRelatedWorks: false,
+    fontFamily: 'Tinos, serif',
     fontSize: '11pt',
+    lineHeight: '120',
     margins: {
       top: '25mm',
       bottom: '25mm',
@@ -55,15 +73,113 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
     }
   });
 
+  // Get planId params
+  const params = useParams();
+  const planId = String(params.dmpid);
+  const projectId = String(params.projectId);
+
+  //For scrolling to error in page
+  const errorRef = useRef<HTMLDivElement | null>(null);
+  // Errors returned from download attempt
+  const [errors, setErrors] = useState<string[]>([]);
   // State for selected file format
   const [selectedFormat, setSelectedFormat] = useState<FileFormatType>('pdf');
-  const fileName = 'Coastal Ocean Processes of North Greenland DMP';
+
+  // Localization keys
+  const t = useTranslations("ProjectsProjectPlanDownloadPage");
+  const Global = useTranslations("Global");
+
+  // Get Plan using planId
+  const {
+    data,
+  } = usePlanQuery({
+    variables: { planId: Number(planId) },
+    skip: isNaN(Number(planId)),
+    notifyOnNetworkStatusChange: true,
+  });
+
+
+  const dmpId = data?.plan?.dmpId || '';
+  const fileName = data?.plan?.title || 'untitled plan';
+
+  // decode percent-encoding if someone passed a URL-encoded DOI
+  const decoded = decodeURIComponent(dmpId);
+  const match = DOI_REGEX.exec(decoded);
+  const doi = match ? match[0] : decoded;
+
+
+
+  const handleDownload = async () => {
+    try {
+      // Build query parameters
+      const params = new URLSearchParams({
+        dmpId: doi, // Add dmpId as a query param
+        includeCoverPage: String(settings.includeCoverPage),
+        includeSectionHeadings: String(settings.includeSectionHeadings),
+        includeQuestionText: String(settings.includeQuestionText),
+        includeUnansweredQuestions: String(settings.includeUnansweredQuestions),
+        includeResearchOutputs: String(settings.includeResearchOutputs),
+        includeRelatedWorks: String(settings.includeRelatedWorks),
+        fontFamily: settings.fontFamily,
+        fontSize: settings.fontSize.replace('pt', ''),
+        lineHeight: settings.lineHeight,
+        marginTop: settings.margins.top.replace('mm', ''),
+        marginBottom: settings.margins.bottom.replace('mm', ''),
+        marginLeft: settings.margins.left.replace('mm', ''),
+        marginRight: settings.margins.right.replace('mm', ''),
+      });
+
+      // Map format to Accept header
+      const formatHeaders = {
+        pdf: 'application/pdf',
+        doc: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        html: 'text/html',
+        csv: 'text/csv',
+        json: 'application/json',
+        text: 'text/plain',
+      };
+
+      // Fetch through the Next.js API route
+      const response = await fetch(`/api/download-narrative?${params.toString()}`, {
+        headers: {
+          Accept: formatHeaders[selectedFormat],
+        },
+      });
+
+      if (!response.ok) {
+        const error = await response.json();
+        throw new Error(error.error || 'Download failed');
+      }
+
+      // Create blob from response
+      const blob = await response.blob();
+
+      // Create download link and trigger download
+      const url = window.URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = `${fileName}.${selectedFormat}`;
+      document.body.appendChild(link);
+      link.click();
+
+      // Cleanup
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(url);
+
+    } catch (error) {
+      setErrors(prev => [...prev, t('messages.errors.downloadFailed')]);
+      logECS('error', 'downloading plan', {
+        error,
+        url: { path: routePath('projects.dmp.download', { projectId, dmpId }) }
+      });
+    }
+  };
 
   // Handler for font selection
   const handleFontChange = (e: ChangeEvent<HTMLSelectElement>) => {
     setSettings(prev => ({
       ...prev,
-      font: e.target.value
+      fontFamily: e.target.value
     }));
   };
 
@@ -89,73 +205,67 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
   return (
     <>
       <PageHeader
-        title="Download a plan"
-        description="You can download your Data Management Plan (DMP) in any of the formats listed below."
+        title={t('title')}
+        description={t('description')}
         showBackButton={true}
         breadcrumbs={
           <Breadcrumbs>
-            <Breadcrumb>
-              <Link href="/">Home</Link>
-            </Breadcrumb>
-            <Breadcrumb>
-              <Link href="/projects">Projects</Link>
-            </Breadcrumb>
+            <Breadcrumb><Link href={routePath("app.home")}>{Global("breadcrumbs.home")}</Link></Breadcrumb>
+            <Breadcrumb><Link href={routePath("projects.index")}>{Global("breadcrumbs.projects")}</Link></Breadcrumb>
+            <Breadcrumb><Link href={routePath('projects.show', { projectId: String(projectId) })}>{Global('breadcrumbs.projectOverview')}</Link></Breadcrumb>
+            <Breadcrumb><Link href={routePath('projects.dmp.show', { projectId, dmpId })}>{Global('breadcrumbs.planOverview')}</Link></Breadcrumb>
+            <Breadcrumb>{Global('breadcrumbs.downloadPlan')}</Breadcrumb>
           </Breadcrumbs>
         }
         className="page-project-create-project-funding"
       />
+
+      <ErrorMessages errors={errors} ref={errorRef} />
       <LayoutWithPanel>
         <ContentContainer>
           <section className={"sectionContainer"}>
-            <h3 className={styles.sectionHeading}>
-              Choose file format
-            </h3>
+            <h2 className={`${styles.sectionHeading} h3`}>
+              {t('headings.chooseFileFormat')}
+            </h2>
             <div>
               <RadioGroup
                 className={styles.radioGroup}
-                aria-label="File format"
+                aria-label={t('labels.fileFormat')}
                 value={selectedFormat}
                 onChange={(value: string) => setSelectedFormat(value as FileFormatType)}
               >
                 <Radio value="pdf">
-                  {/* <FileIcon type="pdf"/> */}
                   PDF
                 </Radio>
-
                 <Radio value="doc">
-                  {/* <FileIcon type="doc"/> */}
                   DOC
                 </Radio>
-
                 <Radio value="html">
-                  {/* <FileIcon type="html"/> */}
                   HTML
                 </Radio>
-
                 <Radio value="csv">
-                  {/* <FileIcon type="csv"/> */}
                   CSV
                 </Radio>
-
                 <Radio value="json">
-                  {/* <FileIcon type="json"/> */}
                   JSON
                 </Radio>
+                <Radio value="text">
+                  TEXT
+                </Radio>
               </RadioGroup>
             </div>
           </section>
 
           <section className={"sectionContainer"}>
-            <h3 className={styles.sectionHeading}>
-              Settings
-            </h3>
+            <h2 className={`${styles.sectionHeading} h3`}>
+              {t('headings.settings')}
+            </h2>
             <div className={styles.checkboxGroup}>
-
               <Checkbox
-                isSelected={settings.includeProjectDetails}
+                isSelected={settings.includeCoverPage}
                 onChange={(isSelected: boolean) => setSettings(prev => ({
                   ...prev,
-                  includeProjectDetails: isSelected
+                  includeCoverPage: isSelected
                 }))}
                 className={styles.checkboxItem}
               >
@@ -164,7 +274,7 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                     <polyline points="1 9 7 14 15 4" />
                   </svg>
                 </div>
-                Include a project details coversheet
+                {t('labels.includeCoverSheet')}
               </Checkbox>
 
               <Checkbox
@@ -180,7 +290,7 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                     <polyline points="1 9 7 14 15 4" />
                   </svg>
                 </div>
-                Include the section headings
+                {t('labels.includeSectionHeadings')}
               </Checkbox>
 
               <Checkbox
@@ -196,7 +306,7 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                     <polyline points="1 9 7 14 15 4" />
                   </svg>
                 </div>
-                Include the question text
+                {t('labels.includeQuestionText')}
               </Checkbox>
 
               <Checkbox
@@ -212,50 +322,32 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                     <polyline points="1 9 7 14 15 4" />
                   </svg>
                 </div>
-                Include any unanswered questions
-              </Checkbox>
-
-              <Checkbox
-                isSelected={settings.removeHtmlTags}
-                onChange={(isSelected: boolean) => setSettings(prev => ({
-                  ...prev,
-                  removeHtmlTags: isSelected
-                }))}
-                className={styles.checkboxItem}
-              >
-                <div className={"checkbox"}>
-                  <svg viewBox="0 0 18 18" aria-hidden="true">
-                    <polyline points="1 9 7 14 15 4" />
-                  </svg>
-                </div>
-                Remove HTML tags
+                {t('labels.includeUnansweredQuestions')}
               </Checkbox>
             </div>
           </section>
 
           {selectedFormat === 'pdf' && (
             <section className={"sectionContainer"}>
-              <h3 className={styles.sectionHeading}>
-                Formatting options (PDF only)
-              </h3>
+              <h2 className={`${styles.sectionHeading} h3`}>
+                {t('headings.formattingOptions')}
+              </h2>
 
               <div className={styles.formatSection}>
-                <h4 className={styles.optionHeading}>Font</h4>
+                <h3 className={`${styles.optionHeading} h4`}>{t('headings.font')}</h3>
                 <select
                   className={styles.select}
-                  value={settings.font}
+                  value={settings.fontFamily}
                   onChange={handleFontChange}
                   aria-label="Font"
                 >
-                  <option value="Times-serif">Times-serif-like Times New Roman
-                  </option>
-                  <option value="Arial-sans">Arial-sans</option>
-                  <option value="Courier-mono">Courier-mono</option>
+                  <option value="tinos">Tinos, serif</option>
+                  <option value="roboto">Roboto, sans-serif</option>
                 </select>
               </div>
 
               <div className={styles.formatSection}>
-                <h4 className={styles.optionHeading}>Font size</h4>
+                <h3 className={`${styles.optionHeading} h4`}>{t('headings.fontSize')}</h3>
                 <select
                   className={styles.select}
                   value={settings.fontSize}
@@ -268,15 +360,14 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                   <option value="11pt">11pt</option>
                   <option value="12pt">12pt</option>
                   <option value="14pt">14pt</option>
-                  <option value="16pt">16pt</option>
                 </select>
               </div>
 
               <div className={styles.formatSection}>
-                <h4 className={styles.optionHeading}>Margins</h4>
+                <h3 className={`${styles.optionHeading} h4`}>{t('headings.margins')}</h3>
                 <div className={styles.marginsContainer}>
                   <div className={styles.marginGroup}>
-                    <label className={styles.marginLabel}>Top</label>
+                    <label className={styles.marginLabel}>{t('labels.top')}</label>
                     <select
                       className={styles.marginSelect}
                       value={settings.margins.top}
@@ -291,7 +382,7 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                   </div>
 
                   <div className={styles.marginGroup}>
-                    <label className={styles.marginLabel}>Bottom</label>
+                    <label className={styles.marginLabel}>{t('labels.bottom')}</label>
                     <select
                       className={styles.marginSelect}
                       value={settings.margins.bottom}
@@ -306,7 +397,7 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                   </div>
 
                   <div className={styles.marginGroup}>
-                    <label className={styles.marginLabel}>Left</label>
+                    <label className={styles.marginLabel}>{t('labels.left')}</label>
                     <select
                       className={styles.marginSelect}
                       value={settings.margins.left}
@@ -321,7 +412,7 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
                   </div>
 
                   <div className={styles.marginGroup}>
-                    <label className={styles.marginLabel}>Right</label>
+                    <label className={styles.marginLabel}>{t('labels.right')}</label>
                     <select
                       className={styles.marginSelect}
                       value={settings.margins.right}
@@ -341,37 +432,32 @@ const ProjectsProjectPlanDownloadPage: React.FC = () => {
 
           <section className={styles.downloadSection}>
             <p className={styles.downloadText}>
-              Download
-              &#34;{fileName}.{selectedFormat}&#34; {selectedFormat === 'pdf' ? '(532kb)' : ''}
+              {t('download')} &#34;{fileName}.{selectedFormat === 'text' ? 'txt' : selectedFormat}&#34;
             </p>
-            <button className={styles.downloadButton}>
-              Download {selectedFormat.toUpperCase()}
+            <button className={styles.downloadButton} onClick={handleDownload}>
+              {t('download')} {selectedFormat.toUpperCase()}
             </button>
           </section>
         </ContentContainer>
 
         <SidebarPanel>
-          <h2>Best Practice by DMP Tool</h2>
-          <p>
-            <strong>Downloading plans</strong>
-          </p>
-          <p>
-            PDFs offer universal compatibility and preserve formatting across
-            all devices and platforms, ensuring your document looks perfect
-            every time - unlike Word documents. Choose PDF to guarantee a
-            consistent, professional, and secure presentation for your
-            documents. Plus, most Funders require that DMPs be submitted in PDF
-            format.
-          </p>
-
-          <p>
-            If your organization, funder or project have specific requirements,
-            you can also download your DMP in HTML, CSV or JSON formats.
-          </p>
+          <div className={styles.headerWithLogo}>
+            <h2 className="h4">{Global('bestPractice')}</h2>
+            <Image
+              className={styles.Logo}
+              src="/images/DMP-logo.svg"
+              width="140"
+              height="16"
+              alt="DMP Tool"
+            />
+          </div>
+          <p>{t('bestPracticep1')}</p>
+
+          <p>{t('bestPracticep2')}</p>
         </SidebarPanel>
-      </LayoutWithPanel>
+      </LayoutWithPanel >
     </>
   );
 };
 
-export default ProjectsProjectPlanDownloadPage;
+export default ProjectsProjectPlanDownloadPage;
\ No newline at end of file
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/page.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/page.tsx
index 30b186815..7abc133b9 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/page.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/page.tsx
@@ -20,7 +20,8 @@ import {
   PlanSectionProgress,
   PlanStatus,
   PlanVisibility,
-  usePlanQuery
+  usePlanQuery,
+  usePlanFeedbackStatusQuery,
 } from "@/generated/graphql";
 
 //Components
@@ -175,6 +176,21 @@ const PlanOverviewPage: React.FC = () => {
     notifyOnNetworkStatusChange: true,
   });
 
+  const {
+    data: feedbackData,
+    loading: feedbackLoading,
+    error: feedbackError,
+  } = usePlanFeedbackStatusQuery({
+    variables: { planId: Number(planId) },
+    skip: isNaN(planId),
+  });
+
+  useEffect(() => {
+    if (feedbackError) {
+      setErrorMessages(prev => [...prev, feedbackError.message]);
+    }
+  }, [feedbackError]);
+
   // Memoize URLs to prevent unnecessary recalculations
   const urls = useMemo(() => ({
     FUNDINGS_URL: routePath("projects.dmp.fundings", { projectId, dmpId: planId }),
@@ -648,6 +664,16 @@ const PlanOverviewPage: React.FC = () => {
               <div className={`panelRow mb-5`}>
                 <div>
                   <h3>{t("status.feedback.title")}</h3>
+                  <p>
+                    {feedbackLoading
+                      ? `${Global("messaging.loading")}...`
+                      : (() => {
+                        const raw = feedbackData?.planFeedbackStatus ?? "NONE";
+                        const key = `status.feedback.${String(raw).toLowerCase()}`;
+                        return t(key);
+                      })()
+                    }
+                  </p>
                 </div>
                 <Link
                   href={FEEDBACK_URL}
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/__tests__/page.spec.tsx
index 3e0315abe..8351e6311 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/__tests__/page.spec.tsx
@@ -89,7 +89,8 @@ const versionedSectionMock = {
   tags: {
     id: 1,
     description: 'one',
-    name: 'one'
+    name: 'one',
+    slug: 'one'
   },
   versionedQuestions: {
     errors: {
@@ -171,7 +172,11 @@ const planMock = {
       title: 'Data and Metadata Formats',
       totalQuestions: 3,
       answeredQuestions: 2,
-      displayOrder: 1
+      displayOrder: 1,
+      tags: [
+        { id: 1, name: 'Data description', slug: 'data-description', description: 'Data description tag' },
+        { id: 2, name: 'Data organization & documentation', slug: 'data-organization-documentation', description: 'Data organization & documentation tag' }
+      ]
     },
   ],
   created: '2024-01-01',
@@ -329,7 +334,8 @@ describe('PlanOverviewSectionPage', () => {
     expect(screen.getByTestId('mock-page-header')).toBeInTheDocument();
 
     // Check that requirements section is rendered
-    expect(screen.getByText('Requirements by National Science Foundation')).toBeInTheDocument();
+    expect(screen.getByText('headings.requirementsBy')).toBeInTheDocument();
+    expect(screen.getByText('Requirements text for the section')).toBeInTheDocument();
     expect(screen.getByText('Requirements by University of California')).toBeInTheDocument();
 
     // Check for best practice content in sidebar
@@ -359,7 +365,7 @@ describe('PlanOverviewSectionPage', () => {
     expect(screen.queryByText('What types of data will be produced during your project?')).not.toBeInTheDocument();
 
     // Check that other content is still rendered
-    expect(screen.getByText('Requirements by National Science Foundation')).toBeInTheDocument();
+    expect(screen.getByText('headings.requirementsBy')).toBeInTheDocument();
     expect(screen.getByRole('heading', { level: 2, name: 'bestPractice' })).toBeInTheDocument();
   });
 
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/page.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/page.tsx
index 69b733cb7..9be8de4ca 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/page.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/page.tsx
@@ -3,26 +3,32 @@
 import React, { useEffect, useState } from 'react';
 import { Breadcrumb, Breadcrumbs, Link } from "react-aria-components";
 import { useParams } from 'next/navigation';
-import PageHeader from "@/components/PageHeader";
-import styles from './PlanOverviewSectionPage.module.scss';
 import { useTranslations } from "next-intl";
 import Image from 'next/image';
-import {
-  ContentContainer,
-  LayoutWithPanel,
-  SidebarPanel
-} from "@/components/Container";
+
 import {
   usePublishedQuestionsQuery,
   usePublishedSectionQuery,
   usePlanQuery,
 } from '@/generated/graphql';
-import { stripHtml } from '@/utils/general';
-import { routePath } from '@/utils/routes';
+
+
+// Components
+import {
+  ContentContainer,
+  LayoutWithPanel,
+  SidebarPanel
+} from "@/components/Container";
 import { DmpIcon } from '@/components/Icons';
 import ErrorMessages from '@/components/ErrorMessages';
 import ExpandableContentSection from '@/components/ExpandableContentSection';
+import PageHeader from "@/components/PageHeader";
+import SafeHtml from '@/components/SafeHtml';
 
+// Other
+import { stripHtml } from '@/utils/general';
+import { routePath } from '@/utils/routes';
+import styles from './PlanOverviewSectionPage.module.scss';
 interface VersionedQuestion {
   id: string;
   title: string;
@@ -200,16 +206,12 @@ const PlanOverviewSectionPage: React.FC = () => {
 
             <div className="container">
               <section aria-label={"Requirements"}>
-                <h4>Requirements by {plan.funder_name}</h4>
-                <p>
-                  (DUMMY DATA) The Arctic Data Center requires when submitting to the Center,
-                  include methods to create these types of data.
-                </p>
-                <p>
-                  If using proprietary formats like Excel or MATLAB, plan to
-                  convert them to open-source formats before submission. If
-                  conversion isn&apos;t possible, explain why
-                </p>
+                {sectionData?.publishedSection?.requirements && (
+                  <>
+                    <h4>{t('headings.requirementsBy', { funder: plan.funder_name })}</h4>
+                    <SafeHtml html={sectionData?.publishedSection?.requirements} />
+                  </>
+                )}
 
                 <h4>Requirements by University of California</h4>
                 <p>
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/PlanOverviewQuestionPage.module.scss b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/PlanOverviewQuestionPage.module.scss
index a20a3cdf0..0171acab5 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/PlanOverviewQuestionPage.module.scss
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/PlanOverviewQuestionPage.module.scss
@@ -176,29 +176,6 @@
 /* End For link to jump down to Guidance section*/
 
 
-/* 'Required by funder' info icon tooltip*/
-.popOverButton {
-  display: inline-flex;
-  align-items: center;
-  background: none;
-  padding: 0 0 0 0.25rem;
-  border: none;
-  vertical-align: middle;
-  cursor: pointer;
-
-  &:hover,
-  &:hover:not(:disabled) {
-    background: none;
-  }
-}
-
-.infoIcon svg {
-  width: 18px;
-  height: 18px;
-  fill: var(--brand-primary);
-  vertical-align: middle;
-}
-
 .requiredWrapper {
   display: inline-flex;
   white-space: nowrap;
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__mocks__/mockPlanData.json b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__mocks__/mockPlanData.json
index 855448c5a..c6e92e690 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__mocks__/mockPlanData.json
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__mocks__/mockPlanData.json
@@ -58,91 +58,247 @@
         "displayOrder": 1,
         "versionedSectionId": 1,
         "title": "Section 1: Project Description and Scope",
-        "totalQuestions": 12
+        "totalQuestions": 12,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 1,
         "versionedSectionId": 19,
         "title": "Types of data",
-        "totalQuestions": 1
+        "totalQuestions": 1,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 0,
         "displayOrder": 1,
         "versionedSectionId": 8,
         "title": "Project Information",
-        "totalQuestions": 8
+        "totalQuestions": 8,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 1,
         "versionedSectionId": 12,
         "title": "Product Information",
-        "totalQuestions": 5
+        "totalQuestions": 5,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 2,
         "versionedSectionId": 20,
         "title": "Data and metadata standards",
-        "totalQuestions": 1
+        "totalQuestions": 1,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 3,
         "versionedSectionId": 21,
         "title": "Policies for access, sharing, and privacy",
-        "totalQuestions": 1
+        "totalQuestions": 1,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 4,
         "versionedSectionId": 22,
         "title": "Policies for re-use, re-distribution, derivatives",
-        "totalQuestions": 2
+        "totalQuestions": 2,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 4,
         "versionedSectionId": 13,
         "title": "Acquire Stage",
-        "totalQuestions": 3
+        "totalQuestions": 3,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 5,
         "versionedSectionId": 23,
         "title": "Plans for archiving and preservation",
-        "totalQuestions": 1
+        "totalQuestions": 1,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 6,
         "versionedSectionId": 9,
         "title": "Data & Metadata",
-        "totalQuestions": 4
+        "totalQuestions": 4,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 7,
         "versionedSectionId": 10,
         "title": "Policies for Access, Use, Sharing & Archiving",
-        "totalQuestions": 3
+        "totalQuestions": 3,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
         "displayOrder": 9,
         "versionedSectionId": 11,
         "title": "Backup and Secure",
-        "totalQuestions": 3
+        "totalQuestions": 3,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 0,
         "displayOrder": 14,
         "versionedSectionId": 2,
         "title": "Section 2: Data Types to be Produced",
-        "totalQuestions": 1
+        "totalQuestions": 1,
+        "tags": [
+          {
+            "__typename": "Tag",
+            "name": "Data description",
+            "id": 1
+          },
+          {
+            "__typename": "Tag",
+            "name": "Security & privacy",
+            "id": 3
+          }
+        ]
       },
       {
         "answeredQuestions": 1,
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__mocks__/mocksGuidanceGroupData.json b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__mocks__/mocksGuidanceGroupData.json
new file mode 100644
index 000000000..3ddb4ac4f
--- /dev/null
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__mocks__/mocksGuidanceGroupData.json
@@ -0,0 +1,29 @@
+{
+  "guidanceGroups": [
+    {
+      "id": 2,
+      "guidance": [
+        {
+          "tagId": 1,
+          "guidanceText": "Use the active voice whenever possible",
+          "id": 3
+        }
+      ]
+    },
+    {
+      "id": 1,
+      "guidance": [
+        {
+          "tagId": 2,
+          "guidanceText": "Make sure to double check your entries",
+          "id": 1
+        },
+        {
+          "tagId": 1,
+          "guidanceText": "Dot your i's and cross your t's",
+          "id": 2
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__tests__/page.spec.tsx
index 1bf1795ec..9741af7e0 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/__tests__/page.spec.tsx
@@ -7,7 +7,8 @@ import {
   useAnswerByVersionedQuestionIdQuery,
   usePublishedQuestionQuery,
   usePlanQuery,
-  useMeQuery
+  useMeQuery,
+  useGuidanceGroupsQuery
 } from '@/generated/graphql';
 import {
   addAnswerAction,
@@ -16,6 +17,7 @@ import {
 import mockAnswerData from '../__mocks__/mockAnswerData.json';
 import mockPlanData from '../__mocks__/mockPlanData.json';
 import mockPublishedQuestion from '../__mocks__/mockPublishedQuestion.json';
+import mockGuidanceGroupsData from '../__mocks__/mocksGuidanceGroupData.json';
 import mockMeData from '../__mocks__/mockMeQuery.json';
 // Mocked question data
 import mockCheckboxQuestion from '../__mocks__/mockCheckboxQuestion.json';
@@ -161,6 +163,7 @@ jest.mock("@/generated/graphql", () => ({
   usePlanQuery: jest.fn(),
   usePublishedQuestionQuery: jest.fn(),
   useAnswerByVersionedQuestionIdQuery: jest.fn(),
+  useGuidanceGroupsQuery: jest.fn(),
 }));
 
 // Mock actions
@@ -214,10 +217,11 @@ describe('PlanOverviewQuestionPage render of questions', () => {
 
     mockUseComments.mockReturnValue(defaultMockReturn);
 
-    (usePlanQuery as jest.Mock).mockReturnValue([
-      jest.fn().mockResolvedValueOnce(mockPlanData),
-      { loading: false, error: undefined },
-    ]);
+    (usePlanQuery as jest.Mock).mockReturnValue({
+      data: mockPlanData,
+      loading: false,
+      error: undefined,
+    });
 
     (usePublishedQuestionQuery as jest.Mock).mockReturnValue({
       data: mockPublishedQuestion,
@@ -225,6 +229,12 @@ describe('PlanOverviewQuestionPage render of questions', () => {
       error: undefined,
     });
 
+    (useGuidanceGroupsQuery as jest.Mock).mockReturnValue({
+      data: mockGuidanceGroupsData,
+      loading: false,
+      error: undefined,
+    });
+
     (useAnswerByVersionedQuestionIdQuery as jest.Mock).mockReturnValue({
       data: mockAnswerData,
       loading: false,
@@ -270,9 +280,10 @@ describe('PlanOverviewQuestionPage render of questions', () => {
     expect(screen.getByTestId('question-card')).toBeInTheDocument();
     // Should strip out HTML tags for the Question Text
     expect(screen.getByRole('heading', { level: 2, name: 'Text area question' })).toBeInTheDocument();
-    const requirementsByFunder = screen.getByText('page.requiredByFunder');
+    const requirementsByFunder = screen.getByText('page.requirementsBy');
     expect(requirementsByFunder).toBeInTheDocument();
-    expect(requirementsByFunder.tagName).toBe('STRONG');
+    expect(screen.getByText((content) => content.includes('is simply dummy requirements'))).toBeInTheDocument();
+    expect(requirementsByFunder.tagName).toBe('H3');
     // check for info icon button
     expect(screen.getByRole('button', { name: 'Required by funder' })).toBeInTheDocument();
     // check for drawer panel trigger buttons
@@ -282,13 +293,17 @@ describe('PlanOverviewQuestionPage render of questions', () => {
     expect(screen.getByLabelText('question-text-editor')).toBeInTheDocument();
 
     // Check for guidance content
-    expect(screen.getByRole('heading', { level: 3, name: 'page.guidanceBy' })).toBeInTheDocument();
     const boldedGuidance = screen.getByText('Guidance text - Lorem Ipsum');
     expect(boldedGuidance).toBeInTheDocument();
     expect(boldedGuidance.tagName).toBe('STRONG');
     expect(screen.getByText((content) => content.includes('is simply dummy guidance text'))).toBeInTheDocument();
-    expect(screen.getByRole('heading', { level: 3, name: 'Guidance by University of California' }));
-    const orgGuidance = screen.getByText(/This is the most detailed section/i);
+    // There are multiple h3 headings with 'page.guidanceBy' (one for funder, one for org)
+    const guidanceHeadings = screen.getAllByRole('heading', { level: 3, name: 'page.guidanceBy' });
+    expect(guidanceHeadings).toHaveLength(2);
+    expect(screen.getByText('Use the active voice whenever possible')).toBeInTheDocument();
+    expect(screen.getByText("Dot your i's and cross your t's")).toBeInTheDocument();
+    expect(screen.getByText('Guidance text - Lorem Ipsum')).toBeInTheDocument();
+    const orgGuidance = screen.getByText(/is simply dummy guidance text/i);
     expect(orgGuidance.tagName).toBe('P');
     expect(screen.getByRole('button', { name: 'labels.saveAnswer' })).toBeInTheDocument();
 
@@ -2247,3 +2262,68 @@ describe('Prevent unload when user has unsaved changes', () => {
     });
   });
 });
+
+describe('Auto save', () => {
+  it('should show saved message after auto-saving changes', async () => {
+    HTMLElement.prototype.scrollIntoView = mockScrollIntoView;
+
+    // Mock window.tinymce
+    window.tinymce = {
+      init: jest.fn(),
+      remove: jest.fn(),
+    };
+
+    mockUseParams.mockReturnValue({ projectId: 1, dmpid: 1, sid: 22, qid: 344 });
+    mockUseRouter.mockReturnValue({
+      push: jest.fn(),
+    });
+
+    (useMeQuery as jest.Mock).mockReturnValue({
+      data: mockMeData,
+      loading: false,
+      error: undefined
+    });
+
+
+    (usePlanQuery as jest.Mock).mockReturnValue({
+      data: mockPlanData,
+      loading: false,
+      error: undefined,
+    });
+
+    (usePublishedQuestionQuery as jest.Mock).mockReturnValue({
+      data: mockCheckboxQuestion,
+      loading: false,
+      error: undefined,
+    });
+
+    (useAnswerByVersionedQuestionIdQuery as jest.Mock).mockReturnValue({
+      data: mockCheckboxAnswer,
+      loading: false,
+      error: undefined,
+    });
+
+    const setTimeoutSpy = jest.spyOn(global, 'setTimeout');
+    await act(async () => {
+      render(
+        <PlanOverviewQuestionPage />
+      );
+    });
+
+    const checkboxGroup = screen.getByTestId('checkbox-group');
+    expect(checkboxGroup).toBeInTheDocument();
+    const checkboxes = within(checkboxGroup).getAllByRole('checkbox');
+    const alexCheckbox = checkboxes.find(
+      (checkbox) => (checkbox as HTMLInputElement).value === 'Alex'
+    );
+
+    fireEvent.click(alexCheckbox!);
+
+    const lastSavedText = screen.getByText('messages.unsavedChanges');
+    expect(lastSavedText).toBeInTheDocument();
+    // Verify timeout scheduled
+    expect(setTimeoutSpy).toHaveBeenCalledWith(expect.any(Function), 3000);
+
+    setTimeoutSpy.mockRestore();
+  });
+});
diff --git a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/page.tsx b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/page.tsx
index fbc3e7708..60e93a67a 100644
--- a/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/page.tsx
+++ b/app/[locale]/projects/[projectId]/dmp/[dmpid]/s/[sid]/q/[qid]/page.tsx
@@ -17,7 +17,6 @@ import {
   TooltipTrigger
 } from "react-aria-components";
 import { CalendarDate, DateValue } from "@internationalized/date";
-import DOMPurify from 'dompurify';
 
 import styles from './PlanOverviewQuestionPage.module.scss';
 import { useTranslations } from "next-intl";
@@ -33,6 +32,7 @@ import {
   usePlanQuery,
   usePublishedQuestionQuery,
   useAnswerByVersionedQuestionIdQuery,
+  useGuidanceGroupsQuery
 } from '@/generated/graphql';
 
 // Components
@@ -44,6 +44,7 @@ import { DmpIcon } from "@/components/Icons";
 import { useRenderQuestionField } from '@/components/hooks/useRenderQuestionField';
 import ExpandableContentSection from '@/components/ExpandableContentSection';
 import CommentsDrawer from './CommentsDrawer';
+import SafeHtml from '@/components/SafeHtml';
 
 // Context
 import { useToast } from '@/context/ToastContext';
@@ -186,6 +187,10 @@ const PlanOverviewQuestionPage: React.FC = () => {
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
   // Track whether there are unsaved changes
   const [hasUnsavedChanges, setHasUnsavedChanges] = useState<boolean>(false);
+  const [isAutoSaving, setIsAutoSaving] = useState<boolean>(false);
+  const [lastSavedAt, setLastSavedAt] = useState<Date | null>(null);
+  const [currentTime, setCurrentTime] = useState(new Date());
+  const autoSaveTimeoutRef = useRef<NodeJS.Timeout>();
 
   // Localization
   const Global = useTranslations('Global');
@@ -211,6 +216,13 @@ const PlanOverviewQuestionPage: React.FC = () => {
   // Run me query to get user's name
   const { data: me } = useMeQuery();
 
+  const { data: guidanceData } = useGuidanceGroupsQuery({
+    variables: {
+      affiliationId: plan?.orgId || null
+    },
+    skip: !me?.me?.affiliation?.uri // Prevent running until the me data exists
+  });
+
   // Get Plan using planId
   const { data: planData, loading: planQueryLoading, error: planQueryError } = usePlanQuery(
     {
@@ -219,6 +231,40 @@ const PlanOverviewQuestionPage: React.FC = () => {
     }
   );
 
+  // Tags assigned to current section
+  const currentSectionTagIds = React.useMemo(() => {
+    const section = planData?.plan?.versionedSections?.find(s => s.versionedSectionId === Number(versionedSectionId));
+    return section?.tags?.map(t => t.id) ?? [];
+  }, [planData, versionedSectionId]);
+
+
+  // Guidance texts that match current section tags (return objects so we have stable keys)
+  interface MatchedGuidance { id: number; guidanceText: string; }
+  const matchedGuidanceTexts = React.useMemo<MatchedGuidance[]>(() => {
+    if (!guidanceData?.guidanceGroups || currentSectionTagIds.length === 0) return [] as MatchedGuidance[];
+    const tagSet = new Set(currentSectionTagIds);
+    const seenIds = new Set<number>();
+    const seenTexts = new Set<string>();
+    const matches: MatchedGuidance[] = [];
+
+    guidanceData.guidanceGroups.forEach(group => {
+      group.guidance?.forEach(g => {
+        // New API: guidance has a single tagId instead of tags array
+        const hasMatch = typeof g?.tagId === 'number' && tagSet.has(g.tagId);
+        if (hasMatch && g.guidanceText && typeof g.id === 'number') {
+          // Skip items without valid numeric IDs and dedupe by id/text
+          if (!seenIds.has(g.id) && !seenTexts.has(g.guidanceText)) {
+            seenIds.add(g.id);
+            seenTexts.add(g.guidanceText);
+            matches.push({ id: g.id, guidanceText: g.guidanceText });
+          }
+        }
+      });
+    });
+
+    return matches;
+  }, [guidanceData, currentSectionTagIds]);
+
   // Get answer data
   const { data: answerData, loading: answerLoading, error: answerError } = useAnswerByVersionedQuestionIdQuery(
     {
@@ -325,17 +371,6 @@ const PlanOverviewQuestionPage: React.FC = () => {
     }
   }
 
-
-  const convertToHTML = (htmlString: string | null | undefined) => {
-    if (htmlString) {
-      const sanitizedHTML = DOMPurify.sanitize(htmlString);
-      return (
-        <div dangerouslySetInnerHTML={{ __html: sanitizedHTML }} />
-      );
-    }
-    return null;
-  };
-
   const updateCommentHandler = async (comment: MergedComment) => {
     handleUpdateComment(comment);
     // Keep drawer open so the user can see that they comment changed
@@ -366,6 +401,7 @@ const PlanOverviewQuestionPage: React.FC = () => {
       ...prev,
       otherAffiliationName: value
     }));
+    setHasUnsavedChanges(true);
   };
 
   // Update the selected radio value when user selects different option
@@ -750,7 +786,11 @@ const PlanOverviewQuestionPage: React.FC = () => {
   };
 
   // Call Server Action updateAnswerAction or addAnswerAction to save answer
-  const addAnswer = async () => {
+  const addAnswer = async (isAutoSave = false) => {
+    if (isAutoSave) {
+      setIsAutoSaving(true);
+    }
+
     const jsonPayload = getAnswerJson();
     // Check is answer already exists. If so, we want to call an update mutation rather than add
     const isUpdate = Boolean(answerData?.answerByVersionedQuestionId);
@@ -785,6 +825,11 @@ const PlanOverviewQuestionPage: React.FC = () => {
             path: routePath('projects.dmp.versionedQuestion.detail', { projectId, dmpId, versionedSectionId, versionedQuestionId })
           }
         });
+      } finally {
+        if (isAutoSave) {
+          setIsAutoSaving(false);
+          setHasUnsavedChanges(false);
+        }
       }
     }
     return {
@@ -804,6 +849,11 @@ const PlanOverviewQuestionPage: React.FC = () => {
     if (isSubmitting) return;
     setIsSubmitting(true);
 
+    // Clear any pending auto-save
+    if (autoSaveTimeoutRef.current) {
+      clearTimeout(autoSaveTimeoutRef.current);
+    }
+
     const result = await addAnswer();
 
     if (!result.success) {
@@ -813,27 +863,49 @@ const PlanOverviewQuestionPage: React.FC = () => {
       }
     } else {
       // On success
+      setIsSubmitting(false);
       if (result.data?.errors && hasFieldLevelErrors(result.data.errors as unknown as MutationErrorsInterface)) {
         const mutationErrors = result.data.errors as unknown as MutationErrorsInterface;
         const extractedErrors = getExtractedErrorValues(mutationErrors);
         // Handle errors as an object with general or field-level errors
-        setErrors(extractedErrors)
+        setErrors(extractedErrors);
 
       } else {
-        setIsSubmitting(false);
         setHasUnsavedChanges(false);
         // Show user a success message and redirect back to the Section page
         showSuccessToast();
         router.push(routePath('projects.dmp.versionedSection', { projectId, dmpId, versionedSectionId }))
-
       }
     }
   };
 
+  // Helper function to format the last saved messaging
+  const getLastSavedText = () => {
+
+    if (isAutoSaving) {
+      return `${Global('buttons.saving')}...`;
+    }
+
+    if (!lastSavedAt) {
+      return hasUnsavedChanges ? t('messages.unsavedChanges') : '';
+    }
+
+    const diffInMinutes = Math.floor(Math.abs(currentTime.getTime() - lastSavedAt.getTime()) / (1000 * 60));
+
+    if (diffInMinutes === 0) {
+      return t('messages.savedJustNow');
+    } else if (diffInMinutes === 1) {
+      return t('messages.lastSavedOneMinuteAgo');
+    } else {
+      return t('messages.lastSaves', { minutes: diffInMinutes });
+    }
+  };
+
   // Get parsed JSON from question, and set parsed, question and questionType in state
   useEffect(() => {
     if (selectedQuestion) {
       const q = selectedQuestion.publishedQuestion;
+
       const cleanedQuestion = {
         ...q,
         required: q?.required ?? undefined // convert null to undefined
@@ -934,8 +1006,37 @@ const PlanOverviewQuestionPage: React.FC = () => {
 
   }, [answerData, questionType]);
 
-  // Warn user of unsaved changes if they try to leave the page
+
+  // Auto-save logic
+  useEffect(() => {
+    if (!hasUnsavedChanges) return;
+    if (!versionedQuestionId || !versionedSectionId || !question) return;
+
+    // Set a timeout to auto-save after 3 seconds of inactivity
+    autoSaveTimeoutRef.current = setTimeout(async () => {
+      const { success } = await addAnswer(true);
+      if (success) {
+        setLastSavedAt(new Date());
+        setHasUnsavedChanges(false);
+      }
+    }, 3000);
+
+    return () => clearTimeout(autoSaveTimeoutRef.current);
+  }, [formData, versionedQuestionId, versionedSectionId, question, hasUnsavedChanges]);
+
+
+
+  // Auto-save on window blur and before unload
   useEffect(() => {
+    const handleWindowBlur = () => {
+      if (hasUnsavedChanges && !isAutoSaving) {
+        if (autoSaveTimeoutRef.current) {
+          clearTimeout(autoSaveTimeoutRef.current);
+        }
+        addAnswer(true);
+      }
+    };
+
     const handleBeforeUnload = (e: BeforeUnloadEvent) => {
       if (hasUnsavedChanges) {
         e.preventDefault();
@@ -943,11 +1044,27 @@ const PlanOverviewQuestionPage: React.FC = () => {
       }
     };
 
+    window.addEventListener('blur', handleWindowBlur);
     window.addEventListener('beforeunload', handleBeforeUnload);
+
     return () => {
+      window.removeEventListener('blur', handleWindowBlur);
       window.removeEventListener('beforeunload', handleBeforeUnload);
+      if (autoSaveTimeoutRef.current) {
+        clearTimeout(autoSaveTimeoutRef.current);
+      }
     };
-  }, [hasUnsavedChanges]);
+  }, [hasUnsavedChanges, isAutoSaving]);
+
+
+  // Set up an interval to update the current time every minute
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setCurrentTime(new Date());
+    }, 60 * 1000); // Update every minute
+
+    return () => clearInterval(interval);
+  }, []);
 
   useEffect(() => {
     // Set whether current user can add comments based on their role and plan data
@@ -1073,13 +1190,13 @@ const PlanOverviewQuestionPage: React.FC = () => {
             {question?.requirementText && (
               <section aria-label={PlanOverview('page.requirementsBy', { funder: plan?.funder ?? '' })}>
                 <h3 className={"h4"}>{PlanOverview('page.requirementsBy', { funder: plan?.funder ?? '' })}</h3>
-                {convertToHTML(question?.requirementText)}
+                <SafeHtml html={question?.requirementText} />
               </section>
             )}
 
             {/**Requirements by organization */}
             <section aria-label={"Requirements"}>
-              {/**TODO: need to get this data from backend */}
+              {/**TODO: need to get this data from backend once org requirements are available */}
               <h3 className={"h4"}>Requirements by University of California</h3>
               <p>
                 The university requires data and metadata to be cleared by the ethics
@@ -1101,7 +1218,7 @@ const PlanOverviewQuestionPage: React.FC = () => {
                   <div className={styles.requiredWrapper}>
                     <div><strong>{PlanOverview('page.requiredByFunder')}</strong></div>
                     <DialogTrigger>
-                      <Button className={`${styles.popOverButton} react-aria-Button`} aria-label="Required by funder"><div className={styles.infoIcon}><DmpIcon icon="info" /></div></Button>
+                      <Button className="popover-btn" aria-label="Required by funder"><div className="icon info"><DmpIcon icon="info" /></div></Button>
                       <Popover>
                         <OverlayArrow>
                           <svg width={12} height={12} viewBox="0 0 12 12">
@@ -1145,6 +1262,7 @@ const PlanOverviewQuestionPage: React.FC = () => {
                         <Button
                           ref={openCommentsButtonRef}
                           className={styles.buttonSmallDisabled}
+                          aria-disabled={true}
                         >
                           {t('buttons.commentWithNumber', { number: mergedComments.length })}
                         </Button>
@@ -1159,27 +1277,41 @@ const PlanOverviewQuestionPage: React.FC = () => {
 
                   </div>
                   {parsed && questionField}
-
+                </div>
+                <div className="lastSaved mt-5"
+                  aria-live="polite"
+                  role="status">
+                  {getLastSavedText()}
                 </div>
               </Card>
 
+
               <section aria-label={"Guidance"} id="guidance">
-                <h3 className={"h4"}>{PlanOverview('page.guidanceBy', { funder: plan?.funder ?? '' })}</h3>
-
-                {convertToHTML(question?.guidanceText)}
-
-
-                <h3 className={"h4"}>Guidance by University of California</h3>
-                <p>
-                  This is the most detailed section of the data management plan.
-                  Describe the categories of data being collected and how they tie
-                  into the data associated with the methods used to collect that
-                  data.
-                </p>
-                <p>
-                  Expect this section to be the most detailed section, taking up a
-                  large portion of your data management plan document.
-                </p>
+                {/**Guidance from funder - if funder guidance exists, then display */}
+                {question?.guidanceText && (
+                  <>
+                    <h3 className={"h4"}>{PlanOverview('page.guidanceBy', { name: plan?.funder ?? '' })}</h3>
+                    <SafeHtml html={question?.guidanceText} />
+                  </>
+                )}
+
+                {/**Guidance from organization - if there is org guidance, then display */}
+                {matchedGuidanceTexts.length > 0 && (
+                  <>
+                    <h3 className={"h4"}>{PlanOverview('page.guidanceBy', { name: planData?.plan?.versionedTemplate?.owner?.displayName ?? '' })}</h3>
+                    {/** Additional guidance matched by section tags */}
+                    {matchedGuidanceTexts.length > 0 && (
+                      <div className={styles.matchedGuidanceList} data-testid="matched-guidance">
+                        {matchedGuidanceTexts.map(g => (
+                          <React.Fragment key={g.id}>
+                            <SafeHtml html={g.guidanceText} />
+                          </React.Fragment>
+                        ))}
+                      </div>
+                    )}
+                  </>
+                )}
+
               </section>
               <div className={styles.modalAction}>
                 <div>
@@ -1289,7 +1421,7 @@ const PlanOverviewQuestionPage: React.FC = () => {
               <h3>{question?.questionText}</h3>
               <h4 className={`${styles.deEmphasize} h5`}>{PlanOverview('page.funderSampleText', { funder: plan?.funderName ?? '' })}</h4>
               <div className={styles.sampleText}>
-                {convertToHTML(question?.sampleText)}
+                <SafeHtml html={question?.sampleText} />
               </div>
               <div className="">
                 <Button className="small" onPress={() => handleUseAnswer(question?.sampleText)}>{PlanOverview('buttons.useAnswer')}</Button>
diff --git a/app/[locale]/projects/[projectId]/dmp/start/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/dmp/start/__tests__/page.spec.tsx
new file mode 100644
index 000000000..288bf5154
--- /dev/null
+++ b/app/[locale]/projects/[projectId]/dmp/start/__tests__/page.spec.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import ProjectsProjectPlanNew from '../page';
+import { useParams, useRouter } from 'next/navigation';
+import { axe, toHaveNoViolations } from 'jest-axe';
+import { mockScrollTo } from '@/__mocks__/common';
+
+expect.extend(toHaveNoViolations);
+
+
+jest.mock('next/navigation', () => ({
+  useParams: jest.fn(),
+  useRouter: jest.fn(),
+}));
+
+
+let mockRouter;
+
+
+describe('ProjectsProjectPlanNew', () => {
+  const mockUseParams = useParams as jest.Mock;
+
+  beforeEach(() => {
+    mockScrollTo();
+    mockUseParams.mockReturnValue({ projectId: '1' });
+
+    // mock router
+    mockRouter = { push: jest.fn() };
+    (useRouter as jest.Mock).mockReturnValue(mockRouter);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  })
+
+  it('should render the page correctly', async () => {
+
+    render(<ProjectsProjectPlanNew />);
+
+    // Check breadcrumb items
+    const breadcrumb = screen.getByLabelText('Breadcrumbs');
+    expect(within(breadcrumb).getByText('breadcrumbs.home')).toBeInTheDocument();
+    expect(within(breadcrumb).getByText('breadcrumbs.projects')).toBeInTheDocument();
+    expect(within(breadcrumb).getByText('breadcrumbs.projectOverview')).toBeInTheDocument();
+    expect(within(breadcrumb).getByText('breadcrumbs.startDMP')).toBeInTheDocument();
+
+    // Check radio options
+    expect(screen.getByLabelText('labels.startNewPlan')).toBeInTheDocument();
+    expect(screen.getByLabelText('labels.uploadExistingPlan')).toBeInTheDocument();
+
+    // Check Next button
+    expect(screen.getByRole('button', { name: 'buttons.next' })).toBeInTheDocument();
+  });
+
+
+  it('should redirect to correct url when selecting create new DMP option', async () => {
+
+    render(<ProjectsProjectPlanNew />);
+    const radioStartNew = screen.getByLabelText('labels.startNewPlan');
+    const nextButton = screen.getByRole('button', { name: 'buttons.next' });
+
+    // Select "Start New Plan" and click Next
+    fireEvent.click(radioStartNew);
+    fireEvent.click(nextButton);
+
+    await waitFor(() => {
+      expect(mockRouter.push).toHaveBeenCalledWith('/en-US/projects/1/dmp/create');
+    });
+  });
+
+  it('should redirect to correct url when selecting upload existing DMP option', async () => {
+
+    render(<ProjectsProjectPlanNew />);
+    const radioUploadExisting = screen.getByLabelText('labels.uploadExistingPlan');
+    const nextButton = screen.getByRole('button', { name: 'buttons.next' });
+
+    // Select "Upload Existing Plan" and click Next
+    fireEvent.click(radioUploadExisting);
+    fireEvent.click(nextButton);
+
+    await waitFor(() => {
+      expect(mockRouter.push).toHaveBeenCalledWith('/en-US/projects/1/dmp/upload');
+    });
+  });
+
+  it('should pass axe accessibility test', async () => {
+    const { container } = render(<ProjectsProjectPlanNew />);
+
+    await act(async () => {
+      const results = await axe(container);
+      expect(results).toHaveNoViolations();
+    });
+  });
+});
diff --git a/app/[locale]/projects/[projectId]/dmp/start/page.tsx b/app/[locale]/projects/[projectId]/dmp/start/page.tsx
new file mode 100644
index 000000000..62761ea26
--- /dev/null
+++ b/app/[locale]/projects/[projectId]/dmp/start/page.tsx
@@ -0,0 +1,124 @@
+'use client';
+
+import { useState } from 'react';
+import { useTranslations } from 'next-intl';
+import { useParams, useRouter } from 'next/navigation';
+import {
+  Breadcrumb,
+  Breadcrumbs,
+  Button,
+  Form,
+  Link,
+  Radio,
+} from "react-aria-components";
+
+//Components
+import PageHeader from "@/components/PageHeader";
+import { ContentContainer, LayoutContainer } from "@/components/Container";
+import {
+  RadioGroupComponent
+} from "@/components/Form";
+
+import { routePath } from '@/utils/index';
+import Loading from '@/components/Loading';
+
+
+const ProjectsProjectPlanNew = () => {
+  // Get projectId param
+  const params = useParams();
+  const router = useRouter();
+  const projectId = String(params.projectId); // From route /projects/:projectId
+
+  const REDIRECT_TO_DMP_CREATE = routePath('projects.dmp.create', { projectId });
+  const REDIRECT_TO_DMP_UPLOAD = routePath('projects.dmp.upload', { projectId });
+
+  // Localization keys
+  const t = useTranslations('ProjectsProjectPlanNew');
+  const Global = useTranslations('Global');
+
+  const [dmpPlan, setDmpPlan] = useState({
+    startNewPlan: 'true',
+  });
+  const [isLoading, setIsLoading] = useState(false);
+
+  const updateProjectContent = (
+    key: string,
+    value: string
+  ) => {
+    setDmpPlan((prevContents) => ({
+      ...prevContents,
+      [key]: value,
+    }));
+  };
+
+  // Handle changes from RadioGroup
+  const handleRadioChange = (value: string) => {
+    updateProjectContent('startNewPlan', value);
+  };
+
+  // Handle form submit
+  const handleFormSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setIsLoading(true);
+    if (dmpPlan.startNewPlan === 'true') {
+      router.push(REDIRECT_TO_DMP_CREATE);
+    } else {
+      router.push(REDIRECT_TO_DMP_UPLOAD);
+    }
+  };
+
+  return (
+    <>
+      {isLoading ? (
+        <Loading />
+      ) : (
+        <>
+          <PageHeader
+            title={t('title')}
+            description=""
+            showBackButton={false}
+            breadcrumbs={
+              <Breadcrumbs>
+                <Breadcrumb><Link href="/">{Global('breadcrumbs.home')}</Link></Breadcrumb>
+                <Breadcrumb><Link
+                  href="/projects">{Global('breadcrumbs.projects')}</Link></Breadcrumb>
+                <Breadcrumb><Link
+                  href={`/projects/${projectId}`}>{Global('breadcrumbs.projectOverview')}</Link></Breadcrumb>
+                <Breadcrumb>{Global('breadcrumbs.startDMP')}</Breadcrumb>
+              </Breadcrumbs>
+            }
+            actions={null}
+            className="page-project-list"
+          />
+          <LayoutContainer>
+            <ContentContainer>
+              <Form onSubmit={handleFormSubmit} className="project-detail-form">
+                <div className="project-type-section">
+                  <RadioGroupComponent
+                    name="projectType"
+                    value={dmpPlan.startNewPlan}
+                    aria-label={t('labels.startNewOrUploadExisting')}
+                    radioGroupLabel=""
+                    onChange={handleRadioChange}
+                  >
+                    <div>
+                      <Radio value="true">{t('labels.startNewPlan')}</Radio>
+                    </div>
+
+                    <div>
+                      <Radio value="false">{t('labels.uploadExistingPlan')}</Radio>
+                    </div>
+                  </RadioGroupComponent>
+                </div>
+
+                <Button type="submit" className="submit-button">{Global('buttons.next')}</Button>
+              </Form>
+            </ContentContainer>
+          </LayoutContainer >
+        </>
+      )}
+    </>
+  );
+};
+
+export default ProjectsProjectPlanNew;
diff --git a/app/[locale]/projects/[projectId]/funding-search/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/funding-search/__tests__/page.spec.tsx
index ede6843dd..3808f4efd 100644
--- a/app/[locale]/projects/[projectId]/funding-search/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/funding-search/__tests__/page.spec.tsx
@@ -35,7 +35,7 @@ const mocks = [
         funderOnly: true,
         paginationOptions: {
           type: "CURSOR",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -53,7 +53,7 @@ const mocks = [
             };
           }),
           totalCount: 50,
-          limit: 50,
+          limit: 5,
           nextCursor: null,
           currentOffset: null,
           hasNextPage: false,
@@ -72,7 +72,7 @@ const mocks = [
         funderOnly: true,
         paginationOptions: {
           type: "CURSOR",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -87,7 +87,7 @@ const mocks = [
             apiTarget: null,
           }],
           totalCount: 1,
-          limit: 50,
+          limit: 5,
           nextCursor: null,
           currentOffset: null,
           hasNextPage: false,
@@ -129,7 +129,7 @@ const mocks = [
         funderOnly: true,
         paginationOptions: {
           type: "CURSOR",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -159,7 +159,7 @@ const mocks = [
         funderOnly: true,
         paginationOptions: {
           type: "CURSOR",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -177,7 +177,7 @@ const mocks = [
             };
           }),
           totalCount: 70,
-          limit: 50,
+          limit: 5,
           nextCursor: "page2",
           currentOffset: null,
           hasNextPage: true,
@@ -198,7 +198,7 @@ const mocks = [
         paginationOptions: {
           type: "CURSOR",
           cursor: "page2",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -216,7 +216,7 @@ const mocks = [
             };
           }),
           totalCount: 70,
-          limit: 50,
+          limit: 5,
           nextCursor: null,
           currentOffset: null,
           hasNextPage: true,
diff --git a/app/[locale]/projects/[projectId]/fundings/search/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/fundings/search/__tests__/page.spec.tsx
index 9a33cad20..306ebdc2e 100644
--- a/app/[locale]/projects/[projectId]/fundings/search/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/fundings/search/__tests__/page.spec.tsx
@@ -36,7 +36,7 @@ const mocks = [
         funderOnly: true,
         paginationOptions: {
           type: "CURSOR",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -54,7 +54,7 @@ const mocks = [
             };
           }),
           totalCount: 50,
-          limit: 50,
+          limit: 5,
           nextCursor: null,
           currentOffset: null,
           hasNextPage: false,
@@ -96,7 +96,7 @@ const mocks = [
         funderOnly: true,
         paginationOptions: {
           type: "CURSOR",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -126,7 +126,7 @@ const mocks = [
         funderOnly: true,
         paginationOptions: {
           type: "CURSOR",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -144,7 +144,7 @@ const mocks = [
             };
           }),
           totalCount: 70,
-          limit: 50,
+          limit: 5,
           nextCursor: "page2",
           currentOffset: null,
           hasNextPage: true,
@@ -165,7 +165,7 @@ const mocks = [
         paginationOptions: {
           type: "CURSOR",
           cursor: "page2",
-          limit: 50,
+          limit: 5,
         },
       },
     },
@@ -183,7 +183,7 @@ const mocks = [
             };
           }),
           totalCount: 70,
-          limit: 50,
+          limit: 5,
           nextCursor: null,
           currentOffset: null,
           hasNextPage: true,
diff --git a/app/[locale]/projects/[projectId]/members/ProjectRoles.tsx b/app/[locale]/projects/[projectId]/members/ProjectRoles.tsx
new file mode 100644
index 000000000..8907782e9
--- /dev/null
+++ b/app/[locale]/projects/[projectId]/members/ProjectRoles.tsx
@@ -0,0 +1,75 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
+
+import {
+  Checkbox,
+  Link,
+} from "react-aria-components";
+import { MemberRole } from '@/generated/graphql';
+import { CheckboxGroupComponent } from "@/components/Form";
+
+// Utils
+import styles from './ProjectsProjectMembers.module.scss';
+
+interface RolesInterface {
+  roles: string[];
+  handleCheckboxChange: (newValues: string[]) => void;
+  isInvalid?: boolean;
+  errorMessage?: string;
+  memberRoles: MemberRole[];
+}
+
+const ProjectRoles = ({ roles, handleCheckboxChange, isInvalid, errorMessage, memberRoles }: RolesInterface) => {
+  // Translation keys
+  const Global = useTranslations('Global');
+  const t = useTranslations('ProjectsProjectMembersSearch');
+
+  // Description for the member roles checkbox radio group
+  const rolesDescription = t.rich('memberRolesDescription', {
+    p: (chunks) => <p>{chunks}</p>,
+    link: (chunks) => (
+      <Link href="https://credit.niso.org/" target="_blank" rel="noopener noreferrer">
+        {chunks}
+        <span className="hidden-accessibly">({Global('opensInNewTab')})</span>
+      </Link>
+    )
+  });
+
+  return (
+    <>
+      <div className={styles.memberRoles}>
+        <CheckboxGroupComponent
+          name="memberRoles"
+          value={roles}
+          checkboxGroupLabel={t('labels.definedRole')}
+          checkboxGroupDescription={rolesDescription}
+          onChange={(newValues) => handleCheckboxChange(newValues)}
+          isRequired={false}
+          isInvalid={isInvalid}
+          errorMessage={errorMessage}
+        >
+          {memberRoles.map((role, index) => (
+            <Checkbox key={role?.id ?? index} value={role?.id?.toString() ?? ''} aria-label={t('labels.ariaMemberRoles')}>
+              <div className="checkbox">
+                <svg viewBox="0 0 18 18" aria-hidden="true">
+                  <polyline points="1 9 7 14 15 4" />
+                </svg>
+              </div>
+              <div className="">
+                <span>
+                  {role.label}
+                </span>
+
+              </div>
+            </Checkbox>
+          ))}
+        </CheckboxGroupComponent>
+
+      </div>
+
+    </>
+  );
+};
+
+export default ProjectRoles;
diff --git a/app/[locale]/projects/[projectId]/members/[memberId]/edit/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/members/[memberId]/edit/__tests__/page.spec.tsx
index 32b667faa..87a0b695f 100644
--- a/app/[locale]/projects/[projectId]/members/[memberId]/edit/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/members/[memberId]/edit/__tests__/page.spec.tsx
@@ -182,9 +182,15 @@ describe("ProjectsProjectMembersEdit", () => {
     expect(screen.getByRole('textbox', { name: /email/i })).toBeInTheDocument();
     expect(screen.getByLabelText(/form.labels.orcid/i)).toBeInTheDocument();
     expect(screen.getByRole('textbox', { name: /orcid/i })).toBeInTheDocument();
-    expect(screen.getByText('form.labels.checkboxGroupLabel')).toBeInTheDocument();
-    expect(screen.getByText('form.labels.checkboxGroupDescription')).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /buttons.saveChanges/i })).toBeInTheDocument();
+
+    // Check for checkbox group
+    const checkboxGroup = screen.getByTestId('checkbox-group');
+    expect(checkboxGroup).toBeInTheDocument();
+    expect(screen.getByText('labels.definedRole')).toBeInTheDocument();
+    expect(screen.getByText('memberRolesDescription')).toBeInTheDocument();
+    expect(within(checkboxGroup).getByText('Principal Investigator (PI)')).toBeInTheDocument();
+    expect(within(checkboxGroup).getByText('Project Administrator')).toBeInTheDocument();
   });
 
   it("should handle form submission", async () => {
diff --git a/app/[locale]/projects/[projectId]/members/[memberId]/edit/page.tsx b/app/[locale]/projects/[projectId]/members/[memberId]/edit/page.tsx
index d90b8cb0c..06b2666c7 100644
--- a/app/[locale]/projects/[projectId]/members/[memberId]/edit/page.tsx
+++ b/app/[locale]/projects/[projectId]/members/[memberId]/edit/page.tsx
@@ -8,7 +8,6 @@ import {
   Breadcrumb,
   Breadcrumbs,
   Button,
-  Checkbox,
   Form,
   Link,
   Dialog,
@@ -23,8 +22,9 @@ import {
   ContentContainer,
   LayoutContainer
 } from "@/components/Container";
-import { FormInput, CheckboxGroupComponent } from "@/components/Form";
+import { FormInput } from "@/components/Form";
 import ErrorMessages from '@/components/ErrorMessages';
+import ProjectRoles from '../../ProjectRoles';
 
 // GraphQL
 import {
@@ -454,34 +454,15 @@ const ProjectsProjectMembersEdit: React.FC = () => {
                   errorMessage={fieldErrors.orcid || t('form.errors.orcid')}
                 />
 
-                <CheckboxGroupComponent
-                  name="projectRoles"
-                  value={checkboxRoles}
-                  onChange={(newValues) => handleCheckboxChange(newValues)}
-                  isRequired={true}
-                  checkboxGroupLabel={t('form.labels.checkboxGroupLabel')}
-                  checkboxGroupDescription={t('form.labels.checkboxGroupDescription')}
-                  isInvalid={checkboxRoles.length === 0}
-                  errorMessage={fieldErrors.projectRoles || t('form.errors.projectRoles')}
-                >
-                  {state.roles.map((role, index) => (
-                    <div key={index}>
-                      <Checkbox value={role?.id?.toString() ?? ''} aria-label="project roles option">
-                        <div className="checkbox">
-                          <svg viewBox="0 0 18 18" aria-hidden="true">
-                            <polyline points="1 9 7 14 15 4" />
-                          </svg>
-                        </div>
-                        <div className="">
-                          <span>
-                            {role.label}
-                          </span>
-
-                        </div>
-                      </Checkbox>
-                    </div>
-                  ))}
-                </CheckboxGroupComponent>
+                <div className={styles.memberRoles}>
+                  <ProjectRoles
+                    roles={checkboxRoles}
+                    handleCheckboxChange={handleCheckboxChange}
+                    isInvalid={(!!fieldErrors.projectRoles)}
+                    errorMessage={fieldErrors.projectRoles}
+                    memberRoles={state.roles}
+                  />
+                </div>
 
                 <Button type="submit">{Global('buttons.saveChanges')}</Button>
               </div>
diff --git a/app/[locale]/projects/[projectId]/members/search/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/members/search/__tests__/page.spec.tsx
index a10df2a6d..7f40d56c7 100644
--- a/app/[locale]/projects/[projectId]/members/search/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/members/search/__tests__/page.spec.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent, within } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
 import '@testing-library/jest-dom';
 import { useParams, useRouter } from 'next/navigation';
@@ -134,6 +134,12 @@ describe('ProjectsProjectMembersSearch Integration Tests', () => {
       expect(screen.getByRole('textbox', { name: /labels\.givenName/ })).toBeInTheDocument();
       expect(screen.getByRole('textbox', { name: /labels\.surName/ })).toBeInTheDocument();
       expect(screen.getByRole('textbox', { name: /labels\.email/ })).toBeInTheDocument();
+
+      // Check for checkbox group
+      const checkboxGroup = screen.getByTestId('checkbox-group');
+      expect(checkboxGroup).toBeInTheDocument();
+      expect(within(checkboxGroup).getByText('Principal Investigator')).toBeInTheDocument();
+      expect(within(checkboxGroup).getByText('Co-Investigator')).toBeInTheDocument();
     });
 
     it('should handle search input and calls hook methods correctly', () => {
diff --git a/app/[locale]/projects/[projectId]/members/search/page.tsx b/app/[locale]/projects/[projectId]/members/search/page.tsx
index 685ce5c3d..7a14a06cb 100644
--- a/app/[locale]/projects/[projectId]/members/search/page.tsx
+++ b/app/[locale]/projects/[projectId]/members/search/page.tsx
@@ -8,7 +8,6 @@ import {
   Breadcrumb,
   Breadcrumbs,
   Button,
-  Checkbox,
   Form,
   Input,
   Label,
@@ -29,10 +28,10 @@ import {
   LayoutContainer,
 } from "@/components/Container";
 import { OrcidIcon } from '@/components/Icons/orcid/';
-import { CheckboxGroupComponent, FormInput } from "@/components/Form";
+import { FormInput } from "@/components/Form";
 import { TypeAheadWithOther, useAffiliationSearch } from '@/components/Form/TypeAheadWithOther';
 import Loading from '@/components/Loading';
-
+import ProjectRoles from '../ProjectRoles';
 import ErrorMessages from '@/components/ErrorMessages';
 
 // Hooks
@@ -156,17 +155,6 @@ const ProjectsProjectMembersSearch = () => {
     }
   }, [term, clearAllFormFields, resetErrors])
 
-  // Description for the member roles checkbox radio group
-  const rolesDescription = t.rich('memberRolesDescription', {
-    p: (chunks) => <p>{chunks}</p>,
-    link: (chunks) => (
-      <Link href="https://credit.niso.org/" target="_blank" rel="noopener noreferrer">
-        {chunks}
-        <span className="hidden-accessibly">({Global('opensInNewTab')})</span>
-      </Link>
-    )
-  });
-
   return (
     <>
       <PageHeader
@@ -358,38 +346,19 @@ const ProjectsProjectMembersSearch = () => {
               />
 
               <div className={styles.memberRoles}>
-                <CheckboxGroupComponent
-                  name="memberRoles"
-                  value={roles}
-                  checkboxGroupLabel={t('labels.definedRole')}
-                  checkboxGroupDescription={rolesDescription}
-                  onChange={(newValues) => handleCheckboxChange(newValues)}
-                  isRequired={false}
+                <ProjectRoles
+                  roles={roles}
+                  handleCheckboxChange={handleCheckboxChange}
                   isInvalid={(!!fieldErrors.projectRoles)}
                   errorMessage={fieldErrors.projectRoles}
-                >
-                  {memberRoles.map((role, index) => (
-                    <Checkbox key={role?.id ?? index} value={role?.id?.toString() ?? ''} aria-label={t('labels.ariaMemberRoles')}>
-                      <div className="checkbox">
-                        <svg viewBox="0 0 18 18" aria-hidden="true">
-                          <polyline points="1 9 7 14 15 4" />
-                        </svg>
-                      </div>
-                      <div className="">
-                        <span>
-                          {role.label}
-                        </span>
-
-                      </div>
-                    </Checkbox>
-                  ))}
-                </CheckboxGroupComponent>
+                  memberRoles={memberRoles}
+                />
               </div>
               <Button type="submit" className="submit-button">{t('buttons.addToProject')}</Button>
             </Form>
           </section>
         </ContentContainer>
-      </LayoutContainer>
+      </LayoutContainer >
     </>
   );
 };
diff --git a/app/[locale]/projects/[projectId]/page.tsx b/app/[locale]/projects/[projectId]/page.tsx
index 5ac528585..f0de1606f 100644
--- a/app/[locale]/projects/[projectId]/page.tsx
+++ b/app/[locale]/projects/[projectId]/page.tsx
@@ -28,17 +28,12 @@ interface ProjectMemberInterface {
   email: string;
 }
 
-interface ResearchOutputsInterface {
-  title: string;
-}
-
 interface ProjectOverviewInterface {
   title: string;
   startDate: string | null;
   endDate: string | null;
   fundings: FundingInterface[];
   projectMembers: ProjectMemberInterface[];
-  researchOutputs: ResearchOutputsInterface[];
   plans: PlanSearchResult[];
   dmpId?: string;
   modified?: string;
@@ -57,7 +52,6 @@ const ProjectOverviewPage: React.FC = () => {
     fundings: [],
     plans: [],
     projectMembers: [],
-    researchOutputs: [],
   });
 
   // Localization keys
@@ -130,12 +124,6 @@ const ProjectOverviewPage: React.FC = () => {
               email: member.email ?? "",
               role: (member.memberRoles ?? []).map((role) => role.label),
             })) ?? [], // Provide a default empty array
-        researchOutputs:
-          data.project.outputs
-            ?.filter((output) => output !== null) // Filter out null
-            .map((output) => ({
-              title: output.title ?? "",
-            })) ?? [], // Provide a default empty array
       });
     }
   }, [data]);
@@ -178,7 +166,7 @@ const ProjectOverviewPage: React.FC = () => {
             <OverviewSection
               heading={ProjectOverview("project")}
               headingId="project-title"
-              linkHref={routePath("projects.project.info", { projectId })}
+              linkHref={routePath("projects.project.info", { projectId }, { fromOverview: 'true' })}
               linkText={ProjectOverview("edit")}
               linkAriaLabel={ProjectOverview("editProject")}
             >
@@ -213,9 +201,9 @@ const ProjectOverviewPage: React.FC = () => {
                   >
                     {funding.grantId
                       ? ProjectOverview("fundingInfo", {
-                          name: funding.name,
-                          id: funding.grantId,
-                        })
+                        name: funding.name,
+                        id: funding.grantId,
+                      })
                       : funding.name}
                     {index < project.fundings.length - 1 && ", "}
                   </span>
@@ -245,18 +233,6 @@ const ProjectOverviewPage: React.FC = () => {
                 ))}
               </p>
             </OverviewSection>
-
-            <OverviewSection
-              heading={ProjectOverview("researchOutputs")}
-              headingId="outputs-title"
-              linkHref={routePath("projects.outputs.index", { projectId })}
-              linkText={ProjectOverview("editOutputs")}
-              linkAriaLabel={ProjectOverview("editOutputs")}
-            >
-              <p>
-                <strong>{ProjectOverview("outputCount", { count: project.researchOutputs.length })}</strong>
-              </p>
-            </OverviewSection>
           </div>
 
           <section
@@ -392,7 +368,7 @@ const ProjectOverviewPage: React.FC = () => {
                   {ProjectOverview("status.collaboration.link_text")}
                 </Link>
               </div>
-              {/** Feedback 
+              {/** Feedback
               <div className={`panelRow mb-5`}>
                 <div>
                   <h3>{ProjectOverview('status.feedback.title')}</h3>
diff --git a/app/[locale]/projects/[projectId]/project/__tests__/page.spec.tsx b/app/[locale]/projects/[projectId]/project/__tests__/page.spec.tsx
index 39a7fdb62..b0b3aa947 100644
--- a/app/[locale]/projects/[projectId]/project/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/[projectId]/project/__tests__/page.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { act, fireEvent, render, screen, within, waitFor } from '@testing-library/react';
-import { useParams, useRouter } from 'next/navigation';
+import { useParams, useRouter, useSearchParams } from 'next/navigation';
 import { ApolloError } from '@apollo/client';
 
 import {
@@ -20,10 +20,9 @@ expect.extend(toHaveNoViolations);
 jest.mock('next/navigation', () => ({
   useParams: jest.fn(),
   useRouter: jest.fn(),
+  useSearchParams: jest.fn()
 }));
 
-const mockUseRouter = useRouter as jest.Mock;
-
 jest.mock('@/generated/graphql', () => ({
   useProjectQuery: jest.fn(),
   useTopLevelResearchDomainsQuery: jest.fn(),
@@ -41,6 +40,7 @@ const mockChildDomains = {
 const mockRefetch = jest.fn();
 
 describe('ProjectsProjectDetail', () => {
+  let mockRouter;
   const mockUseParams = useParams as jest.Mock;
   const mockUseProjectQuery = useProjectQuery as jest.Mock;
   const mockUseTopLevelResearchDomainsQuery = useTopLevelResearchDomainsQuery as jest.Mock;
@@ -51,9 +51,8 @@ describe('ProjectsProjectDetail', () => {
     mockScrollTo();
     mockUseParams.mockReturnValue({ projectId: '1' });
 
-    mockUseRouter.mockReturnValue({
-      push: jest.fn(),
-    })
+    mockRouter = { push: jest.fn() };
+    (useRouter as jest.Mock).mockReturnValue(mockRouter);
     mockUseProjectQuery.mockReturnValue({
       data: {
         project: {
@@ -85,6 +84,24 @@ describe('ProjectsProjectDetail', () => {
       data: mockChildDomains,
       loading: false, error: undefined,
     });
+
+    // Render with text question type
+    (useSearchParams as jest.MockedFunction<typeof useSearchParams>).mockImplementation(() => {
+      return {
+        get: (key: string) => {
+          const params: Record<string, string> = { fromOverview: 'true' };
+          return params[key] || null;
+        },
+        getAll: () => [],
+        has: (key: string) => key in { fromOverview: 'true' },
+        keys() { },
+        values() { },
+        entries() { },
+        forEach() { },
+        toString() { return ''; },
+      } as unknown as ReturnType<typeof useSearchParams>;
+    });
+
   });
 
   it('should render the project details form', () => {
@@ -150,8 +167,12 @@ describe('ProjectsProjectDetail', () => {
 
     render(<ProjectsProjectDetail />);
     fireEvent.change(screen.getByLabelText(/labels.projectName/), { target: { value: 'Updated Project' } });
-    fireEvent.submit(screen.getByRole('button', { name: /save/i }));
+    await waitFor(() => {
+      fireEvent.submit(screen.getByRole('button', { name: /save/i }));
+    })
 
+    // Verify that router.push was called with "/login"
+    expect(mockRouter.push).toHaveBeenCalledWith('/en-US/projects/1');
     expect(mockUpdateProjectMutation).toHaveBeenCalledWith({
       variables: {
         input: {
@@ -269,7 +290,7 @@ describe('ProjectsProjectDetail', () => {
 
     const searchBtn = screen.getByTestId('search-projects-button');
     fireEvent.click(searchBtn);
-    expect(mockUseRouter().push).toHaveBeenCalledWith('/en-US/projects/1/projects-search');
+    expect(mockRouter.push).toHaveBeenCalledWith('/en-US/projects/1/projects-search');
   });
 
   it('should pass axe accessibility test', async () => {
diff --git a/app/[locale]/projects/[projectId]/project/page.tsx b/app/[locale]/projects/[projectId]/project/page.tsx
index cc1f5843a..9fd00ea82 100644
--- a/app/[locale]/projects/[projectId]/project/page.tsx
+++ b/app/[locale]/projects/[projectId]/project/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useRef, useState } from 'react';
 import { ApolloError } from '@apollo/client';
 import { useTranslations } from 'next-intl';
-import { useParams, useRouter } from 'next/navigation';
+import { useParams, useRouter, useSearchParams } from 'next/navigation';
 import { CalendarDate, DateValue, parseDate } from "@internationalized/date";
 import {
   Breadcrumb,
@@ -40,20 +40,12 @@ import { getCalendarDateValue } from "@/utils/dateUtils";
 import { scrollToTop } from '@/utils/general';
 import { logECS, routePath } from '@/utils/index';
 import { useToast } from '@/context/ToastContext';
+import { ProjectDetailsFormInterface } from "@/app/types";
 
-interface ProjectFormErrorsInterface {
-  projectName: string;
-  projectAbstract: string;
-}
 
-interface ProjectDetailsFormInterface {
+interface ProjectFormErrorsInterface {
   projectName: string;
   projectAbstract: string;
-  startDate: string | CalendarDate | null;
-  endDate: string | CalendarDate | null;
-  researchDomainId: string | number;
-  isTestProject: string | boolean;
-  parentResearchDomainId: string | number;
 }
 
 const ProjectsProjectDetail = () => {
@@ -61,6 +53,8 @@ const ProjectsProjectDetail = () => {
 
   // Get projectId param
   const params = useParams();
+  const searchParams = useSearchParams();
+  const fromOverview = searchParams.get('fromOverview');
   const router = useRouter();
   const projectId = String(params.projectId); // From route /projects/:projectId
 
@@ -255,8 +249,14 @@ const ProjectsProjectDetail = () => {
       } else {
         // Show success message
         showSuccessToast();
-        // Redirect to the Project Overview page
-        router.push(routePath('projects.show', { projectId }))
+
+        if (fromOverview) {
+          // If navigated from Project Overview, return user to the page
+          router.push(routePath('projects.show', { projectId }));
+        } else {
+          // Redirect to the DMP start page
+          router.push(routePath('projects.dmp.start', { projectId }))
+        }
       }
     }
   };
diff --git a/app/[locale]/projects/__tests__/page.spec.tsx b/app/[locale]/projects/__tests__/page.spec.tsx
index 6e1b78d27..53c2fc0c8 100644
--- a/app/[locale]/projects/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/__tests__/page.spec.tsx
@@ -574,9 +574,9 @@ describe("ProjectsListPage", () => {
     await waitFor(() => {
       expect(screen.getByRole("link", { name: /Global.breadcrumbs.home/i })).toBeInTheDocument();
       expect(screen.getByRole("link", { name: /Global.breadcrumbs.project/i })).toBeInTheDocument();
-      expect(screen.getByRole("heading", { name: /Global.breadcrumbs.projects/i })).toBeInTheDocument();
+      expect(screen.getByRole("heading", { name: /Global.breadcrumbs.planDashboard/i })).toBeInTheDocument();
       expect(screen.getByText("ProjectsListPage.intro")).toBeInTheDocument();
-      expect(screen.getByText("ProjectsListPage.buttons.createProject")).toBeInTheDocument();
+      expect(screen.getByText("Global.buttons.createNewPlan")).toBeInTheDocument();
       expect(screen.getByText("Global.labels.searchByKeyword")).toBeInTheDocument();
       expect(screen.getByRole("button", { name: /Clear search/i })).toBeInTheDocument();
       expect(screen.getByText("Global.helpText.searchHelpText") as HTMLElement).toBeInTheDocument();
diff --git a/app/[locale]/projects/create-project/__tests__/page.spec.tsx b/app/[locale]/projects/create-project/__tests__/page.spec.tsx
index 4b3cac301..68fa9f7c5 100644
--- a/app/[locale]/projects/create-project/__tests__/page.spec.tsx
+++ b/app/[locale]/projects/create-project/__tests__/page.spec.tsx
@@ -51,6 +51,25 @@ const mocks = [
     },
   },
 
+  {
+    request: {
+      query: AddProjectDocument,
+      variables: {
+        title: "Test Project",
+        isTestProject: false,
+      },
+    },
+
+    result: {
+      data: {
+        addProject: {
+          id: 123,
+          errors: [],
+        },
+      }
+    },
+  },
+
   // This is to create the error result
   {
     request: {
@@ -95,6 +114,17 @@ const mocks = [
       },
     },
   },
+  // Mock error response for addProject
+  {
+    request: {
+      query: AddProjectDocument,
+      variables: {
+        title: "Server Error",
+        isTestProject: false,
+      },
+    },
+    error: new Error('Server Error'),
+  },
 
   // Mocked Server error for addProjectFunding
   {
@@ -156,11 +186,8 @@ describe('ProjectsCreateProject', () => {
     expect(screen.getByRole('heading', { level: 1, name: /pageTitle/i })).toBeInTheDocument();
     expect(screen.getByLabelText(/form.projectTitle/i)).toBeInTheDocument();
     expect(screen.getByText(/form.projectTitleHelpText/i)).toBeInTheDocument();
-    expect(screen.getByText(/form.checkboxLabel/i)).toBeInTheDocument();
-    expect(screen.getByText(/form.checkboxHelpText/i)).toBeInTheDocument();
-    expect(screen.getByRole('checkbox', { name: "isThisMockProject" })).toBeInTheDocument();
-    expect(screen.getByText(/form.checkboxGroupLabel/i)).toBeInTheDocument();
-    expect(screen.getByText(/form.checkboxGroupHelpText/i)).toBeInTheDocument();
+    expect(screen.getByLabelText('labels.realProject')).toBeInTheDocument();
+    expect(screen.getByLabelText('labels.mockProject')).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /buttons.continue/i })).toBeInTheDocument();
   });
 
@@ -174,7 +201,7 @@ describe('ProjectsCreateProject', () => {
     });
 
     fireEvent.change(screen.getByLabelText(/form.projectTitle/i), { target: { value: 'Test Project' } });
-    fireEvent.click(screen.getByLabelText(/form.checkboxLabel/i));
+    fireEvent.click(screen.getByLabelText('labels.realProject'));
     fireEvent.click(screen.getByRole('button', { name: /buttons.continue/i }));
 
     await waitFor(() => {
@@ -192,7 +219,13 @@ describe('ProjectsCreateProject', () => {
       );
     });
 
+    // Fill in project title
     fireEvent.change(screen.getByLabelText(/form.projectTitle/i), { target: { value: 'Non-Test Project' } });
+
+    // Select "Real project" radio
+    fireEvent.click(screen.getByLabelText('labels.realProject'));
+
+    // Submit the form
     fireEvent.click(screen.getByRole('button', { name: /buttons.continue/i }));
 
     await waitFor(() => {
@@ -211,7 +244,9 @@ describe('ProjectsCreateProject', () => {
     });
 
     fireEvent.change(screen.getByLabelText(/form.projectTitle/i), { target: { value: '' } });
-    fireEvent.click(screen.getByLabelText(/form.checkboxLabel/i));
+    // Select "Real project" radio
+    fireEvent.click(screen.getByLabelText('labels.realProject'));
+
     fireEvent.click(screen.getByRole('button', { name: /buttons.continue/i }));
 
     await waitFor(() => {
@@ -266,7 +301,8 @@ describe('ProjectsCreateProject', () => {
     });
 
     fireEvent.change(screen.getByLabelText(/form.projectTitle/i), { target: { value: 'Server Error' } });
-    fireEvent.click(screen.getByLabelText(/form.checkboxLabel/i));
+    // Select "Real project" radio
+    fireEvent.click(screen.getByLabelText('labels.realProject'));
     fireEvent.click(screen.getByRole('button', { name: /buttons.continue/i }));
 
     await waitFor(() => {
diff --git a/app/[locale]/projects/create-project/page.tsx b/app/[locale]/projects/create-project/page.tsx
index b9e5a5d80..a6af8dc09 100644
--- a/app/[locale]/projects/create-project/page.tsx
+++ b/app/[locale]/projects/create-project/page.tsx
@@ -7,9 +7,10 @@ import {
   Breadcrumb,
   Breadcrumbs,
   Button,
-  Checkbox,
   Form,
   Link,
+  Radio,
+  Text
 } from "react-aria-components";
 
 //GraphQL
@@ -25,8 +26,8 @@ import {
   LayoutContainer,
 } from "@/components/Container";
 import {
-  CheckboxGroupComponent,
   FormInput,
+  RadioGroupComponent
 } from '@/components/Form';
 import ErrorMessages from '@/components/ErrorMessages';
 
@@ -36,16 +37,17 @@ import { scrollToTop } from '@/utils/general';
 import { routePath } from '@/utils/routes';
 import { useToast } from '@/context/ToastContext';
 import { checkErrors } from '@/utils/errorHandler';
+import styles from './projectsCreateProject.module.scss';
 
 
 interface CreateProjectInterface {
   projectName: string;
-  checkboxGroup?: string[];
+  radioGroup?: string;
 }
 
 interface CreateProjectErrorsInterface {
   projectName: string;
-  checkboxGroup?: string;
+  radioGroup?: string;
 }
 
 const ProjectsCreateProject = () => {
@@ -57,11 +59,11 @@ const ProjectsCreateProject = () => {
 
   const [fieldErrors, setFieldErrors] = useState<CreateProjectErrorsInterface>({
     projectName: '',
-    checkboxGroup: '',
+    radioGroup: '',
   });
   const [formData, setFormData] = useState<CreateProjectInterface>({
     projectName: '',
-    checkboxGroup: [],
+    radioGroup: ''
   })
   const [formSubmitted, setFormSubmitted] = useState(false);
   const [errors, setErrors] = useState<string[]>([]);
@@ -84,15 +86,23 @@ const ProjectsCreateProject = () => {
     handleUpdate(name, value);
   };
 
-  // Handle changes from CheckboxGroup
-  const handleCheckboxChange = (value: string[]) => {
-    setFormSubmitted(false);
+  const updateProjectContent = (
+    key: string,
+    value: string
+  ) => {
     setFormData((prev) => ({
       ...prev,
-      checkboxGroup: value
+      [key]: value
     }))
   };
 
+  // Handle changes from CheckboxGroup
+  const handleRadioChange = (value: string) => {
+    setFormSubmitted(false);
+    updateProjectContent('radioGroup', value);
+  };
+
+
   // Show Success Message
   const showSuccessToast = () => {
     const successMessage = CreateProject('messages.success');
@@ -115,7 +125,7 @@ const ProjectsCreateProject = () => {
   const isFormValid = (): boolean => {
     const errors: CreateProjectErrorsInterface = {
       projectName: '',
-      checkboxGroup: '',
+      radioGroup: '',
     };
 
     let hasError = false;
@@ -146,7 +156,7 @@ const ProjectsCreateProject = () => {
     setErrors([]);
 
     if (isFormValid()) {
-      const isTestProject = formData.checkboxGroup?.includes('checkboxGroup');
+      const isTestProject = formData.radioGroup === "true";
 
       // Create new section
       addProjectMutation({
@@ -197,7 +207,7 @@ const ProjectsCreateProject = () => {
     <>
       <PageHeader
         title={CreateProject('pageTitle')}
-        description=""
+        description={CreateProject('description')}
         showBackButton={false}
         breadcrumbs={
           <Breadcrumbs>
@@ -230,33 +240,31 @@ const ProjectsCreateProject = () => {
               id="projectName"
             />
 
-            <CheckboxGroupComponent
-              name="checkboxGroup"
-              value={formData.checkboxGroup}
-              onChange={handleCheckboxChange}
-              isRequired={false}
-              checkboxGroupLabel={CreateProject('form.checkboxGroupLabel')}
-              checkboxGroupDescription={CreateProject('form.checkboxGroupHelpText')}
+            <RadioGroupComponent
+              name="projectType"
+              value={formData.radioGroup}
+              classes={`${styles.radioGroup} react-aria-RadioGroup`}
+              radioGroupLabel={CreateProject('form.radioGroupLabel')}
+              onChange={handleRadioChange}
             >
-
-              <Checkbox value="checkboxGroup" aria-label={CreateProject('isThisMockProject')}>
-                <div className="checkbox">
-                  <svg viewBox="0 0 18 18" aria-hidden="true">
-                    <polyline points="1 9 7 14 15 4" />
-                  </svg>
-                </div>
-                <div className="">
-                  <span>
-                    {CreateProject('form.checkboxLabel')}
-                  </span>
-                  <br />
-                  <span className="help">
-                    {CreateProject('form.checkboxHelpText')}
-                  </span>
-                </div>
-              </Checkbox>
-
-            </CheckboxGroupComponent>
+              <div>
+                <Radio value="true">{CreateProject('labels.mockProject')}</Radio>
+                <Text
+                  slot="description"
+                >
+                  {CreateProject('descriptions.mockProject')}
+                </Text>
+              </div>
+
+              <div>
+                <Radio value="false">{CreateProject('labels.realProject')}</Radio>
+                <Text
+                  slot="description"
+                >
+                  {CreateProject('descriptions.realProject')}
+                </Text>
+              </div>
+            </RadioGroupComponent>
 
             <Button
               type="submit"
diff --git a/app/[locale]/projects/create-project/projectsCreateProject.module.scss b/app/[locale]/projects/create-project/projectsCreateProject.module.scss
new file mode 100644
index 000000000..a21a0e7c7
--- /dev/null
+++ b/app/[locale]/projects/create-project/projectsCreateProject.module.scss
@@ -0,0 +1,3 @@
+.radioGroup :global(.react-aria-Label) {
+  margin-bottom: var(--space-4) !important;
+}
\ No newline at end of file
diff --git a/app/[locale]/projects/page.tsx b/app/[locale]/projects/page.tsx
index 2ffb70926..a236ef9b7 100644
--- a/app/[locale]/projects/page.tsx
+++ b/app/[locale]/projects/page.tsx
@@ -302,20 +302,20 @@ const ProjectsListPage: React.FC = () => {
   return (
     <>
       <PageHeader
-        title={Global('breadcrumbs.projects')}
+        title={Global('breadcrumbs.planDashboard')}
         description={Project('intro')}
         showBackButton={false}
         breadcrumbs={
           <Breadcrumbs>
             <Breadcrumb><Link href="/">{Global('breadcrumbs.home')}</Link></Breadcrumb>
             <Breadcrumb><Link href="/projects">{Global('breadcrumbs.projects')}</Link></Breadcrumb>
-            <Breadcrumb>{Global('breadcrumbs.projects')}</Breadcrumb>
+            <Breadcrumb>{Global('breadcrumbs.planDashboard')}</Breadcrumb>
           </Breadcrumbs>
         }
         actions={
           <>
             <Link href="/projects/create-project"
-              className={"button-link button--primary"}>{Project('buttons.createProject')}</Link>
+              className={"button-link button--primary"}>{Global('buttons.createNewPlan')}</Link>
           </>
         }
         className="page-project-list"
diff --git a/app/[locale]/template/[templateId]/q/[q_slug]/page.tsx b/app/[locale]/template/[templateId]/q/[q_slug]/page.tsx
index 2240d2bd7..7de286043 100644
--- a/app/[locale]/template/[templateId]/q/[q_slug]/page.tsx
+++ b/app/[locale]/template/[templateId]/q/[q_slug]/page.tsx
@@ -640,7 +640,7 @@ const QuestionEdit = () => {
                   name="question_requirements"
                   isRequired={false}
                   richText={true}
-                  description={t('helpText.requirementText')}
+                  helpMessage={t('helpText.requirementText')}
                   textAreaClasses={styles.questionFormField}
                   label={t('labels.requirementText')}
                   value={question?.requirementText ? question.requirementText : ''}
@@ -667,6 +667,7 @@ const QuestionEdit = () => {
                     }));
                     setHasUnsavedChanges(true);
                   }}
+                  helpMessage={t('helpText.guidanceText')}
                 />
 
                 {questionType === TEXT_AREA_QUESTION_TYPE && (
diff --git a/app/[locale]/template/[templateId]/section/[section_slug]/page.tsx b/app/[locale]/template/[templateId]/section/[section_slug]/page.tsx
index a1d413b9a..a311e73ea 100644
--- a/app/[locale]/template/[templateId]/section/[section_slug]/page.tsx
+++ b/app/[locale]/template/[templateId]/section/[section_slug]/page.tsx
@@ -445,7 +445,7 @@ const SectionUpdatePage: React.FC = () => {
                                 <div className="checkbox-wrapper">
                                   <div>{tag.name}</div>
                                   <DialogTrigger>
-                                    <Button className="popover-btn" aria-label="Click for more info"><div className="icon"><DmpIcon icon="info" /></div></Button>
+                                    <Button className="popover-btn" aria-label="Click for more info"><div className="icon info"><DmpIcon icon="info" /></div></Button>
                                     <Popover>
                                       <OverlayArrow>
                                         <svg width={12} height={12} viewBox="0 0 12 12">
diff --git a/app/[locale]/template/[templateId]/section/create/page.tsx b/app/[locale]/template/[templateId]/section/create/page.tsx
index a30cd9c51..389297b2a 100644
--- a/app/[locale]/template/[templateId]/section/create/page.tsx
+++ b/app/[locale]/template/[templateId]/section/create/page.tsx
@@ -442,7 +442,7 @@ const CreateSectionPage: React.FC = () => {
                                   <DialogTrigger>
                                     <Button className="popover-btn"
                                       aria-label="Click for more info"><div
-                                        className="icon"><DmpIcon
+                                        className="icon info"><DmpIcon
                                           icon="info" /></div></Button>
                                     <Popover>
                                       <OverlayArrow>
diff --git a/app/[locale]/template/page.tsx b/app/[locale]/template/page.tsx
index d6f4c21b7..a472e822d 100644
--- a/app/[locale]/template/page.tsx
+++ b/app/[locale]/template/page.tsx
@@ -12,7 +12,8 @@ import {
   SearchField,
   Text
 } from 'react-aria-components';
-import { useFormatter, useTranslations } from 'next-intl';
+import { useTranslations } from 'next-intl';
+import { useFormatDate } from '@/hooks/useFormatDate';
 
 //GraphQL
 import { useTemplatesLazyQuery } from '@/generated/graphql';
@@ -40,7 +41,7 @@ const LIMIT = 5;
 
 
 const TemplateListPage: React.FC = () => {
-  const formatter = useFormatter();
+  const formatDate = useFormatDate();
   const { scrollToTop } = useScrollToTop();
 
   const errorRef = useRef<HTMLDivElement | null>(null);
@@ -165,17 +166,6 @@ const TemplateListPage: React.FC = () => {
     });
   };
 
-  // Format date using next-intl date formatter
-  const formatDate = (date: string) => {
-    const formattedDate = formatter.dateTime(new Date(Number(date)), {
-      year: 'numeric',
-      month: '2-digit',
-      day: '2-digit',
-    })
-    // Replace slashes with hyphens
-    return formattedDate.replace(/\//g, '-');
-  }
-
   useEffect(() => {
     // Need this to set list of projects back to original, full list after filtering
     if (searchTerm === '') {
diff --git a/app/api/download-narrative/route.ts b/app/api/download-narrative/route.ts
new file mode 100644
index 000000000..0968e1506
--- /dev/null
+++ b/app/api/download-narrative/route.ts
@@ -0,0 +1,74 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { cookies } from "next/headers";
+import { createLogger } from '@/utils/server/logger';
+
+const logger = createLogger();
+
+export async function GET(request: NextRequest) {
+  try {
+    const searchParams = request.nextUrl.searchParams;
+    const dmpId = searchParams.get('dmpId'); // Get the doi, passed as dmpId, from query parameters
+
+    // Get all cookies to pass in request header
+    const cookieStore = await cookies();
+    const cookieString = cookieStore.toString();
+
+    if (!dmpId) {
+      return NextResponse.json({ error: 'dmpId is required' }, { status: 400 });
+    }
+
+    // Build the narrative service URL
+    // Use environment variable for the narrative service URL
+    const narrativeServiceBase = process.env.NARRATIVE_SERVICE_URL || 'http://localhost:4030';
+    const narrativeUrl = new URL(`${narrativeServiceBase}/dmps/${encodeURIComponent(dmpId)}/narrative`); // Encode dmpId for URL safety and because of forward slashes in DOIs
+
+    // Forward all other query parameters
+    searchParams.forEach((value, key) => {
+      if (key !== 'dmpId') {
+        narrativeUrl.searchParams.append(key, value);
+      }
+    });
+
+    // Get the Accept header from the original request
+    const acceptHeader = request.headers.get('accept') || 'application/pdf';
+
+    // Headers for the GraphQL request
+    const headers = {
+      Accept: acceptHeader,
+      Cookie: cookieString,
+    };
+
+    // Fetch from the narrative service
+    const response = await fetch(narrativeUrl.toString(), {
+      headers
+    });
+
+    if (!response.ok) {
+      return NextResponse.json(
+        { error: `Narrative service error: ${response.statusText}` },
+        { status: response.status }
+      );
+    }
+
+    // Get the response as a blob
+    const blob = await response.blob();
+
+    // Return the blob with appropriate headers
+    return new NextResponse(blob, {
+      status: 200,
+      headers: {
+        'Content-Type': response.headers.get('Content-Type') || 'application/octet-stream',
+        'Content-Disposition': response.headers.get('Content-Disposition') || 'attachment',
+      },
+    });
+  } catch (error) {
+    logger.error({
+      error,
+      route: '/api/download-narrative',
+    }, 'Error downloading plan narrative');
+    return NextResponse.json(
+      { error: 'Failed to fetch narrative' },
+      { status: 500 }
+    );
+  }
+}
\ No newline at end of file
diff --git a/app/types/guidance.ts b/app/types/guidance.ts
new file mode 100644
index 000000000..9e0bb1aa0
--- /dev/null
+++ b/app/types/guidance.ts
@@ -0,0 +1,69 @@
+import { TagsInterface } from "@/app/types";
+
+export enum GuidanceGroupStatus {
+  DRAFT = 'draft',
+  PUBLISHED = 'published',
+  UNPUBLISHED_CHANGES = 'unpublishedChanges'
+}
+
+export interface GuidanceTag {
+  id: number;
+  name: string;
+}
+
+export type UpdateGuidanceTextErrors = {
+  general?: string;
+  guidanceGroupId?: string;
+  guidanceText?: string;
+  tagId?: string;
+};
+
+export type AddGuidanceTextErrors = {
+  general?: string;
+  guidanceGroupId?: string;
+  guidanceText?: string;
+  tagId?: string;
+};
+
+export type PublishGuidanceGroupErrors = {
+  general?: string;
+  affiliationId?: string;
+  bestPractice?: string;
+  name?: string;
+  description?: string;
+};
+
+export interface GuidanceText {
+  id: string;
+  guidanceText: string;
+  lastUpdated: string;
+  lastUpdatedBy: string;
+  url: string;
+  tagId: number;
+}
+
+export interface TagGuidanceItem {
+  tag: TagsInterface;
+  guidance: GuidanceText | null;
+}
+
+export interface GuidanceGroup {
+  guidanceGroupId: number;
+  name: string;
+  description: string;
+  optionalSubset: boolean;
+  bestPractice?: boolean;
+  status: GuidanceGroupStatus;
+  lastPublishedDate: string;
+}
+
+export interface AddGuidanceResponse {
+  success: boolean;
+  data?: {
+    id: number;
+    errors?: Record<string, string>;
+    guidanceText: string;
+  }
+  errors?: string[];
+  redirect?: string;
+}
\ No newline at end of file
diff --git a/app/types/index.ts b/app/types/index.ts
index 5c54f4fa4..4384e6e63 100644
--- a/app/types/index.ts
+++ b/app/types/index.ts
@@ -1,9 +1,11 @@
 import { ReactNode } from "react";
 import { PlanSectionProgress, TemplateVisibility, PlanFeedback, ProjectFundingStatus } from "@/generated/graphql";
 import { AffiliationSearchQuestionType, AnyQuestionType } from '@dmptool/types';
+import { CalendarDate } from "@internationalized/date";
 
 // Re-export types from questionAdd module
 export * from './questionAdd';
+export * from './guidance';
 
 export interface EmailInterface {
   id?: number | null;
@@ -513,3 +515,14 @@ export interface ProjectFundingInterface {
   funderOpportunityNumber: string;
   funderProjectNumber: string;
 }
+
+export interface ProjectDetailsFormInterface {
+  projectName: string;
+  projectAbstract: string;
+  startDate: string | CalendarDate | null;
+  endDate: string | CalendarDate | null;
+  researchDomainId: string | number;
+  isTestProject: string | boolean;
+  parentResearchDomainId: string | number;
+}
+
diff --git a/app/types/questionAdd.ts b/app/types/questionAdd.ts
index 9a5944a3d..c1165d912 100644
--- a/app/types/questionAdd.ts
+++ b/app/types/questionAdd.ts
@@ -6,12 +6,12 @@ export type DataFlagsConfig = {
 
 export type RepoConfig = {
   hasCustomRepos: boolean;
-  customRepos: string[];
+  customRepos: RepositoryInterface[];
 }
 
 export type MetaDataConfig = {
   hasCustomStandards: boolean;
-  customStandards: string[];
+  customStandards: MetaDataStandardInterface[];
 }
 
 export type StandardField = {
@@ -25,10 +25,15 @@ export type StandardField = {
   maxLength?: string;
   value?: string;
   licensesConfig?: LicensesConfig;
+  accessLevelsConfig?: {
+    mode: 'defaults' | 'mine';
+    selectedDefaults: string[];
+    customLevels: AccessLevelInterface[];
+  };
   outputTypeConfig?: {
-    mode: 'defaults' | 'mine' | 'addToDefaults';
+    mode: 'defaults' | 'mine';
     selectedDefaults: string[];
-    customTypes: string[];
+    customTypes: OutputTypeInterface[];
   };
   flagsConfig?: DataFlagsConfig;
   repoConfig?: RepoConfig;
@@ -55,7 +60,7 @@ export interface RepositoryFieldInterface {
   value?: string;
   repoConfig?: {
     hasCustomRepos: boolean;
-    customRepos: string[];
+    customRepos: RepositoryInterface[];
   }
 }
 
@@ -73,7 +78,7 @@ export interface MetaDataStandardFieldInterface {
   helpText?: string;
   metaDataConfig: {
     hasCustomStandards: boolean;
-    customStandards: string[];
+    customStandards: MetaDataStandardInterface[];
   }
 }
 
@@ -83,6 +88,13 @@ export type LicensesConfig = {
   customTypes: string[];
 };
 
+export type AccessLevelsConfig = {
+  mode: 'defaults' | 'addToDefaults';
+  selectedDefaults: string[];
+  customTypes: string[];
+};
+
+
 export interface LicenseFieldProps {
   field: StandardField;
   newLicenseType: string;
@@ -92,11 +104,30 @@ export interface LicenseFieldProps {
   onRemoveCustomType: (type: string) => void;
 }
 
+export interface AccessLevelsFieldProps {
+  field: StandardField;
+  newAccessLevel: AccessLevelInterface
+  setNewAccessLevel: (value: AccessLevelInterface) => void;
+  onModeChange: (mode: 'defaults' | 'mine') => void;
+  onAddCustomType: () => void;
+  onRemoveCustomType: (type: string) => void;
+}
+
+export interface OutputTypeInterface {
+  type?: string;
+  description?: string;
+}
+
+export interface AccessLevelInterface {
+  level?: string;
+  description?: string;
+}
+
 export interface OutputTypeFieldConfigProps {
   field: StandardField;
-  newOutputType: string;
-  setNewOutputType: (value: string) => void;
-  onModeChange: (mode: 'defaults' | 'mine' | 'addToDefaults') => void;
+  newOutputType: OutputTypeInterface;
+  setNewOutputType: (value: OutputTypeInterface) => void;
+  onModeChange: (mode: 'defaults' | 'mine') => void;
   onAddCustomType: () => void;
   onRemoveCustomType: (type: string) => void;
 }
diff --git a/components/DashboardListItem/DashboardListItem.module.scss b/components/DashboardListItem/DashboardListItem.module.scss
index ca0aaf1cb..6c9fedbd4 100644
--- a/components/DashboardListItem/DashboardListItem.module.scss
+++ b/components/DashboardListItem/DashboardListItem.module.scss
@@ -1,5 +1,23 @@
 @use '@/styles/responsive.scss' as r;
 
+.dashboardItemLink {
+    display: block;
+    text-decoration: none;
+    color: inherit;
+    cursor: pointer;
+    transition: transform 0.2s ease, box-shadow 0.2s ease;
+
+    &:hover {
+        text-decoration: none;
+    }
+
+    &:focus {
+        outline: 2px solid var(--focus-ring-color);
+        outline-offset: 2px;
+    }
+
+}
+
 .dashboardItem {
     padding: 1.25rem 1rem;
     margin-bottom: 1rem;
@@ -7,6 +25,7 @@
     background: var(--bg-white);
     box-shadow: var(--card-shadow);
     border: 1px solid var(--card-border);
+    transition: box-shadow 0.2s ease, transform 0.2s ease;
 }
 
 .dashboardItemInner {
@@ -43,6 +62,8 @@
 
 .content {
     margin-bottom: 0rem;
+  color: var(--slate-900) !important;
+  font-weight: 400;
 }
 
 .updateLink {
@@ -51,6 +72,10 @@
     font-size: var(--fs-base);
     line-height: 1;
     font-family: var(--font-sans);
+
+    &:hover {
+    color: var(--link-color) !important;    
+    }
 }
 
 .titleLink {
@@ -59,4 +84,11 @@
     &:hover {
         text-decoration: underline;
     }
-}
\ No newline at end of file
+}
+
+// Underline title when card is hovered
+.dashboardItemLink:hover .titleLink,
+.dashboardItem:hover .titleLink {
+    text-decoration: underline;
+}
+
diff --git a/components/DashboardListItem/__tests__/index.spec.tsx b/components/DashboardListItem/__tests__/index.spec.tsx
index b3ba65ff4..f63c1d10e 100644
--- a/components/DashboardListItem/__tests__/index.spec.tsx
+++ b/components/DashboardListItem/__tests__/index.spec.tsx
@@ -41,7 +41,6 @@ describe("DashboardListItem", () => {
 
     const listItem = screen.getByTestId("dashboard-list-item");
     expect(listItem).toBeInTheDocument();
-    expect(listItem).toHaveAttribute("role", "listitem");
   });
 
   it("should display the heading correctly", () => {
@@ -59,7 +58,8 @@ describe("DashboardListItem", () => {
   });
 
   it("should have accessible links with aria-labels", () => {
-    renderWithIntl(<DashboardListItem {...defaultProps} />);
+    // Render in non-fully-clickable mode so both title and update are separate links
+    renderWithIntl(<DashboardListItem {...defaultProps} isFullyClickable={false} />);
 
     // Should have 2 links (title and update button)
     const links = screen.getAllByRole("link");
@@ -97,7 +97,7 @@ describe("DashboardListItem", () => {
     renderWithIntl(<DashboardListItem {...defaultProps} />);
 
     const listItem = screen.getByTestId("dashboard-list-item");
-    expect(listItem).toHaveClass("dashboardItem");
+    expect(listItem).toHaveClass("dashboardItemLink");
   });
 
   it("should render with different URLs correctly", () => {
diff --git a/components/DashboardListItem/index.tsx b/components/DashboardListItem/index.tsx
index 2a6e7e9e9..669e21c41 100644
--- a/components/DashboardListItem/index.tsx
+++ b/components/DashboardListItem/index.tsx
@@ -7,18 +7,56 @@ interface DashboardListItemProps {
   heading: string;
   url: string;
   children: React.ReactNode;
+  isFullyClickable?: boolean;
 }
 
-function DashboardListItem({ heading, url, children }: DashboardListItemProps) {
+function DashboardListItem({
+  heading,
+  url,
+  children,
+  isFullyClickable = true // Make whole card clickable by default
+}: DashboardListItemProps) {
   const Global = useTranslations("Global");
 
   // Create unique ID for ARIA relationship
   const headingId = `${heading.toLowerCase().replace(/\s+/g, "-")}-heading`;
 
+  if (isFullyClickable) {
+    return (
+      <li>
+        <Link
+          href={url}
+          className={styles.dashboardItemLink}
+          aria-label={`${Global("links.update")} ${heading}`}
+          data-testid="dashboard-list-item"
+        >
+          <div className={styles.dashboardItem}>
+            <div className={styles.dashboardItemInner}>
+              <div className={styles.dashboardItemContent}>
+                <h2 id={headingId}>
+                  <span className={styles.titleLink}>
+                    {heading}
+                  </span>
+                </h2>
+
+                <div className={styles.content}>{children}</div>
+              </div>
+
+              <div className={styles.dashboardItemActions}>
+                <span className={styles.updateLink}>
+                  {Global("links.update")}
+                </span>
+              </div>
+            </div>
+          </div>
+        </Link>
+      </li>
+    );
+  }
+
   return (
-    <div
+    <li
       className={styles.dashboardItem}
-      role="listitem"
       data-testid="dashboard-list-item"
     >
       <div className={styles.dashboardItemInner}>
@@ -46,7 +84,7 @@ function DashboardListItem({ heading, url, children }: DashboardListItemProps) {
           </Link>
         </div>
       </div>
-    </div>
+    </li>
   );
 }
 
diff --git a/components/FunderSearch/index.tsx b/components/FunderSearch/index.tsx
index 4f6c37c0e..c4058d1c6 100644
--- a/components/FunderSearch/index.tsx
+++ b/components/FunderSearch/index.tsx
@@ -28,7 +28,7 @@ interface FunderSearchProps extends React.HTMLAttributes<HTMLDivElement> {
 }
 
 const FunderSearch = ({
-  limit = 50,
+  limit = 5,
   onResults,
   moreTrigger,
 }: FunderSearchProps) => {
@@ -36,8 +36,8 @@ const FunderSearch = ({
   const trans = useTranslations('Global');
   const [moreCounter, setMoreCounter] = useState<number>(0);
   const [searchTerm, setSearchTerm] = useState<string>("");
-  const [fetchAffiliations, {data}] = useAffiliationFundersLazyQuery({});
-  const [nextCursor, setNextCursor] = useState<string|null>(null);
+  const [fetchAffiliations, { data }] = useAffiliationFundersLazyQuery({});
+  const [nextCursor, setNextCursor] = useState<string | null>(null);
   const [newSearch, setNewSearch] = useState<boolean>(true);
 
   const handleSubmit = (e: React.FormEvent) => {
diff --git a/components/PageHeader/index.tsx b/components/PageHeader/index.tsx
index e5e533cd0..2291ba036 100644
--- a/components/PageHeader/index.tsx
+++ b/components/PageHeader/index.tsx
@@ -3,7 +3,7 @@
 import React, { ReactNode, useEffect } from 'react';
 import BackButton from "@/components/BackButton";
 import './pageheader.scss';
-import {stripHtml} from "@/utils/general";
+import { stripHtml } from "@/utils/general";
 
 interface PageHeaderProps {
   /** The main title of the page */
@@ -33,10 +33,16 @@ const PageHeader: React.FC<PageHeaderProps> = ({
   const plainTitle = stripHtml(title);
 
   useEffect(() => {
+    // Don't set document.title if plainTitle is empty or undefined
+    if (!plainTitle || plainTitle.trim() === '') {
+      return; // Skip this render, wait for the real title
+    }
+
     document.title = `${plainTitle} | DMPTool`;
     window.scrollTo(0, 0);
   }, [plainTitle]);
 
+
   return (
     <div className={`template-editor-header ${className}`.trim()}>
       {/* Breadcrumbs slot */}
diff --git a/components/PageHeader/pageheader.scss b/components/PageHeader/pageheader.scss
index 8d4641f27..fb5e5e88d 100644
--- a/components/PageHeader/pageheader.scss
+++ b/components/PageHeader/pageheader.scss
@@ -12,6 +12,7 @@
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
+    gap: 1rem;
 
   }
 
@@ -33,6 +34,7 @@
     align-items: center;
     justify-content: space-between;
     gap: 0.5rem;
+    flex-shrink: 0; //button should not shrink
 
     @include r.device(md) {
       justify-content: flex-start;
diff --git a/components/QuestionAdd/InitialAccessLevel.tsx b/components/QuestionAdd/InitialAccessLevel.tsx
new file mode 100644
index 000000000..817148891
--- /dev/null
+++ b/components/QuestionAdd/InitialAccessLevel.tsx
@@ -0,0 +1,203 @@
+import { useTranslations } from 'next-intl';
+//import { FormInput, FormSelect } from '@/components/Form';
+import { FormInput } from '@/components/Form';
+import {
+  AccessLevelInterface,
+  AccessLevelsFieldProps,
+} from '@/app/types';
+
+import {
+  Button,
+  Dialog,
+  DialogTrigger,
+  //ListBoxItem,
+  OverlayArrow,
+  Popover,
+} from "react-aria-components";
+import { DmpIcon } from "@/components/Icons";
+
+import styles from './questionAdd.module.scss';
+
+// const accessLevelOptions = [
+//   { id: 'defaults', name: 'Use defaults' },
+//   { id: 'mine', name: 'Customize output list' },
+// ];
+
+const defaultAccessLevels = [
+  { id: 'controlledAccess', level: 'Controlled access', description: 'Restricts access to certain areas' },
+  { id: 'unrestrictedAccess', level: 'Unrestricted access', description: 'Allows access to all areas' },
+  { id: 'Other', level: 'Other', description: 'Other type of access' },
+];
+
+const InitialAccessLevelField = ({
+  field,
+  newAccessLevel,
+  setNewAccessLevel,
+  //onModeChange,
+  onAddCustomType,
+  onRemoveCustomType,
+}: AccessLevelsFieldProps) => {
+  const QuestionAdd = useTranslations('QuestionAdd');
+  return (
+    <div className={styles.typeConfig}>
+      {/* <div className={styles.typeModeSelector}>
+        <FormSelect
+          label={QuestionAdd('researchOutput.accessLevels.labels.defineAccessLevels')}
+          ariaLabel={QuestionAdd('researchOutput.accessLevels.labels.defineAccessLevels')}
+          isRequired={false}
+          name="status"
+          items={accessLevelOptions}
+          onChange={(value) =>
+            onModeChange(value as 'defaults' | 'mine')
+          }
+          selectedKey={field.accessLevelsConfig?.mode || 'defaults'}
+        >
+          {(item) => <ListBoxItem key={item.id}>{item.name}</ListBoxItem>}
+        </FormSelect>
+      </div> */}
+
+      {/* USE DEFAULTS MODE */}
+      {field.accessLevelsConfig?.mode === 'defaults' && (
+        <div className={styles.defaultTypes}>
+          <fieldset>
+            <legend>{QuestionAdd('researchOutput.accessLevels.legends.default')}</legend>
+            <ul className={`${styles.typesList} ${styles.bulletList}`} role="list">
+              {defaultAccessLevels.map((accessLevel) => (
+                <li key={accessLevel.id} className={styles.typeItem}>
+                  <span id={`custom-level-${accessLevel.id}`}>{accessLevel.level}</span>
+                  <DialogTrigger>
+                    <Button
+                      className="popover-btn"
+                      aria-label={QuestionAdd('labels.clickForMoreInfo')}
+                      aria-describedby={`access-level-${accessLevel.id}`}
+                    >
+                      <div className="icon info"><DmpIcon icon="info" /></div>
+                    </Button>
+                    <Popover className="dynamic-popover-width react-aria-Popover">
+                      <OverlayArrow>
+                        <svg width={12} height={12} viewBox="0 0 12 12" aria-hidden="true">
+                          <path d="M0 0 L6 6 L12 0" />
+                        </svg>
+                      </OverlayArrow>
+                      <Dialog aria-label={QuestionAdd('labels.accessLevelDescription', { level: accessLevel.level })}>
+                        <div className="flex-col">
+                          {accessLevel.description}
+                        </div>
+                      </Dialog>
+                    </Popover>
+                  </DialogTrigger>
+                </li>
+              ))}
+            </ul>
+          </fieldset>
+        </div>
+      )}
+
+      {/* USE MINE MODE */}
+      {field.accessLevelsConfig?.mode === 'mine' && (
+        <div className={styles.customTypes}>
+          <fieldset>
+            <legend>{QuestionAdd('researchOutput.accessLevels.legends.myAccessLevels')}</legend>
+            <div role="form" aria-label={QuestionAdd('labels.addCustomAccessLevel')}>
+              <FormInput
+                name="custom_types_add"
+                type="text"
+                isRequired={false}
+                label={QuestionAdd('researchOutput.accessLevels.labels.enterAccessLevel')}
+                className={styles.typeWrapper}
+                value={newAccessLevel.level}
+                onChange={(e) => setNewAccessLevel({ ...newAccessLevel, level: e.target.value })}
+                aria-label={QuestionAdd('researchOutput.accessLevels.labels.enterAccessLevel')}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') {
+                    e.preventDefault();
+                    onAddCustomType();
+                  }
+                }}
+              />
+              <FormInput
+                name="custom_types_description"
+                type="text"
+                isRequired={false}
+                label={QuestionAdd('researchOutput.accessLevels.labels.accessLevelDescription')}
+                className={styles.typeWrapper}
+                value={newAccessLevel.description}
+                onChange={(e) => setNewAccessLevel({ ...newAccessLevel, description: e.target.value })}
+                aria-label={QuestionAdd('researchOutput.accessLevels.labels.accessLevelDescription')}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') {
+                    e.preventDefault();
+                    onAddCustomType();
+                  }
+                }}
+              />
+              <Button
+                type="button"
+                onPress={onAddCustomType}
+                isDisabled={!newAccessLevel?.level?.trim()}
+                aria-label={QuestionAdd('researchOutput.accessLevels.buttons.addAccessLevel')}
+              >
+                {QuestionAdd('researchOutput.accessLevels.buttons.addAccessLevel')}
+              </Button>
+            </div>
+
+            {field.accessLevelsConfig?.customLevels?.length > 0 && (
+              <div role="region" aria-label={QuestionAdd('labels.customAccessLevelList')}>
+                <ul
+                  className={`${styles.customTypesList} ${styles.deletableList}`}
+                  role="list"
+                  aria-live="polite"
+                  aria-relevant="additions removals"
+                >
+                  {field.accessLevelsConfig.customLevels.map((customLevel: AccessLevelInterface, index: number) => (
+                    <li
+                      key={index}
+                      className={styles.customTypeItem}
+                      role="listitem"
+                    >
+                      <div className={styles.infoWrapper}>
+                        <span id={`custom-level-${index}`}>{customLevel.level}</span>
+                        <DialogTrigger>
+                          <Button
+                            className="popover-btn"
+                            aria-label={QuestionAdd('labels.clickForMoreInfo')}
+                            aria-describedby={`custom-level-${index}`}
+                          >
+                            <div className="icon info"><DmpIcon icon="info" /></div>
+                          </Button>
+                          <Popover className="dynamic-popover-width react-aria-Popover">
+                            <OverlayArrow>
+                              <svg width={12} height={12} viewBox="0 0 12 12" aria-hidden="true">
+                                <path d="M0 0 L6 6 L12 0" />
+                              </svg>
+                            </OverlayArrow>
+                            <Dialog aria-label={QuestionAdd('labels.accessLevelDescription', { level: customLevel.level || '' })}>
+                              <div className="flex-col">
+                                {customLevel.description}
+                              </div>
+                            </Dialog>
+                          </Popover>
+                        </DialogTrigger>
+                      </div>
+                      <Button
+                        type="button"
+                        className={styles.removeButton}
+                        onPress={() => onRemoveCustomType(customLevel.level ?? '')}
+                        aria-label={QuestionAdd('researchOutput.accessLevels.labels.removeAccessLevel', { level: customLevel.level ?? '' })}
+                      >
+                        <span aria-hidden="true">x</span>
+                        <span className="hidden-accessibly">{QuestionAdd('buttons.removeAccessLevel', { level: customLevel.level ?? '' })}</span>
+                      </Button>
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            )}
+          </fieldset>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default InitialAccessLevelField;
\ No newline at end of file
diff --git a/components/QuestionAdd/LicenseField.tsx b/components/QuestionAdd/LicenseField.tsx
index af2ca8070..74ff3c90f 100644
--- a/components/QuestionAdd/LicenseField.tsx
+++ b/components/QuestionAdd/LicenseField.tsx
@@ -9,7 +9,7 @@ import styles from './questionAdd.module.scss';
 
 const licenseTypeOptions = [
   { id: 'defaults', name: 'Use defaults' },
-  { id: 'addToDefaults', name: 'Use mine' }
+  { id: 'addToDefaults', name: 'Use custom list' }
 ];
 
 // Default licenses
@@ -94,7 +94,7 @@ const LicenseField = ({
                   items={otherLicenses}
                   selectClasses={styles.licenseSelector}
                   onChange={(value) => setNewLicenseType(value)}
-                  selectedKey={field.licensesConfig?.mode || 'defaults'}
+                  selectedKey={newLicenseType || 'defaults'}
                 >
                   {(item) => <ListBoxItem key={item.id}>{item.name}</ListBoxItem>}
                 </FormSelect>
diff --git a/components/QuestionAdd/MetaDataStandards.tsx b/components/QuestionAdd/MetaDataStandards.tsx
index 898a25754..9bcc97cb5 100644
--- a/components/QuestionAdd/MetaDataStandards.tsx
+++ b/components/QuestionAdd/MetaDataStandards.tsx
@@ -45,7 +45,14 @@ const MetaDataStandardsSelector = ({
   onMetaDataStandardsChange: (standards: MetaDataStandardInterface[]) => void;
 }) => {
   const toastState = useToast();
-  const [selectedStandards, setSelectedStandards] = useState<MetaDataStandardInterface[]>([]);
+  const [selectedStandards, setSelectedStandards] = useState<{ [id: string]: MetaDataStandardInterface }>(() => {
+    const initial = field.metaDataConfig?.customStandards || [];
+    // Convert array to object keyed by id
+    return initial.reduce((acc: { [id: string]: MetaDataStandardInterface }, repo) => {
+      acc[repo.id] = repo;
+      return acc;
+    }, {});
+  });
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isCustomFormOpen, setIsCustomFormOpen] = useState(false);
   const [customForm, setCustomForm] = useState({ name: '', url: '', description: '' });
@@ -140,7 +147,9 @@ const MetaDataStandardsSelector = ({
 
   const removeAllStandards = () => {
     if (window.confirm(QuestionAdd('researchOutput.metaDataStandards.messages.confirmRemovalAll'))) {
-      setSelectedStandards([]);
+      setSelectedStandards({});
+      // Uncheck the "Create custom metadata standards" box as well
+      handleToggleMetaDataStandards(false);
       toastState.add(QuestionAdd('researchOutput.metaDataStandards.messages.allRemoved'), { type: 'success' });
     }
   };
@@ -154,7 +163,7 @@ const MetaDataStandardsSelector = ({
     }
 
     const customStandard = {
-      id: `custom-${Date.now()}`,
+      id: Date.now(),
       name: name.trim(),
       description: description.trim(),
       url: url.trim(),
@@ -202,7 +211,7 @@ const MetaDataStandardsSelector = ({
                   <Button
                     onClick={removeAllStandards}
                     isDisabled={selectedCount === 0}
-                    className="danger medium"
+                    className="secondary medium"
                   >
                     {Global('buttons.removeAll')}
                   </Button>
@@ -219,7 +228,7 @@ const MetaDataStandardsSelector = ({
                         </div>
                         <Button
                           onClick={() => removeStandard(std.id)}
-                          className="danger small"
+                          className="secondary small"
                         >
                           {Global('buttons.remove')}
                         </Button>
@@ -374,7 +383,7 @@ const MetaDataStandardsSelector = ({
                               <div className={styles.searchResultTitle}>{std.name}</div>
                               <Button
                                 onClick={() => toggleSelection(std)}
-                                className={`small ${isSelected ? 'danger' : 'primary'}`}
+                                className={`small ${isSelected ? 'secondary' : 'primary'}`}
                               >
                                 {isSelected ? Global('buttons.remove') : Global('buttons.select')}
                               </Button>
diff --git a/components/QuestionAdd/OutputTypeField.tsx b/components/QuestionAdd/OutputTypeField.tsx
index 01590760b..05d92daca 100644
--- a/components/QuestionAdd/OutputTypeField.tsx
+++ b/components/QuestionAdd/OutputTypeField.tsx
@@ -1,32 +1,42 @@
-import { Button, ListBoxItem } from "react-aria-components";
 import { useTranslations } from 'next-intl';
 import { FormInput, FormSelect } from '@/components/Form';
 import {
   OutputTypeFieldConfigProps,
+  OutputTypeInterface,
 } from '@/app/types';
+
+import {
+  Button,
+  Dialog,
+  DialogTrigger,
+  ListBoxItem,
+  OverlayArrow,
+  Popover,
+} from "react-aria-components";
+import { DmpIcon } from "@/components/Icons";
+
 import styles from './questionAdd.module.scss';
 
 const outputTypeOptions = [
   { id: 'defaults', name: 'Use defaults' },
-  { id: 'mine', name: 'Use mine' },
-  { id: 'addToDefaults', name: 'Add mine to defaults' }
+  { id: 'mine', name: 'Use custom list' },
 ];
 
 const defaultOutputTypes = [
-  'Audiovisual',
-  'Collection',
-  'Data paper',
-  'Dataset',
-  'Event',
-  'Image',
-  'Interactive resource',
-  'Model representation',
-  'Physical object',
-  'Service',
-  'Software',
-  'Sound',
-  'Text',
-  'Workflow'
+  { id: 'Audiovisual', type: 'Audiovisual', description: 'A series of visual representations imparting an impression of motion when shown in succession. May or may not include sound.' },
+  { id: 'Collection', type: 'Collection', description: 'An aggregation of resources, which may encompass collections of one resourceType as well as those of mixed types. A collection is described as a group; its parts may also be separately described.' },
+  { id: 'Data paper', type: 'Data paper', description: 'A factual and objective publication with a focused intent to identify and describe specific data, sets of data, or data collections to facilitate discoverability.' },
+  { id: 'Dataset', type: 'Dataset', description: 'Data encoded in a defined structure.' },
+  { id: 'Event', type: 'Event', description: 'A non-persistent, time-based occurrence.' },
+  { id: 'Image', type: 'Image', description: 'A visual representation other than text.' },
+  { id: 'Interactive resource', type: 'Interactive resource', description: 'A resource requiring interaction from the user to be understood, executed, or experienced.' },
+  { id: 'Model representation', type: 'Model representation', description: 'An abstract, conceptual, graphical, mathematical or visualization model that represents empirical objects, phenomena, or physical processes.' },
+  { id: 'Physical object', type: 'Physical object', description: 'A physical object or substance.' },
+  { id: 'Service', type: 'Service', description: 'An organized system of apparatus, appliances, staff, etc., for supplying some function(s) required by end users.' },
+  { id: 'Software', type: 'Software', description: 'A computer program other than a computational notebook, in either source code (text) or compiled form. Use this type for general software components supporting scholarly research. Use the “ComputationalNotebook” value for virtual notebooks.' },
+  { id: 'Sound', type: 'Sound', description: 'A resource primarily intended to be heard.' },
+  { id: 'Text', type: 'Text', description: 'A resource consisting primarily of words for reading that is not covered by any other textual resource type in this list.' },
+  { id: 'Workflow', type: 'Workflow', description: 'A structured series of steps which can be executed to produce a final outcome, allowing users a means to specify and enact their work in a more reproducible manner.' }
 ];
 
 const OutputTypeField = ({
@@ -48,7 +58,7 @@ const OutputTypeField = ({
           name="status"
           items={outputTypeOptions}
           onChange={(value) =>
-            onModeChange(value as 'defaults' | 'mine' | 'addToDefaults')
+            onModeChange(value as 'defaults' | 'mine')
           }
           selectedKey={field.outputTypeConfig?.mode || 'defaults'}
         >
@@ -61,10 +71,31 @@ const OutputTypeField = ({
         <div className={styles.defaultTypes}>
           <fieldset>
             <legend>{QuestionAdd('researchOutput.outputType.legends.default')}</legend>
-            <ul className={`${styles.typesList} ${styles.bulletList}`}>
+            <ul className={`${styles.typesList} ${styles.bulletList}`} role="list">
               {defaultOutputTypes.map((outputType) => (
-                <li key={outputType} className={styles.typeItem}>
-                  <span>{outputType}</span>
+                <li key={outputType.id} className={styles.typeItem}>
+                  <span id={`output-type-${outputType.id}`}>{outputType.type}</span>
+                  <DialogTrigger>
+                    <Button
+                      className="popover-btn"
+                      aria-label={QuestionAdd('labels.clickForMoreInfo')}
+                      aria-describedby={`output-type-${outputType.id}`}
+                    >
+                      <div className="icon info"><DmpIcon icon="info" /></div>
+                    </Button>
+                    <Popover className="dynamic-popover-width react-aria-Popover">
+                      <OverlayArrow>
+                        <svg width={12} height={12} viewBox="0 0 12 12" aria-hidden="true">
+                          <path d="M0 0 L6 6 L12 0" />
+                        </svg>
+                      </OverlayArrow>
+                      <Dialog aria-label={QuestionAdd('labels.typeDescription', { type: outputType.type })}>
+                        <div className="flex-col">
+                          {outputType.description}
+                        </div>
+                      </Dialog>
+                    </Popover>
+                  </DialogTrigger>
                 </li>
               ))}
             </ul>
@@ -77,15 +108,15 @@ const OutputTypeField = ({
         <div className={styles.customTypes}>
           <fieldset>
             <legend>{QuestionAdd('researchOutput.outputType.legends.myOutputs')}</legend>
-            <div className={styles.addTypeContainer}>
+            <div role="form" aria-label={QuestionAdd('labels.addCustomOutputType')}>
               <FormInput
-                name="custom_types"
+                name="custom_types_add"
                 type="text"
                 isRequired={false}
                 label={QuestionAdd('researchOutput.outputType.labels.enterOutputType')}
                 className={styles.typeWrapper}
-                value={newOutputType}
-                onChange={(e) => setNewOutputType(e.target.value)}
+                value={newOutputType.type}
+                onChange={(e) => setNewOutputType({ ...newOutputType, type: e.target.value })}
                 aria-label={QuestionAdd('researchOutput.outputType.labels.enterOutputType')}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter') {
@@ -94,101 +125,86 @@ const OutputTypeField = ({
                   }
                 }}
               />
+              <FormInput
+                name="custom_types_description"
+                type="text"
+                isRequired={false}
+                label={QuestionAdd('researchOutput.outputType.labels.typeDescription')}
+                className={styles.typeWrapper}
+                value={newOutputType.description}
+                onChange={(e) => setNewOutputType({ ...newOutputType, description: e.target.value })}
+                aria-label={QuestionAdd('researchOutput.outputType.labels.typeDescription')}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') {
+                    e.preventDefault();
+                    onAddCustomType();
+                  }
+                }}
+              />
               <Button
                 type="button"
                 onPress={onAddCustomType}
-                isDisabled={!newOutputType.trim()}
+                isDisabled={!newOutputType?.type?.trim()}
+                aria-label={QuestionAdd('researchOutput.outputType.buttons.addOutputType')}
               >
                 {QuestionAdd('researchOutput.outputType.buttons.addOutputType')}
               </Button>
             </div>
 
             {field.outputTypeConfig?.customTypes?.length > 0 && (
-              <ul className={`${styles.customTypesList} ${styles.deletableList}`}>
-                {field.outputTypeConfig.customTypes.map((customType: string, index: number) => (
-                  <li key={index} className={styles.customTypeItem}>
-                    <span>{customType}</span>
-                    <Button
-                      type="button"
-                      className={styles.removeButton}
-                      onPress={() => onRemoveCustomType(customType)}
-                      aria-label={QuestionAdd('researchOutput.outputType.labels.removeOutputType', { type: customType })}
-                    >
-                      x
-                    </Button>
-                  </li>
-                ))}
-              </ul>
-            )}
-          </fieldset>
-        </div>
-      )}
-
-      {/* ADD TO DEFAULTS MODE */}
-      {field.outputTypeConfig?.mode === 'addToDefaults' && (
-        <>
-          <div className={styles.defaultTypes}>
-            <fieldset>
-              <legend>{QuestionAdd('researchOutput.outputType.legends.default')}</legend>
-              <ul className={`${styles.typesList} ${styles.bulletList}`}>
-                {defaultOutputTypes.map((outputType) => (
-                  <li key={outputType} className={styles.typeItem}>
-                    <span>{outputType}</span>
-                  </li>
-                ))}
-              </ul>
-            </fieldset>
-          </div>
-
-          <div className={styles.customTypes}>
-            <fieldset>
-              <legend>{QuestionAdd('researchOutput.outputType.legends.myOutputs')}</legend>
-              <div className={styles.addTypeContainer}>
-                <FormInput
-                  name="custom_types_add"
-                  type="text"
-                  isRequired={false}
-                  label={QuestionAdd('researchOutput.outputType.labels.enterOutputType')}
-                  className={styles.typeWrapper}
-                  value={newOutputType}
-                  onChange={(e) => setNewOutputType(e.target.value)}
-                  aria-label={QuestionAdd('researchOutput.outputType.labels.enterOutputType')}
-                  onKeyDown={(e) => {
-                    if (e.key === 'Enter') {
-                      e.preventDefault();
-                      onAddCustomType();
-                    }
-                  }}
-                />
-                <Button
-                  type="button"
-                  onPress={onAddCustomType}
-                  isDisabled={!newOutputType.trim()}
+              <div role="region" aria-label={QuestionAdd('labels.customTypeList')}>
+                <ul
+                  className={`${styles.customTypesList} ${styles.deletableList}`}
+                  role="list"
+                  aria-live="polite"
+                  aria-relevant="additions removals"
                 >
-                  {QuestionAdd('researchOutput.outputType.buttons.addOutputType')}
-                </Button>
-              </div>
-
-              {field.outputTypeConfig?.customTypes?.length > 0 && (
-                <ul className={styles.customTypesList}>
-                  {field.outputTypeConfig.customTypes.map((customType: string, index: number) => (
-                    <li key={index} className={styles.customTypeItem}>
-                      <span>{customType}</span>
+                  {field.outputTypeConfig.customTypes.map((customType: OutputTypeInterface, index: number) => (
+                    <li
+                      key={index}
+                      className={styles.customTypeItem}
+                      role="listitem"
+                    >
+                      <div className={styles.infoWrapper}>
+                        <span id={`custom-type-${index}`}>{customType.type}</span>
+                        <DialogTrigger>
+                          <Button
+                            className="popover-btn"
+                            aria-label={QuestionAdd('labels.clickForMoreInfo')}
+                            aria-describedby={`custom-type-${index}`}
+                          >
+                            <div className="icon info"><DmpIcon icon="info" /></div>
+                          </Button>
+                          <Popover className="dynamic-popover-width react-aria-Popover">
+                            <OverlayArrow>
+                              <svg width={12} height={12} viewBox="0 0 12 12" aria-hidden="true">
+                                <path d="M0 0 L6 6 L12 0" />
+                              </svg>
+                            </OverlayArrow>
+                            <Dialog aria-label={QuestionAdd('labels.typeDescription', { type: customType.type || '' })}>
+                              <div className="flex-col">
+                                {customType.description}
+                              </div>
+                            </Dialog>
+                          </Popover>
+                        </DialogTrigger>
+                      </div>
                       <Button
                         type="button"
                         className={styles.removeButton}
-                        onPress={() => onRemoveCustomType(customType)}
-                        aria-label={QuestionAdd('researchOutput.outputType.labels.removeOutputType', { type: customType })}
+                        onPress={() => onRemoveCustomType(customType.type ?? '')}
+                        aria-label={QuestionAdd('researchOutput.outputType.labels.removeOutputType', { type: customType.type ?? '' })}
                       >
-                        x
+                        <span aria-hidden="true">x</span>
+                        <span className="hidden-accessibly">{QuestionAdd('buttons.removeType', { type: customType.type ?? '' })}</span>
                       </Button>
                     </li>
                   ))}
                 </ul>
-              )}
-            </fieldset>
-          </div>
-        </>
+              </div>
+            )}
+          </fieldset>
+        </div>
       )}
     </div>
   );
diff --git a/components/QuestionAdd/ReposSelector.tsx b/components/QuestionAdd/ReposSelector.tsx
index a75a582c6..b39ae6cd0 100644
--- a/components/QuestionAdd/ReposSelector.tsx
+++ b/components/QuestionAdd/ReposSelector.tsx
@@ -132,8 +132,16 @@ const RepositorySelectionSystem = ({
   const Global = useTranslations("Global");
   const QuestionAdd = useTranslations("QuestionAdd");
 
-  // Component states
-  const [selectedRepos, setSelectedRepos] = useState<RepositoryInterface[]>([]);
+  // Selected repositories state - include any customRepos from field config as initial state
+  const [selectedRepos, setSelectedRepos] = useState<{ [id: string]: RepositoryInterface }>(() => {
+    const initial = field.repoConfig?.customRepos || [];
+    // Convert array to object keyed by id
+    return initial.reduce((acc: { [id: string]: RepositoryInterface }, repo) => {
+      acc[repo.id] = repo;
+      return acc;
+    }, {});
+  });
+
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isCustomFormOpen, setIsCustomFormOpen] = useState(false);
   const [expandedDetails, setExpandedDetails] = useState<Record<string, boolean>>({});
@@ -206,7 +214,9 @@ const RepositorySelectionSystem = ({
   // Removal of all selected repositories from the non-modal view
   const removeAllRepos = () => {
     if (window.confirm(QuestionAdd('researchOutput.repoSelector.messages.confirmRemoveAll'))) {
-      setSelectedRepos([]);
+      setSelectedRepos({});
+      // Uncheck the "Create custom repositories" box as well
+      handleTogglePreferredRepositories(false);
       toastState.add(QuestionAdd('researchOutput.repoSelector.messages.allRemoved'), { type: 'success' });
     }
   };
@@ -229,7 +239,7 @@ const RepositorySelectionSystem = ({
     }
 
     const customRepo = {
-      id: `custom-${Date.now()}`,
+      id: Date.now(),
       name: name.trim(),
       description: description.trim(),
       url: url.trim(),
@@ -279,7 +289,7 @@ const RepositorySelectionSystem = ({
                   <Button
                     onClick={removeAllRepos}
                     isDisabled={selectedCount === 0}
-                    className="danger medium"
+                    className="medium secondary"
                   >
                     {Global('buttons.removeAll')}
                   </Button>
@@ -295,7 +305,7 @@ const RepositorySelectionSystem = ({
                         <div className={styles.itemContent}>
                           <div className={styles.itemTitle}>{repo.name}</div>
                           <div className={styles.itemMeta}>
-                            <span className={`${styles.itemBadge} ${repo.access.toLowerCase() === 'open' ? styles.open : ''}`}>
+                            <span className={`${styles.itemBadge} ${repo.access?.toLowerCase() === 'open' ? styles.open : ''}`}>
                               {repo.access}
                             </span>
                             <span className={styles.itemBadge}>{repo.identifier}</span>
@@ -311,7 +321,7 @@ const RepositorySelectionSystem = ({
                         </div>
                         <Button
                           onClick={() => removeRepo(repo.id)}
-                          className={`${styles.removeBtn} danger small`}
+                          className={`${styles.removeBtn} secondary small`}
                         >
                           {Global('buttons.remove')}
                         </Button>
@@ -504,7 +514,7 @@ const RepositorySelectionSystem = ({
                               <div className={styles.searchResultTitle}>{repo.name}</div>
                               <Button
                                 onClick={() => toggleSelection(repo)}
-                                className={`small ${isSelected ? 'danger' : 'primary'}`}
+                                className={`small ${isSelected ? 'secondary' : 'primary'}`}
                               >
                                 {isSelected ? Global('buttons.remove') : Global('buttons.select')}
                               </Button>
diff --git a/components/QuestionAdd/__tests__/InitialAccessLevel.spec.tsx b/components/QuestionAdd/__tests__/InitialAccessLevel.spec.tsx
new file mode 100644
index 000000000..846fd55a0
--- /dev/null
+++ b/components/QuestionAdd/__tests__/InitialAccessLevel.spec.tsx
@@ -0,0 +1,428 @@
+import React from 'react';
+import { act, render, screen, fireEvent } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { axe, toHaveNoViolations } from 'jest-axe';
+import InitialAccessLevelField from '../InitialAccessLevel';
+import { AccessLevelsFieldProps } from '@/app/types';
+
+expect.extend(toHaveNoViolations);
+
+describe('InitialAccessLevelField', () => {
+  const defaultProps: AccessLevelsFieldProps = {
+    field: {
+      id: 'accessLevels',
+      label: 'Access Levels',
+      enabled: true,
+      accessLevelsConfig: {
+        mode: 'defaults',
+        customLevels: [{ level: 'Controlled access', description: 'Restricts access to certain areas' }],
+        selectedDefaults: [],
+      },
+    },
+    newAccessLevel: { level: '', description: '' },
+    setNewAccessLevel: jest.fn(),
+    onModeChange: jest.fn(),
+    onAddCustomType: jest.fn(),
+    onRemoveCustomType: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const renderComponent = (props: Partial<AccessLevelsFieldProps> = {}) => {
+    return render(<InitialAccessLevelField {...defaultProps} {...props} />);
+  };
+
+  describe('Rendering', () => {
+    it('should render without crashing', () => {
+      renderComponent();
+      //expect(screen.getByLabelText('researchOutput.accessLevels.labels.defineAccessLevels')).toBeInTheDocument();
+      expect(screen.getByText('researchOutput.accessLevels.legends.default')).toBeInTheDocument();
+
+    });
+
+    it('should render with correct initial structure', () => {
+      renderComponent();
+      //expect(screen.getByLabelText('researchOutput.accessLevels.labels.defineAccessLevels')).toBeInTheDocument();
+      expect(screen.getByText('researchOutput.accessLevels.legends.default')).toBeInTheDocument();
+    });
+
+    it.skip('should render all access level options in the dropdown', async () => {
+      renderComponent();
+      const selectButton = screen.getByTestId('select-button');
+      await userEvent.click(selectButton);
+
+      // Check that both options are rendered
+      expect(screen.getByRole('option', { name: 'Use defaults' })).toBeInTheDocument();
+      expect(screen.getByRole('option', { name: 'Customize output list' })).toBeInTheDocument();
+    });
+
+    it('should handle customLevel.level being undefined or empty', () => {
+      const customLevels = [
+        { level: undefined, description: 'No level' },
+        { level: '', description: 'Empty level' },
+      ];
+      renderComponent({
+        field: {
+          ...defaultProps.field,
+          accessLevelsConfig: {
+            mode: 'mine',
+            customLevels,
+            selectedDefaults: [],
+          },
+        },
+      });
+
+      // All custom types should render with fallback '' for type
+      customLevels.forEach((_, index) => {
+        const span = document.getElementById(`custom-level-${index}`);
+        expect(span).toBeInTheDocument();
+        expect(span).toHaveTextContent('');
+      });
+
+    });
+
+    it('should pass axe accessibility test', async () => {
+      const { container } = render(
+        <InitialAccessLevelField {...defaultProps} />
+      );
+      await act(async () => {
+        const results = await axe(container);
+        expect(results).toHaveNoViolations();
+      });
+    });
+
+    describe('Defaults Mode', () => {
+      it('should display default access levels when mode is "defaults"', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'defaults',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+        });
+        expect(screen.getByText('Controlled access')).toBeInTheDocument();
+        expect(screen.getByText('Unrestricted access')).toBeInTheDocument();
+        expect(screen.getByText('Other')).toBeInTheDocument();
+      });
+
+      it('should not display custom access level section in defaults mode', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'defaults',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+        });
+        expect(screen.queryByText('researchOutput.accessLevels.legends.myAccessLevels')).not.toBeInTheDocument();
+        expect(screen.queryByLabelText('researchOutput.accessLevels.labels.enterAccessLevel')).not.toBeInTheDocument();
+      });
+    });
+
+    describe('Mine Mode', () => {
+      const mineField = {
+        ...defaultProps.field,
+        accessLevelsConfig: {
+          mode: 'mine' as const,
+          customLevels: [
+            { level: 'Custom Level 1', description: 'Description for Custom Level 1' },
+            { level: 'Custom Level 2', description: 'Description for Custom Level 2' }
+          ],
+          selectedDefaults: [],
+        },
+      };
+
+      it('should display custom access level section when mode is "mine"', () => {
+        renderComponent({ field: mineField });
+        expect(screen.getByText('researchOutput.accessLevels.legends.myAccessLevels')).toBeInTheDocument();
+        expect(screen.getByLabelText('researchOutput.accessLevels.labels.enterAccessLevel')).toBeInTheDocument();
+      });
+
+      it('should display custom access levels when they exist', () => {
+        renderComponent({ field: mineField });
+        expect(screen.getByText('Custom Level 1')).toBeInTheDocument();
+        expect(screen.getByText('Custom Level 2')).toBeInTheDocument();
+      });
+
+      it('should display remove buttons for custom access levels', () => {
+        renderComponent({ field: mineField });
+        const removeButtons = screen.getAllByText('x');
+        expect(removeButtons).toHaveLength(2);
+      });
+
+      it('should not display custom levels list when no custom levels exist', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+        });
+        expect(screen.getByText('researchOutput.accessLevels.legends.myAccessLevels')).toBeInTheDocument();
+        expect(screen.queryByText('x')).not.toBeInTheDocument();
+      });
+    });
+
+    describe('User Interactions', () => {
+      it.skip('should call onModeChange when access level mode is changed', async () => {
+        const onModeChange = jest.fn();
+        renderComponent({ onModeChange });
+        // Click the visible dropdown button
+        const selectButton = screen.getByTestId('select-button');
+        await userEvent.click(selectButton);
+
+        // Find and click the "Customize output list" option
+        const mineOption = screen.getByRole('option', { name: 'Customize output list' });
+        await userEvent.click(mineOption);
+
+        expect(onModeChange).toHaveBeenCalledWith('mine');
+      });
+
+      it('should call setNewAccessLevel when input value changes in mine mode', () => {
+        const setNewAccessLevel = jest.fn();
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+          setNewAccessLevel,
+        });
+        const input = screen.getByLabelText('researchOutput.accessLevels.labels.enterAccessLevel');
+        fireEvent.change(input, { target: { value: 'New Access Level' } });
+        expect(setNewAccessLevel).toHaveBeenCalledWith({ level: 'New Access Level', description: '' });
+      });
+
+      it('should call setNewAccessLevel when description input value changes in mine mode', () => {
+        const setNewAccessLevel = jest.fn();
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+          setNewAccessLevel,
+        });
+        const descInput = screen.getByLabelText('researchOutput.accessLevels.labels.accessLevelDescription');
+        fireEvent.change(descInput, { target: { value: 'New Description' } });
+        expect(setNewAccessLevel).toHaveBeenCalledWith({ level: '', description: 'New Description' });
+      });
+
+      it('should call onAddCustomType when Enter key is pressed in description input', () => {
+        const onAddCustomType = jest.fn();
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+          newAccessLevel: { level: '', description: 'New Description' },
+          onAddCustomType,
+        });
+        const descInput = screen.getByLabelText('researchOutput.accessLevels.labels.accessLevelDescription');
+        fireEvent.keyDown(descInput, { key: 'Enter' });
+        expect(onAddCustomType).toHaveBeenCalled();
+      });
+
+      it('should call onAddCustomType when add button is clicked in mine mode', () => {
+        const onAddCustomType = jest.fn();
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+          newAccessLevel: { level: 'New Level', description: 'Description for New Level' },
+          onAddCustomType,
+        });
+        const addButton = screen.getByText('researchOutput.accessLevels.buttons.addAccessLevel');
+        fireEvent.click(addButton);
+        expect(onAddCustomType).toHaveBeenCalled();
+      });
+
+      it('should call onAddCustomType when Enter key is pressed in mine mode', () => {
+        const onAddCustomType = jest.fn();
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+          newAccessLevel: { level: 'New Level', description: 'Description for New Level' },
+          onAddCustomType,
+        });
+        const input = screen.getByLabelText('researchOutput.accessLevels.labels.enterAccessLevel');
+        fireEvent.keyDown(input, { key: 'Enter' });
+        expect(onAddCustomType).toHaveBeenCalled();
+      });
+
+      it('should disable add button when newAccessLevel is empty or whitespace in mine mode', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+          newAccessLevel: { level: ' ', description: '' },
+        });
+        const addButton = screen.getByText('researchOutput.accessLevels.buttons.addAccessLevel');
+        expect(addButton).toBeDisabled();
+      });
+
+      it('should enable add button when newAccessLevel has content in mine mode', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+          newAccessLevel: { level: 'Valid Access Level', description: 'Description for Valid Access Level' },
+        });
+        const addButton = screen.getByText('researchOutput.accessLevels.buttons.addAccessLevel');
+        expect(addButton).not.toBeDisabled();
+      });
+
+      it('should call onRemoveCustomType when remove button is clicked', () => {
+        const onRemoveCustomType = jest.fn();
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [
+                { level: 'Test Level', description: 'Description for Custom Level 1' },
+                { level: 'Custom Level 2', description: 'Description for Custom Level 2' }
+              ],
+              selectedDefaults: [],
+            },
+          },
+          onRemoveCustomType,
+        });
+        const removeButtons = screen.getAllByText('x');
+        fireEvent.click(removeButtons[0]);
+        expect(onRemoveCustomType).toHaveBeenCalledWith('Test Level');
+      });
+    });
+
+    describe('Props Validation', () => {
+      it.skip('should handle missing accessLevelsConfig gracefully', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: undefined,
+          },
+        });
+        // Check the visible value in the custom dropdown
+        const selectButton = screen.getByTestId('select-button');
+        expect(selectButton).toHaveTextContent('Use defaults');
+      });
+    });
+
+    describe('Edge Cases', () => {
+      it('should handle empty custom levels array in mine mode', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+        });
+        expect(screen.getByText('researchOutput.accessLevels.legends.myAccessLevels')).toBeInTheDocument();
+        expect(screen.queryByText('x')).not.toBeInTheDocument();
+      });
+
+      it('should handle multiple custom levels correctly in mine mode', () => {
+        const multipleCustomLevels = [
+          { level: 'Level A', description: 'Description for Level A' },
+          { level: 'Level B', description: 'Description for Level B' },
+          { level: 'Level C', description: 'Description for Level C' }
+        ];
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: multipleCustomLevels,
+              selectedDefaults: [],
+            },
+          },
+        });
+        multipleCustomLevels.forEach(level => {
+          expect(screen.getByText(level.level)).toBeInTheDocument();
+        });
+        expect(screen.getAllByText('x')).toHaveLength(3);
+      });
+
+      it('should render correctly with special characters in custom access level names', () => {
+        const specialLevel = [{ level: 'Controlled (v2.0 - Enhanced)', description: 'Description for Controlled (v2.0 - Enhanced)' }];
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'mine',
+              customLevels: specialLevel,
+              selectedDefaults: [],
+            },
+          },
+        });
+        expect(screen.getByText(specialLevel[0].level)).toBeInTheDocument();
+        expect(screen.getByText('x')).toBeInTheDocument();
+      });
+
+      it('should display all 3 default access levels', () => {
+        renderComponent({
+          field: {
+            ...defaultProps.field,
+            accessLevelsConfig: {
+              mode: 'defaults',
+              customLevels: [],
+              selectedDefaults: [],
+            },
+          },
+        });
+        const expectedLevels = [
+          'Controlled access',
+          'Unrestricted access',
+          'Other'
+        ];
+        expectedLevels.forEach(level => {
+          expect(screen.getByText(level)).toBeInTheDocument();
+        });
+      });
+    });
+  });
+});
diff --git a/components/QuestionAdd/__tests__/OutputTypeField.spec.tsx b/components/QuestionAdd/__tests__/OutputTypeField.spec.tsx
index d81970fb3..0ca1ebd61 100644
--- a/components/QuestionAdd/__tests__/OutputTypeField.spec.tsx
+++ b/components/QuestionAdd/__tests__/OutputTypeField.spec.tsx
@@ -15,11 +15,11 @@ describe('OutputTypeField', () => {
       enabled: true,
       outputTypeConfig: {
         mode: 'defaults',
-        customTypes: [],
+        customTypes: [{ type: "Audiovisual", description: "A type of output that includes both visual and auditory content." }],
         selectedDefaults: [],
       },
     },
-    newOutputType: '',
+    newOutputType: { type: '', description: '' },
     setNewOutputType: jest.fn(),
     onModeChange: jest.fn(),
     onAddCustomType: jest.fn(),
@@ -112,7 +112,7 @@ describe('OutputTypeField', () => {
         ...defaultProps.field,
         outputTypeConfig: {
           mode: 'mine' as const,
-          customTypes: ['Custom Type 1', 'Custom Type 2'],
+          customTypes: [{ type: 'Custom Type 1', description: 'Description for Custom Type 1' }, { type: 'Custom Type 2', description: 'Description for Custom Type 2' }],
           selectedDefaults: [],
         },
       };
@@ -165,29 +165,18 @@ describe('OutputTypeField', () => {
       const addToDefaultsField = {
         ...defaultProps.field,
         outputTypeConfig: {
-          mode: 'addToDefaults' as const,
-          customTypes: ['Custom Type 1', 'Custom Type 2'],
+          mode: 'mine' as const,
+          customTypes: [{ type: 'Custom Type 1', description: 'Description for Custom Type 1' }, { type: 'Custom Type 2', description: 'Description for Custom Type 2' }],
           selectedDefaults: [],
         },
       };
 
-      it('displays both default and custom output type sections when mode is "addToDefaults"', () => {
-        renderComponent({
-          field: addToDefaultsField,
-        });
-
-        expect(screen.getByText('researchOutput.outputType.legends.default')).toBeInTheDocument();
-        expect(screen.getByText('researchOutput.outputType.legends.myOutputs')).toBeInTheDocument();
-      });
-
       it('displays all default output types in addToDefaults mode', () => {
         renderComponent({
           field: addToDefaultsField,
         });
 
-        expect(screen.getByText('Audiovisual')).toBeInTheDocument();
-        expect(screen.getByText('Dataset')).toBeInTheDocument();
-        expect(screen.getByText('Text')).toBeInTheDocument();
+        expect(screen.getByText('Custom Type 1')).toBeInTheDocument();
       });
 
       it('displays custom output types when they exist', () => {
@@ -213,7 +202,7 @@ describe('OutputTypeField', () => {
           field: {
             ...defaultProps.field,
             outputTypeConfig: {
-              mode: 'addToDefaults',
+              mode: 'mine',
               customTypes: [],
               selectedDefaults: [],
             },
@@ -235,7 +224,7 @@ describe('OutputTypeField', () => {
         await userEvent.click(selectButton);
 
         // Find and click the "Use mine" option in the listbox
-        const mineOption = screen.getByRole('option', { name: 'Use mine' });
+        const mineOption = screen.getByRole('option', { name: 'Use custom list' });
         await userEvent.click(mineOption);
 
         expect(onModeChange).toHaveBeenCalledWith('mine');
@@ -258,7 +247,7 @@ describe('OutputTypeField', () => {
         const input = screen.getByLabelText('researchOutput.outputType.labels.enterOutputType');
         fireEvent.change(input, { target: { value: 'New Output Type' } });
 
-        expect(setNewOutputType).toHaveBeenCalledWith('New Output Type');
+        expect(setNewOutputType).toHaveBeenCalledWith({ description: '', type: 'New Output Type' });
       });
 
       it('calls onAddCustomType when add button is clicked in mine mode', () => {
@@ -272,10 +261,13 @@ describe('OutputTypeField', () => {
               selectedDefaults: [],
             },
           },
-          newOutputType: 'New Type',
+          newOutputType: { type: 'New Type', description: 'Description for New Type' },
           onAddCustomType,
         });
 
+        const input = screen.getByLabelText('researchOutput.outputType.labels.enterOutputType');
+        fireEvent.change(input, { target: { value: 'New Output Type' } });
+
         const addButton = screen.getByText('researchOutput.outputType.buttons.addOutputType');
         fireEvent.click(addButton);
 
@@ -293,7 +285,7 @@ describe('OutputTypeField', () => {
               selectedDefaults: [],
             },
           },
-          newOutputType: 'New Type',
+          newOutputType: { type: 'New Type', description: 'Description for New Type' },
           onAddCustomType,
         });
 
@@ -313,7 +305,7 @@ describe('OutputTypeField', () => {
               selectedDefaults: [],
             },
           },
-          newOutputType: '   ',
+          newOutputType: { type: ' ', description: '' },
         });
 
         const addButton = screen.getByText('researchOutput.outputType.buttons.addOutputType');
@@ -330,7 +322,7 @@ describe('OutputTypeField', () => {
               selectedDefaults: [],
             },
           },
-          newOutputType: 'Valid Output Type',
+          newOutputType: { type: 'Valid Output Type', description: 'Description for Valid Output Type' },
         });
 
         const addButton = screen.getByText('researchOutput.outputType.buttons.addOutputType');
@@ -344,15 +336,15 @@ describe('OutputTypeField', () => {
             ...defaultProps.field,
             outputTypeConfig: {
               mode: 'mine',
-              customTypes: ['Test Type'],
+              customTypes: [{ type: 'Test Type', description: 'Description for Custom Type 1' }, { type: 'Custom Type 2', description: 'Description for Custom Type 2' }],
               selectedDefaults: [],
             },
           },
           onRemoveCustomType,
         });
 
-        const removeButton = screen.getByText('x');
-        fireEvent.click(removeButton);
+        const removeButtons = screen.getAllByText('x');
+        fireEvent.click(removeButtons[0]);
 
         expect(onRemoveCustomType).toHaveBeenCalledWith('Test Type');
       });
@@ -364,16 +356,20 @@ describe('OutputTypeField', () => {
           field: {
             ...defaultProps.field,
             outputTypeConfig: {
-              mode: 'addToDefaults',
+              mode: 'mine',
               customTypes: [],
               selectedDefaults: [],
             },
           },
-          newOutputType: 'New Type',
+          newOutputType: { type: 'New Type', description: 'Description for New Type' },
           onAddCustomType,
           setNewOutputType,
         });
 
+        const input = screen.getByLabelText('researchOutput.outputType.labels.enterOutputType');
+        fireEvent.keyDown(input, { key: 'Enter' });
+
+
         const addButtons = screen.getByText('researchOutput.outputType.buttons.addOutputType');
         fireEvent.click(addButtons); // Click the add button in custom types section
 
@@ -401,13 +397,13 @@ describe('OutputTypeField', () => {
             outputTypeConfig: {
               customTypes: [],
               selectedDefaults: [],
-              mode: 'addToDefaults'
+              mode: 'mine'
             }
           },
         });
 
         const selectButton = screen.getByTestId('select-button');
-        expect(selectButton).toHaveTextContent('Add mine to defaultsOpen drop down');
+        expect(selectButton).toHaveTextContent('Use custom listOpen drop down');
       });
     });
 
@@ -429,7 +425,8 @@ describe('OutputTypeField', () => {
       });
 
       it('handles multiple custom types correctly in mine mode', () => {
-        const multipleCustomTypes = ['Type A', 'Type B', 'Type C'];
+        const multipleCustomTypes = [{ type: 'Type A', description: 'Description for Type A' }, { type: 'Type B', description: 'Description for Type B' }, { type: 'Type C', description: 'Description for Type C' }];
+
         renderComponent({
           field: {
             ...defaultProps.field,
@@ -442,26 +439,26 @@ describe('OutputTypeField', () => {
         });
 
         multipleCustomTypes.forEach(type => {
-          expect(screen.getByText(type)).toBeInTheDocument();
+          expect(screen.getByText(type.type)).toBeInTheDocument();
         });
 
         expect(screen.getAllByText('x')).toHaveLength(3);
       });
 
       it('renders correctly with special characters in custom output type names', () => {
-        const specialType = 'Dataset (v2.0 - Enhanced)';
+        const specialType = [{ type: 'Dataset (v2.0 - Enhanced)', description: 'Description for Dataset (v2.0 - Enhanced)' }];
         renderComponent({
           field: {
             ...defaultProps.field,
             outputTypeConfig: {
               mode: 'mine',
-              customTypes: [specialType],
+              customTypes: specialType,
               selectedDefaults: [],
             },
           },
         });
 
-        expect(screen.getByText(specialType)).toBeInTheDocument();
+        expect(screen.getByText(specialType[0].type)).toBeInTheDocument();
         expect(screen.getByText('x')).toBeInTheDocument();
       });
 
diff --git a/components/QuestionAdd/__tests__/ReposSelector.spec.tsx b/components/QuestionAdd/__tests__/ReposSelector.spec.tsx
index f17a16f97..4eeb6f387 100644
--- a/components/QuestionAdd/__tests__/ReposSelector.spec.tsx
+++ b/components/QuestionAdd/__tests__/ReposSelector.spec.tsx
@@ -5,6 +5,9 @@ import React from 'react';
 import { act, render, screen, fireEvent } from '@testing-library/react';
 import { axe, toHaveNoViolations } from 'jest-axe';
 import RepositorySelectionSystem from '../ReposSelector';
+import {
+  RepositoryInterface,
+} from '@/app/types';
 
 expect.extend(toHaveNoViolations);
 
@@ -21,7 +24,7 @@ jest.mock('@/context/ToastContext', () => ({
 }));
 
 // ---- Test data ----
-const createMockField = (hasCustomRepos: boolean = true, customRepos: string[] = []) => ({
+const createMockField = (hasCustomRepos: boolean = true, customRepos: RepositoryInterface[] = []) => ({
   id: 'repoSelector',
   label: 'Repo selector',
   enabled: false,
diff --git a/components/QuestionAdd/__tests__/index.spec.tsx b/components/QuestionAdd/__tests__/index.spec.tsx
index 1cc822574..9cc3f6ed9 100644
--- a/components/QuestionAdd/__tests__/index.spec.tsx
+++ b/components/QuestionAdd/__tests__/index.spec.tsx
@@ -1471,7 +1471,7 @@ describe("Research Output Question Type", () => {
     expect(screen.getByText('Output Type')).toBeInTheDocument();
     expect(screen.getByText('Description')).toBeInTheDocument();
     expect(screen.getByText('Data Flags')).toBeInTheDocument();
-    expect(screen.getByText('Repo selector')).toBeInTheDocument();
+    expect(screen.getByText('Repositories')).toBeInTheDocument();
     expect(screen.getByText('Metadata Standards')).toBeInTheDocument();
     expect(screen.getByText('Licenses')).toBeInTheDocument();
   });
@@ -1830,13 +1830,13 @@ describe("Research Output Question Type", () => {
     });
 
     // Enable repo selector field
-    const repoSelectorCheckbox = screen.getByLabelText('Repo selector');
+    const repoSelectorCheckbox = screen.getByLabelText('Repositories');
     await act(async () => {
       fireEvent.click(repoSelectorCheckbox);
     });
 
     // Should show repository configuration
-    expect(screen.getByText('researchOutput.repoSelector.descriptionLabel')).toBeInTheDocument();
+    expect(screen.getByText('labels.helpText')).toBeInTheDocument();
   });
 
   it('should handle metadata standards configuration', async () => {
@@ -1870,7 +1870,7 @@ describe("Research Output Question Type", () => {
     });
 
     // Should show metadata standards configuration
-    expect(screen.getByText('researchOutput.metaDataStandards.descriptionLabel')).toBeInTheDocument();
+    expect(screen.getByText('labels.helpText')).toBeInTheDocument();
   });
 
   it('should handle license configuration', async () => {
@@ -2000,7 +2000,7 @@ describe("Research Output Question Type", () => {
     });
 
     // Enable repo selector field
-    const repoSelectorCheckbox = screen.getByLabelText('Repo selector');
+    const repoSelectorCheckbox = screen.getByLabelText('Repositories');
     await act(async () => {
       fireEvent.click(repoSelectorCheckbox);
     });
diff --git a/components/QuestionAdd/index.tsx b/components/QuestionAdd/index.tsx
index 27b9fcca3..363fc68ab 100644
--- a/components/QuestionAdd/index.tsx
+++ b/components/QuestionAdd/index.tsx
@@ -29,6 +29,11 @@ import {
   useQuestionsDisplayOrderQuery,
 } from '@/generated/graphql';
 
+import {
+  AccessLevelInterface,
+  OutputTypeInterface
+} from '@/app/types';
+
 // Components
 import PageHeader from "@/components/PageHeader";
 import {
@@ -47,6 +52,7 @@ import RepositorySelectionSystem from './ReposSelector';
 import MetaDataStandards from './MetaDataStandards';
 import OutputTypeField from './OutputTypeField';
 import LicenseField, { otherLicenses } from './LicenseField';
+import InitialAccessLevel from './InitialAccessLevel';
 
 //Other
 import { useToast } from '@/context/ToastContext';
@@ -102,10 +108,47 @@ const defaultLicenses = [
   'CCo-1.0'
 ];
 
+const defaultAccessLevels = [
+  { id: 'controlledAccess', level: 'Controlled access', description: 'Restricts access to certain areas' },
+  { id: 'unrestrictedAccess', level: 'Unrestricted access', description: 'Allows access to all areas' },
+  { id: 'Other', level: 'Other', description: 'Other type of access' },
+];
+
+const defaultOutputTypes = [
+  { id: 'Audiovisual', type: 'Audiovisual', description: 'A series of visual representations imparting an impression of motion when shown in succession. May or may not include sound.' },
+  { id: 'Collection', type: 'Collection', description: 'An aggregation of resources, which may encompass collections of one resourceType as well as those of mixed types. A collection is described as a group; its parts may also be separately described.' },
+  { id: 'Data paper', type: 'Data paper', description: 'A factual and objective publication with a focused intent to identify and describe specific data, sets of data, or data collections to facilitate discoverability.' },
+  { id: 'Dataset', type: 'Dataset', description: 'Data encoded in a defined structure.' },
+  { id: 'Event', type: 'Event', description: 'A non-persistent, time-based occurrence.' },
+  { id: 'Image', type: 'Image', description: 'A visual representation other than text.' },
+  { id: 'Interactive resource', type: 'Interactive resource', description: 'A resource requiring interaction from the user to be understood, executed, or experienced.' },
+  { id: 'Model representation', type: 'Model representation', description: 'An abstract, conceptual, graphical, mathematical or visualization model that represents empirical objects, phenomena, or physical processes.' },
+  { id: 'Physical object', type: 'Physical object', description: 'A physical object or substance.' },
+  { id: 'Service', type: 'Service', description: 'An organized system of apparatus, appliances, staff, etc., for supplying some function(s) required by end users.' },
+  { id: 'Software', type: 'Software', description: 'A computer program other than a computational notebook, in either source code (text) or compiled form. Use this type for general software components supporting scholarly research. Use the “ComputationalNotebook” value for virtual notebooks.' },
+  { id: 'Sound', type: 'Sound', description: 'A resource primarily intended to be heard.' },
+  { id: 'Text', type: 'Text', description: 'A resource consisting primarily of words for reading that is not covered by any other textual resource type in this list.' },
+  { id: 'Workflow', type: 'Workflow', description: 'A structured series of steps which can be executed to produce a final outcome, allowing users a means to specify and enact their work in a more reproducible manner.' }
+];
+
 // Initial Standard Fields data
 const initialStandardFields: StandardField[] = [
-  { id: 'title', label: 'Title', enabled: true, required: true },
-  { id: 'description', label: 'Description', enabled: false, placeholder: '', helpText: '', maxLength: '', required: true, value: '' },
+  {
+    id: 'title',
+    label: 'Title',
+    enabled: true,
+    required: true
+  },
+  {
+    id: 'description',
+    label: 'Description',
+    enabled: false,
+    placeholder: '',
+    helpText: '',
+    maxLength: '',
+    required: true,
+    value: ''
+  },
   {
     id: 'outputType',
     label: 'Output Type',
@@ -113,9 +156,9 @@ const initialStandardFields: StandardField[] = [
     helpText: '',
     required: true,
     outputTypeConfig: {
-      mode: 'defaults' as 'defaults' | 'mine' | 'addToDefaults',
+      mode: 'defaults' as 'defaults' | 'mine',
       selectedDefaults: [] as string[],
-      customTypes: [] as string[]
+      customTypes: [] as OutputTypeInterface[],
     }
   },
   {
@@ -131,14 +174,14 @@ const initialStandardFields: StandardField[] = [
   },
   {
     id: 'repoSelector',
-    label: 'Repo selector',
+    label: 'Repositories',
     enabled: false,
     placeholder: '',
     helpText: '',
     value: '',
     repoConfig: {
       hasCustomRepos: false,
-      customRepos: [] as string[],
+      customRepos: [] as RepositoryInterface[],
     }
   },
   {
@@ -148,7 +191,7 @@ const initialStandardFields: StandardField[] = [
     helpText: '',
     metaDataConfig: {
       hasCustomStandards: false,
-      customStandards: [] as string[],
+      customStandards: [] as MetaDataStandardInterface[],
     }
   },
   {
@@ -163,6 +206,18 @@ const initialStandardFields: StandardField[] = [
       customTypes: defaultLicenses as string[],
     }
   },
+  {
+    id: 'accessLevels',
+    label: 'Initial Access Levels',
+    enabled: false,
+    defaultValue: '',
+    helpText: '',
+    accessLevelsConfig: {
+      mode: 'defaults' as 'defaults' | 'mine',
+      selectedDefaults: [] as string[],
+      customLevels: [] as AccessLevelInterface[],
+    }
+  },
 ];
 
 const QuestionAdd = ({
@@ -210,6 +265,9 @@ const QuestionAdd = ({
   // Which fields are expanded for customization
   const [expandedFields, setExpandedFields] = useState<string[]>(['title', 'outputType']);
 
+  // Which fields cannot be customized
+  const nonCustomizableFieldIds = ['accessLevels'];
+
   // Standard fields for research output questions
   const [standardFields, setStandardFields] = useState(initialStandardFields);
 
@@ -219,9 +277,11 @@ const QuestionAdd = ({
   ]);
 
   // State for managing custom output types
-  const [newOutputType, setNewOutputType] = useState<string>('');
+  const [newOutputType, setNewOutputType] = useState<OutputTypeInterface>({ type: '', description: '' });
   // State for managing custom license types
   const [newLicenseType, setNewLicenseType] = useState<string>('');
+  // State for managing custom access levels
+  const [newAccessLevel, setNewAccessLevel] = useState<AccessLevelInterface>({ level: '', description: '' });
 
   // localization keys
   const Global = useTranslations('Global');
@@ -284,11 +344,17 @@ const QuestionAdd = ({
     // Store the selected repositories in the field config
     const currentField = standardFields.find(f => f.id === 'repoSelector');
     if (currentField && currentField.repoConfig) {
+      const wasEnabled = currentField.enabled;
       updateStandardFieldProperty('repoSelector', 'repoConfig', {
         ...currentField.repoConfig,
-        customRepos: repos.map(r => ({ id: r.id, name: r.name, url: r.url })) // Store relevant data
+        customRepos: repos
       });
+      // Only enable if a repo is added and the box is currently unchecked
+      if (!wasEnabled && repos.length > (currentField.repoConfig.customRepos?.length || 0)) {
+        updateStandardFieldProperty('repoSelector', 'enabled', true);
+      }
     }
+
     setHasUnsavedChanges(true);
   };
 
@@ -297,10 +363,15 @@ const QuestionAdd = ({
     // Store the selected metadata standards in the field config
     const currentField = standardFields.find(f => f.id === 'metadataStandards');
     if (currentField && currentField.metaDataConfig) {
+      const wasEnabled = currentField.enabled;
       updateStandardFieldProperty('metadataStandards', 'metaDataConfig', {
         ...currentField.metaDataConfig,
-        customStandards: standards.map(s => ({ id: s.id, name: s.name, url: s.url })) // Store relevant data
+        customStandards: standards // Store metadata standard data
       });
+      // Only enable if a standard is added and the box is currently unchecked
+      if (!wasEnabled && standards.length > (currentField.metaDataConfig.customStandards?.length || 0)) {
+        updateStandardFieldProperty('metadataStandards', 'enabled', true);
+      }
     }
     setHasUnsavedChanges(true);
   };
@@ -371,14 +442,9 @@ const QuestionAdd = ({
   const handleStandardFieldChange = (fieldId: string, enabled: boolean) => {
     updateStandardFieldProperty(fieldId, 'enabled', enabled);
     if (enabled === true) {
-      handleCustomizeField(fieldId);
-    } else {
-      removeCustomizeField(fieldId);
+      setExpandedFields(prev => [...prev, fieldId]); //expanded
     }
-  };
-
-  const removeCustomizeField = (fieldId: string) => {
-    setExpandedFields(prev => prev.filter(id => id !== fieldId));
+    // Do NOT auto-collapse when unchecked
   };
 
   // Handler for customize button clicks
@@ -423,6 +489,23 @@ const QuestionAdd = ({
     }
   };
 
+  // Handler for access level mode changes (defaults, add to defaults)  
+  const handleAccessLevelModeChange = (mode: 'defaults' | 'mine') => {
+    const currentField = standardFields.find(f => f.id === 'accessLevels');
+    if (currentField && currentField.accessLevelsConfig) {
+      // When switching to 'mine' mode, pre-populate with defaults if customTypes is empty
+      const customLevels = mode === 'mine' && currentField.accessLevelsConfig.customLevels.length === 0
+        ? defaultAccessLevels
+        : currentField.accessLevelsConfig.customLevels;
+
+      updateStandardFieldProperty('accessLevels', 'accessLevelsConfig', {
+        ...currentField.accessLevelsConfig,
+        mode,
+        customLevels
+      });
+    }
+  };
+
   // Handler for adding custom license types
   const handleAddCustomLicenseType = () => {
     if (newLicenseType.trim()) {
@@ -454,28 +537,78 @@ const QuestionAdd = ({
     }
   };
 
+  // Handler for adding custom access levels
+  const handleAddCustomAccessLevel = () => {
+    if (newAccessLevel.level && newAccessLevel.level.trim()) {
+      const currentField = standardFields.find(f => f.id === 'accessLevels');
+      if (currentField && currentField.accessLevelsConfig) {
+        // Add to custom access levels array
+        const updatedCustomTypes = [
+          ...currentField.accessLevelsConfig.customLevels,
+          { level: newAccessLevel.level.trim(), description: newAccessLevel.description?.trim() || '' }
+        ];
+
+        updateStandardFieldProperty('accessLevels', 'accessLevelsConfig', {
+          ...currentField.accessLevelsConfig,
+          customLevels: updatedCustomTypes
+        });
+
+        // Clear the input fields
+        setNewAccessLevel({ level: '', description: '' });
+      }
+    }
+  };
+
+  // Handler for removing custom access levels
+  const handleRemoveCustomAccessLevels = (levelToRemove: string) => {
+    const currentField = standardFields.find(f => f.id === 'accessLevels');
+    if (currentField && currentField.accessLevelsConfig) {
+      const updatedCustomLevels = currentField.accessLevelsConfig.customLevels.filter(
+        (customLevel: AccessLevelInterface) => customLevel.level !== levelToRemove
+      );
+      updateStandardFieldProperty('accessLevels', 'accessLevelsConfig', {
+        ...currentField.accessLevelsConfig,
+        customLevels: updatedCustomLevels
+      });
+    }
+  };
+
+
   // Handler for output type mode changes (defaults, mine, add to defaults)
-  const handleOutputTypeModeChange = (mode: 'defaults' | 'mine' | 'addToDefaults') => {
+  const handleOutputTypeModeChange = (mode: 'defaults' | 'mine') => {
     const currentField = standardFields.find(f => f.id === 'outputType');
     if (currentField && currentField.outputTypeConfig) {
+      // When switching to 'mine' mode, pre-populate with defaults if customTypes is empty
+      const customTypes = mode === 'mine' && currentField.outputTypeConfig.customTypes.length === 0
+        ? defaultOutputTypes
+        : currentField.outputTypeConfig.customTypes;
+
       updateStandardFieldProperty('outputType', 'outputTypeConfig', {
         ...currentField.outputTypeConfig,
-        mode
+        mode,
+        customTypes
       });
     }
   };
 
   // Handler for adding custom output types
   const handleAddCustomOutputType = () => {
-    if (newOutputType.trim()) {
+    if (newOutputType.type && newOutputType.type.trim()) {
       const currentField = standardFields.find(f => f.id === 'outputType');
       if (currentField && currentField.outputTypeConfig) {
-        const updatedCustomTypes = [...currentField.outputTypeConfig.customTypes, newOutputType.trim()];
+        // Add to customTypes array
+        const updatedCustomTypes = [
+          ...currentField.outputTypeConfig.customTypes,
+          { type: newOutputType.type.trim(), description: newOutputType.description?.trim() || '' }
+        ];
+
         updateStandardFieldProperty('outputType', 'outputTypeConfig', {
           ...currentField.outputTypeConfig,
           customTypes: updatedCustomTypes
         });
-        setNewOutputType('');
+
+        // Clear the input fields
+        setNewOutputType({ type: '', description: '' });
       }
     }
   };
@@ -484,7 +617,9 @@ const QuestionAdd = ({
   const handleRemoveCustomOutputType = (typeToRemove: string) => {
     const currentField = standardFields.find(f => f.id === 'outputType');
     if (currentField && currentField.outputTypeConfig) {
-      const updatedCustomTypes = currentField.outputTypeConfig.customTypes.filter((type: string) => type !== typeToRemove);
+      const updatedCustomTypes = currentField.outputTypeConfig.customTypes.filter(
+        (customType: OutputTypeInterface) => customType.type !== typeToRemove
+      );
       updateStandardFieldProperty('outputType', 'outputTypeConfig', {
         ...currentField.outputTypeConfig,
         customTypes: updatedCustomTypes
@@ -832,7 +967,6 @@ const QuestionAdd = ({
                   name="question_requirements"
                   isRequired={false}
                   richText={true}
-                  description={QuestionAdd('helpText.requirementText')}
                   textAreaClasses={styles.questionFormField}
                   label={QuestionAdd('labels.requirementText')}
                   value={question?.requirementText ? question.requirementText : ''}
@@ -848,6 +982,7 @@ const QuestionAdd = ({
                   label={QuestionAdd('labels.guidanceText')}
                   value={question?.guidanceText ? question?.guidanceText : ''}
                   onChange={(newValue) => handleInputChange('guidanceText', newValue)}
+                  helpMessage={QuestionAdd('helpText.guidanceText')}
                 />
 
                 {questionType === TEXT_AREA_QUESTION_TYPE && (
@@ -922,7 +1057,11 @@ const QuestionAdd = ({
                                   className={`buttonLink link`}
                                   onPress={() => handleCustomizeField(field.id)}
                                 >
-                                  {expandedFields.includes(field.id) ? Global('buttons.close') : Global('buttons.customize')}
+                                  {expandedFields.includes(field.id)
+                                    ? Global('buttons.close')
+                                    : nonCustomizableFieldIds.includes(field.id)
+                                      ? Global('links.expand')
+                                      : Global('buttons.customize')}
                                 </Button>
                               )}
 
@@ -933,13 +1072,15 @@ const QuestionAdd = ({
                               <div className={styles.fieldPanel}>
                                 {/** Description */}
                                 {field.id === 'description' && (
-                                  <FormTextArea
-                                    name={QuestionAdd('researchOutput.labels.descriptionLowerCase')}
+                                  <FormInput
+                                    name="descriptionHelpText"
+                                    type="text"
                                     isRequired={false}
-                                    richText={true}
-                                    label={QuestionAdd('researchOutput.labels.description')}
-                                    value={field.value}
-                                    onChange={(newValue) => updateStandardFieldProperty('description', 'value', newValue)}
+                                    label={QuestionAdd('labels.helpText', { fieldName: QuestionAdd('researchOutput.labels.description') })}
+                                    value={field.helpText || ''}
+                                    onChange={(e) => updateStandardFieldProperty('description', 'helpText', e.currentTarget.value)}
+                                    helpMessage={QuestionAdd('researchOutput.helpText')}
+                                    maxLength={300}
                                   />
                                 )}
 
@@ -996,13 +1137,15 @@ const QuestionAdd = ({
                                       onRepositoriesChange={handleRepositoriesChange}
                                     />
 
-                                    <FormTextArea
-                                      name="repoSelectorDescription"
+                                    <FormInput
+                                      name="repositoriesHelpText"
+                                      type="text"
                                       isRequired={false}
-                                      richText={true}
-                                      label={QuestionAdd('researchOutput.repoSelector.descriptionLabel')}
-                                      value={field.value}
-                                      onChange={(value) => updateStandardFieldProperty('repoSelector', 'value', value)}
+                                      label={QuestionAdd('labels.helpText', { fieldName: field.label })}
+                                      value={field.helpText || ''}
+                                      onChange={(e) => updateStandardFieldProperty('repoSelector', 'helpText', e.currentTarget.value)}
+                                      helpMessage={QuestionAdd('researchOutput.helpText')}
+                                      maxLength={300}
                                     />
                                   </>
                                 )}
@@ -1016,28 +1159,66 @@ const QuestionAdd = ({
                                       onMetaDataStandardsChange={handleMetaDataStandardsChange}
                                     />
 
-                                    <FormTextArea
-                                      name="metadataStandardsDescription"
+                                    <FormInput
+                                      name="metadataStandardsHelpText"
+                                      type="text"
                                       isRequired={false}
-                                      richText={true}
-                                      label={QuestionAdd('researchOutput.metaDataStandards.descriptionLabel')}
-                                      value={field.value}
-                                      helpMessage={QuestionAdd('researchOutput.metaDataStandards.helpText')}
-                                      onChange={(value) => updateStandardFieldProperty('metaDataStandards', 'value', value)}
+                                      label={QuestionAdd('labels.helpText', { fieldName: field.label })}
+                                      value={field.helpText || ''}
+                                      onChange={(e) => updateStandardFieldProperty('metadataStandards', 'helpText', e.currentTarget.value)}
+                                      helpMessage={QuestionAdd('researchOutput.helpText')}
+                                      maxLength={300}
                                     />
                                   </>
                                 )}
 
                                 {/**License configurations */}
                                 {field.id === 'licenses' && (
-                                  <LicenseField
-                                    field={field}
-                                    newLicenseType={newLicenseType}
-                                    setNewLicenseType={setNewLicenseType}
-                                    onModeChange={handleLicenseModeChange}
-                                    onAddCustomType={handleAddCustomLicenseType}
-                                    onRemoveCustomType={handleRemoveCustomLicenseType}
-                                  />
+                                  <>
+                                    <LicenseField
+                                      field={field}
+                                      newLicenseType={newLicenseType}
+                                      setNewLicenseType={setNewLicenseType}
+                                      onModeChange={handleLicenseModeChange}
+                                      onAddCustomType={handleAddCustomLicenseType}
+                                      onRemoveCustomType={handleRemoveCustomLicenseType}
+                                    />
+                                    <FormInput
+                                      name="licensesHelpText"
+                                      type="text"
+                                      isRequired={false}
+                                      label={QuestionAdd('labels.helpText', { fieldName: field.label })}
+                                      value={field.helpText || ''}
+                                      onChange={(e) => updateStandardFieldProperty('licenses', 'helpText', e.currentTarget.value)}
+                                      helpMessage={QuestionAdd('researchOutput.helpText')}
+                                      maxLength={300}
+                                    />
+                                  </>
+                                )}
+
+                                {/**Access level configurations */}
+                                {field.id === 'accessLevels' && (
+                                  <>
+                                    <InitialAccessLevel
+                                      field={field}
+                                      newAccessLevel={newAccessLevel}
+                                      setNewAccessLevel={setNewAccessLevel}
+                                      onModeChange={handleAccessLevelModeChange}
+                                      onAddCustomType={handleAddCustomAccessLevel}
+                                      onRemoveCustomType={handleRemoveCustomAccessLevels}
+                                    />
+
+                                    <FormInput
+                                      name="accessLevelsHelpText"
+                                      type="text"
+                                      isRequired={false}
+                                      label={QuestionAdd('labels.helpText', { fieldName: field.label })}
+                                      value={field.helpText || ''}
+                                      onChange={(e) => updateStandardFieldProperty('accessLevels', 'helpText', e.currentTarget.value)}
+                                      helpMessage={QuestionAdd('researchOutput.helpText')}
+                                      maxLength={300}
+                                    />
+                                  </>
                                 )}
                               </div>
                             )}
@@ -1104,14 +1285,14 @@ const QuestionAdd = ({
                                     />
 
                                     {/* Help Text */}
-                                    <FormTextArea
+                                    <FormInput
                                       name={`${field.id}_help`}
                                       isRequired={false}
-                                      richText={false}
-                                      label={QuestionAdd('researchOutput.additionalFields.helpText.label')}
+                                      label={QuestionAdd('labels.helpText', { fieldName: field.customLabel || field.label })}
                                       value={field.helpText}
                                       onChange={(value) => handleUpdateAdditionalField(field.id, 'helpText', value)}
-                                      helpMessage={QuestionAdd('researchOutput.additionalFields.helpText.helpText')}
+                                      helpMessage={QuestionAdd('researchOutput.helpText')}
+                                      maxLength={300}
                                     />
 
                                     {/* Max Length for text field */}
diff --git a/components/QuestionAdd/questionAdd.module.scss b/components/QuestionAdd/questionAdd.module.scss
index ca7b475b3..040c36a0a 100644
--- a/components/QuestionAdd/questionAdd.module.scss
+++ b/components/QuestionAdd/questionAdd.module.scss
@@ -304,7 +304,7 @@
 .customTypesList {
   list-style: none;
   padding: 0;
-  margin: 0;
+  margin-top: var(--space-4);
   display: flex;
   flex-direction: column;
   gap: var(--space-2);
@@ -342,7 +342,7 @@
 .deletableList {
   list-style: none;
   padding: 0;
-  margin: 0;
+  margin-top: var(--space-4);
 }
 
 /* Data flags configuration styles */
@@ -383,4 +383,20 @@
 .flagPreview input[type="checkbox"] {
   margin: 0;
   cursor: not-allowed;
+}
+
+
+// Info icon button styles and tooltip
+.infoIcon {
+  background: none;
+  border: none;
+  padding: 0;
+  cursor: pointer;
+  color: var(--text-secondary);
+}
+
+.infoWrapper {
+      display: flex;
+    align-items: center;
+    gap: 0.25rem; // Adjust spacing between text and info button
 }
\ No newline at end of file
diff --git a/components/ResearchDomainCascadingDropdown/__tests__/index.spec.tsx b/components/ResearchDomainCascadingDropdown/__tests__/index.spec.tsx
index ff0f50aec..602e37897 100644
--- a/components/ResearchDomainCascadingDropdown/__tests__/index.spec.tsx
+++ b/components/ResearchDomainCascadingDropdown/__tests__/index.spec.tsx
@@ -33,16 +33,30 @@ describe('ResearchDomainCascadingDropdown', () => {
       refetch: jest.fn(),
     });
 
+    const mockProjectData = {
+      projectName: 'Test Project',
+      projectAbstract: 'This is a test project.',
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      parentResearchDomainId: '2',
+      researchDomainId: '3',
+      isTestProject: false
+    };
+
     render(
       <ResearchDomainCascadingDropdown
-        projectData={{}}
+        projectData={mockProjectData}
         setProjectData={mockSetProjectData}
       />
     );
 
-    expect(screen.getByText(/labels.researchDomain/i)).toBeInTheDocument();
-    expect(await screen.findByText('Domain 1')).toBeInTheDocument();
-    expect(await screen.findByText('Domain 2')).toBeInTheDocument();
+    const hiddenContainers = screen.getAllByTestId('hidden-select-container');
+    const select = hiddenContainers[0].querySelector('select[name="researchDomain"]');
+    const options = select?.querySelectorAll('option');
+    const domain1Option = Array.from(options || []).find(opt => opt.textContent === 'Domain 1');
+    const domain2Option = Array.from(options || []).find(opt => opt.textContent === 'Domain 2');
+    expect(domain1Option).toBeInTheDocument();
+    expect(domain2Option).toBeInTheDocument();
   });
 
   it('should set correct parent and child values on page load', async () => {
@@ -79,10 +93,14 @@ describe('ResearchDomainCascadingDropdown', () => {
     });
 
     const mockSetProjectData = jest.fn();
+
     const mockProjectData = {
+      projectName: 'Test Project',
+      projectAbstract: 'This is a test project.',
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
       parentResearchDomainId: '1',
       researchDomainId: '3',
-      projectName: 'Test Project',
       isTestProject: false
     };
 
@@ -145,9 +163,18 @@ describe('ResearchDomainCascadingDropdown', () => {
       refetch: refetchMock,
     }));
 
+    const mockProjectData = {
+      projectName: 'Test Project',
+      projectAbstract: 'This is a test project.',
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      parentResearchDomainId: '2',
+      researchDomainId: '3',
+      isTestProject: false
+    };
     render(
       <ResearchDomainCascadingDropdown
-        projectData={{}}
+        projectData={mockProjectData}
         setProjectData={mockSetProjectData}
       />
     );
@@ -166,26 +193,27 @@ describe('ResearchDomainCascadingDropdown', () => {
       expect(refetchMock).toHaveBeenCalledWith({ parentResearchDomainId: 1 });
     });
 
-    // Trigger re-render to reflect updated child domains
-
     // Find and click the child select button to open the dropdown
-    const childDropdownButton = selectButtons[1];
+    const childDropdownButton = screen.getAllByTestId('select-button')[1];
     fireEvent.click(childDropdownButton);
 
-    // Confirm child dropdown updated
-    const childOption1 = await screen.findAllByText(/Child Domain 1/i);
-    const childOption2 = await screen.findAllByText(/Child Domain 2/i);
-    expect(childOption1[0]).toBeInTheDocument();
-    expect(childOption2[0]).toBeInTheDocument();
+    // Wait for the child dropdown options to appear and select one
+    const childOptions = await screen.findAllByRole('option', { name: 'Child Domain 1' });
+    await userEvent.click(childOptions[0]);
 
-    // Select a child option
-    await userEvent.click(childOption1[0]);
+    // Assert that mockSetProjectData was called with the correct value
     expect(mockSetProjectData).toHaveBeenCalledWith({
       researchDomainId: '1',
+      endDate: '2023-12-31',
+      startDate: '2023-01-01',
+      projectAbstract: 'This is a test project.',
+      projectName: 'Test Project',
+      isTestProject: false,
+      parentResearchDomainId: '2'
     });
   });
 
-  it('should set child list to empty array if parentResearchDomainId is missing', async () => {
+  it('should not display subdomains if parent domain is not selected', async () => {
     // Explicitly define the type for childDomainsData
     let childDomainsData: { childResearchDomains: { id: number; name: string, description: string }[] } = { childResearchDomains: [] };
 
@@ -217,53 +245,26 @@ describe('ResearchDomainCascadingDropdown', () => {
       refetch: refetchMock,
     }));
 
+
+    const mockProjectData = {
+      projectName: 'Test Project',
+      projectAbstract: 'This is a test project.',
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      parentResearchDomainId: '',
+      researchDomainId: '3',
+      isTestProject: false
+    };
+
     render(
       <ResearchDomainCascadingDropdown
-        projectData={{}}
+        projectData={mockProjectData}
         setProjectData={mockSetProjectData}
       />
     );
 
-    // Find and click the parent select button to open the dropdown
-    const selectButtons = screen.getAllByTestId('select-button');
-    const parentDropdownButton = selectButtons[0];
-    fireEvent.click(parentDropdownButton);
-
-    // Wait for the dropdown item to appear
-    const options = await screen.findAllByRole('option', { name: 'Domain 1' });
-    await userEvent.click(options[0]);
-
-    // Find and click the child select button to open the dropdown
-    const childDropdownButton = selectButtons[1];
-    fireEvent.click(childDropdownButton);
-
-    // Get all elements with the same data-testid
-    const hiddenContainers = screen.getAllByTestId('hidden-select-container');
-
-    // Find the correct container by looking for the <select> with name="childDomain"
-    const correctContainer = hiddenContainers.find(container =>
-      container.querySelector('select[name="childDomain"]')
-    );
-
-    // Assert that the correct container was found
-    expect(correctContainer).toBeDefined();
-
-    // Query the <select> element inside the correct container
-    const hiddenChildDomainSelect = correctContainer?.querySelector('select[name="childDomain"]');
-
-    // Assert that the <select> element exists and is disabled
-    expect(hiddenChildDomainSelect).toBeDisabled();
-
-    // Assert that there are no options within the <select>
-    const childOptions = hiddenChildDomainSelect?.querySelectorAll('option');
-
-    // Filter out empty or placeholder options
-    const meaningfulOptions = Array.from(childOptions || []).filter(
-      option => option.value.trim() !== '' || option.textContent?.trim() !== ''
-    );
-
-    // Assert that there are no meaningful options
-    expect(meaningfulOptions.length).toBe(0);
+    const subdomainSelect = screen.queryByTestId('subdomain-select');
+    expect(subdomainSelect).not.toBeInTheDocument();
   });
 
 
@@ -299,9 +300,19 @@ describe('ResearchDomainCascadingDropdown', () => {
       refetch: refetchMock,
     }));
 
+    const mockProjectData = {
+      projectName: 'Test Project',
+      projectAbstract: 'This is a test project.',
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      parentResearchDomainId: '2',
+      researchDomainId: '3',
+      isTestProject: false
+    };
+
     render(
       <ResearchDomainCascadingDropdown
-        projectData={{}}
+        projectData={mockProjectData}
         setProjectData={mockSetProjectData}
       />
     );
@@ -330,6 +341,12 @@ describe('ResearchDomainCascadingDropdown', () => {
     // Assert that mockSetProjectData was called with the correct value
     expect(mockSetProjectData).toHaveBeenCalledWith({
       researchDomainId: '1',
+      endDate: '2023-12-31',
+      startDate: '2023-01-01',
+      projectAbstract: 'This is a test project.',
+      projectName: 'Test Project',
+      isTestProject: false,
+      parentResearchDomainId: '2'
     });
   });
 });
diff --git a/components/ResearchDomainCascadingDropdown/index.tsx b/components/ResearchDomainCascadingDropdown/index.tsx
index 9bde25c4e..a4b173e4a 100644
--- a/components/ResearchDomainCascadingDropdown/index.tsx
+++ b/components/ResearchDomainCascadingDropdown/index.tsx
@@ -7,11 +7,9 @@ import {
 } from '@/generated/graphql';
 
 import { FormSelect, } from "@/components/Form";
-
-
+import { ProjectDetailsFormInterface } from "@/app/types";
 import styles from './researchDomainDropdowns.module.scss';
 
-// Type definitions
 interface ChildOption {
   id: string;
   name: string;
@@ -21,10 +19,9 @@ interface ResearchDomainInterface {
   id: string;
   name: string;
 }
-/* eslint-disable @typescript-eslint/no-explicit-any */
 interface CascadingDropdownProps {
-  projectData: any;
-  setProjectData: (data: any) => void;
+  projectData: ProjectDetailsFormInterface;
+  setProjectData: (data: ProjectDetailsFormInterface) => void;
 }
 
 const ResearchDomainCascadingDropdown: React.FC<CascadingDropdownProps> = ({ projectData, setProjectData }) => {
@@ -32,11 +29,9 @@ const ResearchDomainCascadingDropdown: React.FC<CascadingDropdownProps> = ({ pro
   const [selectedChild, setSelectedChild] = useState('');
   const [rDomains, setRDomains] = useState<ResearchDomainInterface[]>([]);
   const [childOptionsList, setChildOptionsList] = useState<ChildOption[]>([]);
-  const childSelectRef = useRef<HTMLButtonElement>(null);
   const statusRef = useRef<HTMLDivElement>(null);
   const initialLoadRef = useRef(true);
 
-  // Localization keys
   const ProjectDetail = useTranslations('ProjectsProjectDetail');
 
   // Get all Research Domains
@@ -58,14 +53,6 @@ const ResearchDomainCascadingDropdown: React.FC<CascadingDropdownProps> = ({ pro
 
     if (parentResearchDomainId) {
       await refetch({ parentResearchDomainId: Number(parentResearchDomainId) });
-      // Set a brief timeout to ensure DOM is updated before focusing
-      setTimeout(() => {
-        if (childSelectRef.current) {
-          childSelectRef.current.focus();
-        }
-      }, 50);
-    } else {
-      setChildOptionsList([]);
     }
   };
 
@@ -106,15 +93,13 @@ const ResearchDomainCascadingDropdown: React.FC<CascadingDropdownProps> = ({ pro
           statusRef.current.textContent = '';
         }
       }
-    } else {
-      setChildOptionsList([]);
     }
   }, [myChildDomains]);
 
   useEffect(() => {
     const handleResearchDomains = async () => {
-      if (myResearchDomains) {
-        const researchDomains = (myResearchDomains?.topLevelResearchDomains || [])
+      if (myResearchDomains && myResearchDomains.topLevelResearchDomains) {
+        const researchDomains = (myResearchDomains?.topLevelResearchDomains)
           .filter((domain) => domain !== null)
           .map((domain) => ({
             id: domain.id?.toString() ?? '',
@@ -142,9 +127,6 @@ const ResearchDomainCascadingDropdown: React.FC<CascadingDropdownProps> = ({ pro
     }
   }, [projectData]);
 
-  // Disable child dropdown if no parent is selected or no child options are available
-  const isChildDisabled = Boolean(selectedParent === '' || childOptionsList.length === 0);
-
   return (
     <div className="cascading-dropdown">
       <div className="form-group">
@@ -157,7 +139,7 @@ const ResearchDomainCascadingDropdown: React.FC<CascadingDropdownProps> = ({ pro
           selectedKey={selectedParent}
           placeholder={ProjectDetail('placeholder.selectDomain')}
         >
-          {rDomains && rDomains.map((domain) => {
+          {rDomains.map((domain) => {
             return (
               <ListBoxItem key={domain.id} textValue={String(domain.id)}>{domain.id}</ListBoxItem>
             )
@@ -166,35 +148,33 @@ const ResearchDomainCascadingDropdown: React.FC<CascadingDropdownProps> = ({ pro
         </FormSelect>
       </div>
 
-      <div className="form-group">
-        <FormSelect
-          label={(selectedParent && myResearchDomains?.topLevelResearchDomains) ? ProjectDetail('labels.childDomain', { name: selectedParentDomain?.description || '' }) : ProjectDetail('labels.item')}
-          isDisabled={isChildDisabled}
-          name="childDomain"
-          items={childOptionsList}
-          selectClasses={styles.researchDomainSelect}
-          onChange={selected => handleChildChange(selected as string)}
-          helpMessage={(selectedParent || selectedChild) ? getSelectionText() : ''}
-          selectedKey={selectedChild}
-          aria-labelledby="child-label"
-          aria-invalid={isChildDisabled}
-          isRequired={true}
-          ref={childSelectRef}
-          placeholder={ProjectDetail('placeholder.selectSubDomain')}
-        >
-          <option value="">
-            {isChildDisabled
-              ? ProjectDetail('helpText.selectResearchDomain')
-              : ProjectDetail('labels.childDomain', { name: selectedParentDomain?.description || '' })}
-          </option>
-          {childOptionsList && childOptionsList.map((option) => {
-            return (
-              <ListBoxItem key={option.id} textValue={option.name}>{option.name}</ListBoxItem>
-            )
+      {(selectedParent && myResearchDomains?.topLevelResearchDomains) && (
+        <div className="form-group">
+          <FormSelect
+            label={ProjectDetail('labels.childDomain', { name: selectedParentDomain?.description || '' })}
+            name="childDomain"
+            items={childOptionsList}
+            selectClasses={styles.researchDomainSelect}
+            onChange={selected => handleChildChange(selected as string)}
+            helpMessage={getSelectionText()}
+            selectedKey={selectedChild}
+            aria-labelledby="child-label"
+            placeholder={ProjectDetail('placeholder.selectSubDomain')}
+            data-testid="subdomain-select"
+          >
+            <option value="">
+              {ProjectDetail('labels.childDomain', { name: selectedParentDomain?.description || '' })}
+            </option>
+            {childOptionsList && childOptionsList.map((option) => {
+              return (
+                <ListBoxItem key={option.id} textValue={option.name}>{option.name}</ListBoxItem>
+              )
+
+            })}
+          </FormSelect>
+        </div>
+      )}
 
-          })}
-        </FormSelect>
-      </div>
 
       {/* Live region to announce changes */}
       <div
diff --git a/components/SafeHtml/__tests__/SafeHtml.spec.tsx b/components/SafeHtml/__tests__/SafeHtml.spec.tsx
new file mode 100644
index 000000000..b27ea3f3d
--- /dev/null
+++ b/components/SafeHtml/__tests__/SafeHtml.spec.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+
+// Mock DOMPurify to make sanitize deterministic and spyable
+jest.mock('dompurify', () => {
+  const sanitize = jest.fn((input: string) => input);
+  return {
+    __esModule: true,
+    default: { sanitize },
+  };
+});
+
+import DOMPurify from 'dompurify';
+import { SafeHtml } from '@/components/SafeHtml';
+
+describe('SafeHtml', () => {
+  beforeEach(() => {
+    // Reset mock call counts and behavior before each test
+    (DOMPurify as unknown as { sanitize: jest.Mock }).sanitize.mockClear();
+  });
+
+  it('should return null when html is null', () => {
+    const { container } = render(<SafeHtml html={null} />);
+    expect(container.firstChild).toBeNull();
+    expect((DOMPurify as unknown as { sanitize: jest.Mock }).sanitize).not.toHaveBeenCalled();
+  });
+
+  it('should return null when sanitized is empty or whitespace', () => {
+    const sanitizeMock = (DOMPurify as unknown as { sanitize: jest.Mock }).sanitize;
+    // Return only whitespace to trigger the trim-empty check
+    sanitizeMock.mockImplementationOnce(() => '   ');
+
+    const { container } = render(<SafeHtml html={'   '} />);
+    expect(container.firstChild).toBeNull();
+    expect(sanitizeMock).toHaveBeenCalledWith('   ');
+  });
+
+  it('should wrap plain text in a <p> by default when wrapPlainText is true', () => {
+    render(<SafeHtml html="Hello world" className="my-class" />);
+    const el = screen.getByText('Hello world');
+    expect(el.tagName).toBe('P');
+    expect(el).toHaveClass('my-class');
+    expect((DOMPurify as unknown as { sanitize: jest.Mock }).sanitize).toHaveBeenCalledWith('Hello world');
+  });
+
+  it('should wrap plain text using the custom plainTextWrapper', () => {
+    render(
+      <SafeHtml html="Plain" plainTextWrapper="span" className="plain-span" />
+    );
+    const el = screen.getByText('Plain');
+    expect(el.tagName).toBe('SPAN');
+    expect(el).toHaveClass('plain-span');
+  });
+
+  it('should render plain text inside the `as` wrapper when wrapPlainText is false', () => {
+    render(
+      <SafeHtml html="No wrap" wrapPlainText={false} as="span" className="no-wrap" />
+    );
+    const el = screen.getByText('No wrap');
+    expect(el.tagName).toBe('SPAN');
+    expect(el).toHaveClass('no-wrap');
+  });
+
+  it('should render sanitized HTML inside a div by default', () => {
+    const { container } = render(<SafeHtml html="<em>Hi</em>" className="html" />);
+    const wrapper = container.querySelector('div.html');
+    expect(wrapper).toBeTruthy();
+    expect(wrapper?.querySelector('em')?.textContent).toBe('Hi');
+  });
+
+  it('should use the provided `as` wrapper for HTML content', () => {
+    const { container } = render(
+      <SafeHtml html="<strong>Bold</strong>" as="section" className="wrap" />
+    );
+    const wrapper = container.querySelector('section.wrap');
+    expect(wrapper).toBeTruthy();
+    expect(wrapper?.querySelector('strong')?.textContent).toBe('Bold');
+  });
+
+  it('should invoke DOMPurify.sanitize with the provided html', () => {
+    const sanitizeMock = (DOMPurify as unknown as { sanitize: jest.Mock }).sanitize;
+    render(<SafeHtml html="<a href='#'>Link</a>" />);
+    expect(sanitizeMock).toHaveBeenCalledTimes(1);
+    expect(sanitizeMock).toHaveBeenCalledWith("<a href='#'>Link</a>");
+  });
+});
diff --git a/components/SafeHtml/index.tsx b/components/SafeHtml/index.tsx
new file mode 100644
index 000000000..f363a0038
--- /dev/null
+++ b/components/SafeHtml/index.tsx
@@ -0,0 +1,48 @@
+"use client";
+
+import React from "react";
+import DOMPurify from "dompurify";
+
+export type SafeHtmlProps = {
+  html: string | null | undefined;
+  className?: string;
+  as?: keyof JSX.IntrinsicElements; // wrapper element for HTML content (when HTML tags exist)
+  wrapPlainText?: boolean; // wrap plain strings (no tags) in a block element
+  plainTextWrapper?: keyof JSX.IntrinsicElements; // which element to wrap plain text with
+};
+
+/**
+ * SafeHtml
+ * Renders sanitized HTML. If the string contains no HTML tags and wrapPlainText is true,
+ * it wraps the content in a plainTextWrapper (defaults to <p>).</n*>
+ * Note: This is a client component because it uses DOMPurify.
+ */
+export const SafeHtml: React.FC<SafeHtmlProps> = ({
+  html,
+  className,
+  as = "div",
+  wrapPlainText = true,
+  plainTextWrapper = "p",
+}) => {
+  if (!html) return null;
+
+  const sanitized = DOMPurify.sanitize(html);
+  if (!sanitized || sanitized.trim() === "") return null;
+
+  const containsTag = /<[^>]+>/i.test(sanitized);
+
+  if (!containsTag && wrapPlainText) {
+    const PlainWrapper = (plainTextWrapper || "p") as keyof JSX.IntrinsicElements;
+    // Using React.createElement to keep typing simple for dynamic tag
+    return React.createElement(PlainWrapper, { className }, sanitized);
+  }
+
+  const Wrapper = (as || "div") as keyof JSX.IntrinsicElements;
+  // Using React.createElement to support dynamic wrapper element
+  return React.createElement(Wrapper, {
+    className,
+    dangerouslySetInnerHTML: { __html: sanitized },
+  });
+};
+
+export default SafeHtml;
diff --git a/components/SectionEditContainer/index.tsx b/components/SectionEditContainer/index.tsx
index 3745829a7..9152a498f 100644
--- a/components/SectionEditContainer/index.tsx
+++ b/components/SectionEditContainer/index.tsx
@@ -4,7 +4,6 @@ import { useRouter } from 'next/navigation';
 
 import {
   useSectionQuery,
-  Section,
   Question,
 } from '@/generated/graphql';
 import { useToast } from '@/context/ToastContext';
@@ -216,7 +215,7 @@ const SectionEditContainer: React.FC<SectionEditContainerProps> = ({
   if (loading) return <div>Loading section...</div>;
   if (error || !data?.section) return <div>{t('messages.errors.failedToLoadSection')}</div>;
 
-  const section: Section = data.section;
+  const section = data.section!;
 
   return (
     <div role="list" aria-label="Questions list" style={{ marginBottom: '40px' }}>
diff --git a/components/SelectExistingTemplate/index.tsx b/components/SelectExistingTemplate/index.tsx
index a288b761a..472a12f0b 100644
--- a/components/SelectExistingTemplate/index.tsx
+++ b/components/SelectExistingTemplate/index.tsx
@@ -32,8 +32,6 @@ import {
   VersionedTemplateSearchResult,
 } from '@/generated/graphql';
 
-// Hooks
-import { useScrollToTop } from '@/hooks/scrollToTop';
 // Other
 import { logECS, routePath } from '@/utils/index';
 import {
@@ -63,7 +61,6 @@ const TemplateSelectTemplatePage = ({ templateName }: { templateName: string })
   const topRef = useRef<HTMLDivElement>(null);
   const formatDate = useFormatDate();
   const router = useRouter();
-  const { scrollToTop } = useScrollToTop();
   const toastState = useToast();
 
   // State
@@ -165,7 +162,6 @@ const TemplateSelectTemplatePage = ({ templateName }: { templateName: string })
   const resetSearch = () => {
     setSearchTerm('');
     handleSearchInput('');
-    scrollToTop(topRef);
   }
 
 
diff --git a/components/TinyMCEEditor/EditorSkeleton.tsx b/components/TinyMCEEditor/EditorSkeleton.tsx
new file mode 100644
index 000000000..569443f85
--- /dev/null
+++ b/components/TinyMCEEditor/EditorSkeleton.tsx
@@ -0,0 +1,32 @@
+import styles from './editorSkeleton.module.scss';
+
+const EditorSkeleton = () => {
+  return (
+    <div
+      className={styles['editor-skeleton']}
+      role="status"
+      aria-label="Editor loading"
+    >
+      {/* Toolbar skeleton */}
+      <div className={styles['skeleton-toolbar']}>
+        {[...Array(8)].map((_, i) => (
+          <div
+            key={i}
+            className={`${styles['skeleton-block']} ${i === 0 ? styles['skeleton-block-wide'] : ''}`}
+          />
+        ))}
+      </div>
+      {/* Content area skeleton */}
+      <div className={styles['skeleton-content']}>
+        {[...Array(3)].map((_, i) => (
+          <div
+            key={i}
+            className={`${styles['skeleton-line']} ${i === 2 ? styles['skeleton-line-short'] : ''}`}
+          />
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export default EditorSkeleton;
diff --git a/components/TinyMCEEditor/editorSkeleton.module.scss b/components/TinyMCEEditor/editorSkeleton.module.scss
new file mode 100644
index 000000000..95abea191
--- /dev/null
+++ b/components/TinyMCEEditor/editorSkeleton.module.scss
@@ -0,0 +1,54 @@
+@keyframes pulse {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.5;
+  }
+}
+
+.editor-skeleton {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  min-height: 150px;
+  background-color: #fff;
+}
+
+.skeleton-toolbar {
+  height: 39px;
+  border-bottom: 1px solid #ccc;
+  background-color: #f5f5f5;
+  padding: 8px;
+  display: flex;
+  gap: 4px;
+  align-items: center;
+}
+
+.skeleton-block {
+  width: 30px;
+  height: 24px;
+  background-color: #e0e0e0;
+  border-radius: 2px;
+  animation: pulse 1.5s ease-in-out infinite;
+}
+
+.skeleton-block-wide {
+  width: 80px;
+}
+
+.skeleton-content {
+  padding: 12px;
+}
+
+.skeleton-line {
+  height: 12px;
+  background-color: #e0e0e0;
+  border-radius: 2px;
+  margin-bottom: 8px;
+  width: 100%;
+  animation: pulse 1.5s ease-in-out infinite;
+}
+
+.skeleton-line-short {
+  width: 60%;
+}
diff --git a/components/TinyMCEEditor/index.tsx b/components/TinyMCEEditor/index.tsx
index 4df6223eb..872b1dfba 100644
--- a/components/TinyMCEEditor/index.tsx
+++ b/components/TinyMCEEditor/index.tsx
@@ -3,6 +3,8 @@
 import { useEffect, useRef, useState } from 'react';
 import type { Editor as TinyMCEEditorType } from 'tinymce';
 import { loadTinymceScript } from '@/utils/loadTinyMCE';
+import EditorSkeleton from './EditorSkeleton';
+import { createEditorConfig } from './tinyMCEConfig';
 import styles from './tinyMCEEditor.module.scss';
 
 // We need to reference "window.tinymce" but TypeScript doesn't know about it.
@@ -36,52 +38,16 @@ const TinyMCEEditor = ({ content, setContent, onChange, error, id, labelId, help
       await loadTinymceScript();
 
       // Make sure previous instance is removed
-      window.tinymce.remove(`#${elementId}`);
+      if (window.tinymce) {
+        window.tinymce.remove(`#${elementId}`);
+      }
 
-      // Initialize new editor
+      // Create configuration using shared config
+      const editorConfig = createEditorConfig(elementId, content, setContent, onChange);
+
+      // Initialize new editor with callback to set ref and ready state
       window.tinymce.init({
-        license_key: 'gpl',
-        promotion: false,// Removes TinyMCE promotional link
-        branding: false, // removed the tinyMCE branding
-        statusbar: false, //removes the bottom status bar
-        link_title: false, // Disable automatic link title generation in Insert Link window
-        selector: `#${elementId}`,
-        base_url: '/tinymce', // Base URL for TinyMCE assets
-        suffix: '.min', // Use the minified version
-        menubar: false,
-        max_height: 400,
-        min_height: 100,
-        popup_container: 'body',
-        plugins: [
-          'autoresize',
-          'table',
-          'lists',
-          'link'
-        ],
-        toolbar: 'formatselect | bold italic forecolor backcolor | ' +
-          'alignleft aligncenter alignright | ' +
-          'bullist numlist | ' +
-          'link unlink | table',
-        default_link_target: '_blank',
-        link_target_list: [
-          { title: 'New window', value: '_blank' },
-          { title: 'Current window', value: '_self' },
-        ],
-        content_style: `
-          @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;600&display=swap');
-          body { font-family: "Poppins", sans-serif; color:#393939;};
-          `,
-        setup: (editor: TinyMCEEditorType) => {
-          editor.on('Change KeyUp Input Blur', () => {
-            setContent(editor.getContent());
-            onChange?.();
-            // Close all remaining open menus when content changes. 
-            const openMenus = document.querySelectorAll('.tox-pop, .tox-menu, .tox-toolbar__overflow');
-            openMenus.forEach(menu => {
-              (menu as HTMLElement).style.display = 'none';
-            });
-          });
-        },
+        ...editorConfig,
         init_instance_callback: (editor: TinyMCEEditorType) => {
           editorRef.current = editor;
           editor.setContent(content);
@@ -112,16 +78,19 @@ const TinyMCEEditor = ({ content, setContent, onChange, error, id, labelId, help
 
   return (
     <div className={styles['tinyMCE-editor-container']}>
-      <textarea
-        id={elementId}
-        className={elementId}
-        aria-label={id ?? 'Editor input area'}
-        aria-labelledby={labelId ?? ''}
-        aria-describedby={helpText ? `${elementId}-help-text` : ''}
-        aria-invalid={error ? 'true' : 'false'}
-        style={{ visibility: 'hidden' }
-        }
-      />
+      {!isEditorReady && <EditorSkeleton />}
+      <div style={{ display: isEditorReady ? 'block' : 'none' }}>
+        <textarea
+          id={elementId}
+          className={elementId}
+          aria-label={id ?? 'Editor input area'}
+          aria-labelledby={labelId ?? ''}
+          aria-describedby={helpText ? `${elementId}-help-text` : ''}
+          aria-invalid={error ? 'true' : 'false'}
+          style={{ visibility: 'hidden' }
+          }
+        />
+      </div>
       {error && <div className={`${styles['editor-help-text']} error-message`}>{error}</div>}
       {helpText && <div className={`${styles['editor-help-text']} help-text`}>{helpText}</div>}
     </div >
diff --git a/components/TinyMCEEditor/tinyMCEConfig.ts b/components/TinyMCEEditor/tinyMCEConfig.ts
new file mode 100644
index 000000000..13bc3a2d2
--- /dev/null
+++ b/components/TinyMCEEditor/tinyMCEConfig.ts
@@ -0,0 +1,62 @@
+// utils/tinymceConfig.ts
+import type { Editor as TinyMCEEditorType } from 'tinymce';
+
+// Base configuration that's shared across all editors
+export const BASE_TINYMCE_CONFIG = {
+  license_key: 'gpl',
+  promotion: false,
+  branding: false,
+  statusbar: false,
+  link_title: false,
+  base_url: '/tinymce',
+  suffix: '.min',
+  menubar: false,
+  max_height: 400,
+  min_height: 100,
+  popup_container: 'body',
+  plugins: [
+    'autoresize',
+    'table',
+    'lists',
+    'link'
+  ],
+  toolbar: 'formatselect | bold italic forecolor backcolor | ' +
+    'alignleft aligncenter alignright | ' +
+    'bullist numlist | ' +
+    'link unlink | table',
+  default_link_target: '_blank',
+  link_target_list: [
+    { title: 'New window', value: '_blank' },
+    { title: 'Current window', value: '_self' },
+  ],
+  content_style: `
+    @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;600&display=swap');
+    body { font-family: "Poppins", sans-serif; color:#393939;};
+  `,
+};
+
+// Helper function to create editor-specific config
+export const createEditorConfig = (
+  elementId: string,
+  content: string,
+  setContent: (content: string) => void,
+  onChange?: () => void
+) => ({
+  ...BASE_TINYMCE_CONFIG,
+  selector: `#${elementId}`,
+  setup: (editor: TinyMCEEditorType) => {
+    editor.on('Change KeyUp Input Blur', () => {
+      setContent(editor.getContent());
+      onChange?.();
+
+      // Close all remaining open menus when content changes
+      const openMenus = document.querySelectorAll('.tox-pop, .tox-menu, .tox-toolbar__overflow');
+      openMenus.forEach(menu => {
+        (menu as HTMLElement).style.display = 'none';
+      });
+    });
+  },
+  init_instance_callback: (editor: TinyMCEEditorType) => {
+    editor.setContent(content);
+  }
+});
\ No newline at end of file
diff --git a/generated/graphql.tsx b/generated/graphql.tsx
index ebabced05..baa19cacc 100644
--- a/generated/graphql.tsx
+++ b/generated/graphql.tsx
@@ -24,15 +24,29 @@ export type Scalars = {
   URL: { input: any; output: any; }
 };
 
-/** The status of the funding */
-export enum AccessLevel {
-  /** Access requests must be reviewed and then permitted */
-  Controlled = 'CONTROLLED',
-  /** Any other type of access level */
-  Other = 'OTHER',
-  /** Access to the output will be public/open */
-  Unrestricted = 'UNRESTRICTED'
-}
+/** Input for adding a new GuidanceGroup */
+export type AddGuidanceGroupInput = {
+  /** The affiliation (organization ror) that owns this GuidanceGroup. Optional: super-admins may set this; regular admins should omit it (their own affiliation will be used). */
+  affiliationId?: InputMaybe<Scalars['String']['input']>;
+  /** Whether this is a best practice GuidanceGroup */
+  bestPractice?: InputMaybe<Scalars['Boolean']['input']>;
+  /** The description of the GuidanceGroup */
+  description?: InputMaybe<Scalars['String']['input']>;
+  /** The name of the GuidanceGroup */
+  name: Scalars['String']['input'];
+  /** Whether this is an optional subset for departmental use */
+  optionalSubset?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+/** Input for adding a new Guidance item */
+export type AddGuidanceInput = {
+  /** The GuidanceGroup this Guidance belongs to */
+  guidanceGroupId: Scalars['Int']['input'];
+  /** The guidance text content */
+  guidanceText?: InputMaybe<Scalars['String']['input']>;
+  /** The Tags associated with this Guidance */
+  tagId?: InputMaybe<Scalars['Int']['input']>;
+};
 
 export type AddMetadataStandardInput = {
   /** A description of the metadata standard */
@@ -81,31 +95,6 @@ export type AddProjectMemberInput = {
   surName?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type AddProjectOutputInput = {
-  /** The date the output is expected to be deposited (YYYY-MM-DD format) */
-  anticipatedReleaseDate?: InputMaybe<Scalars['String']['input']>;
-  /** A description of the output */
-  description?: InputMaybe<Scalars['String']['input']>;
-  /** The initial access level that will be allowed for the output */
-  initialAccessLevel?: InputMaybe<Scalars['String']['input']>;
-  /** The initial license that will apply to the output */
-  initialLicenseId?: InputMaybe<Scalars['Int']['input']>;
-  /** Whether or not the output may contain personally identifying information (PII) */
-  mayContainPII?: InputMaybe<Scalars['Boolean']['input']>;
-  /** Whether or not the output may contain sensitive data */
-  mayContainSensitiveInformation?: InputMaybe<Scalars['Boolean']['input']>;
-  /** The metadata standards that will be used to describe the output */
-  metadataStandardIds?: InputMaybe<Array<Scalars['Int']['input']>>;
-  /** The type of output */
-  outputTypeId: Scalars['Int']['input'];
-  /** The id of the project you are adding the output to */
-  projectId: Scalars['Int']['input'];
-  /** The repositories the output will be deposited in */
-  respositoryIds?: InputMaybe<Array<Scalars['Int']['input']>>;
-  /** The title/name of the output */
-  title: Scalars['String']['input'];
-};
-
 /** Input for adding a new QuestionCondition */
 export type AddQuestionConditionInput = {
   /** The action to take on a QuestionCondition */
@@ -246,6 +235,7 @@ export type Affiliation = {
   funder: Scalars['Boolean']['output'];
   /** The Crossref Funder id */
   fundrefId?: Maybe<Scalars['String']['output']>;
+  guidanceGroups?: Maybe<Array<GuidanceGroup>>;
   /** The official homepage for the affiliation */
   homepage?: Maybe<Scalars['String']['output']>;
   /** The unique identifer for the affiliation (assigned by the Database) */
@@ -721,6 +711,95 @@ export type FunderPopularityResult = {
   uri: Scalars['String']['output'];
 };
 
+/** A Guidance item contains guidance text and associated tag id */
+export type Guidance = {
+  __typename?: 'Guidance';
+  /** The timestamp when the Object was created */
+  created?: Maybe<Scalars['String']['output']>;
+  /** The user who created the Object */
+  createdById?: Maybe<Scalars['Int']['output']>;
+  /** Errors associated with the Object */
+  errors?: Maybe<GuidanceErrors>;
+  /** The GuidanceGroup this Guidance belongs to */
+  guidanceGroup?: Maybe<GuidanceGroup>;
+  /** The GuidanceGroup this Guidance belongs to */
+  guidanceGroupId: Scalars['Int']['output'];
+  /** The guidance text content */
+  guidanceText?: Maybe<Scalars['String']['output']>;
+  /** The unique identifier for the Object */
+  id?: Maybe<Scalars['Int']['output']>;
+  /** The timestamp when the Object was last modified */
+  modified?: Maybe<Scalars['String']['output']>;
+  /** User who modified the guidance last */
+  modifiedBy?: Maybe<User>;
+  /** The user who last modified the Object */
+  modifiedById?: Maybe<Scalars['Int']['output']>;
+  /** The Tag associated with the guidance */
+  tag?: Maybe<Tag>;
+  /** The tag id associated with this Guidance */
+  tagId?: Maybe<Scalars['Int']['output']>;
+};
+
+/** A collection of errors related to Guidance */
+export type GuidanceErrors = {
+  __typename?: 'GuidanceErrors';
+  /** General error messages such as the object already exists */
+  general?: Maybe<Scalars['String']['output']>;
+  guidanceGroupId?: Maybe<Scalars['String']['output']>;
+  guidanceText?: Maybe<Scalars['String']['output']>;
+  tagId?: Maybe<Scalars['String']['output']>;
+};
+
+/** A GuidanceGroup contains a collection of Guidance items for an organization */
+export type GuidanceGroup = {
+  __typename?: 'GuidanceGroup';
+  /** The affiliation (organization) that owns this GuidanceGroup */
+  affiliationId: Scalars['String']['output'];
+  /** Whether this is a best practice GuidanceGroup */
+  bestPractice: Scalars['Boolean']['output'];
+  /** The timestamp when the Object was created */
+  created?: Maybe<Scalars['String']['output']>;
+  /** The user who created the Object */
+  createdById?: Maybe<Scalars['Int']['output']>;
+  /** The description of the GuidanceGroup */
+  description?: Maybe<Scalars['String']['output']>;
+  /** Errors associated with the Object */
+  errors?: Maybe<GuidanceGroupErrors>;
+  /** The Guidance items in this group */
+  guidance?: Maybe<Array<Guidance>>;
+  /** The unique identifier for the Object */
+  id?: Maybe<Scalars['Int']['output']>;
+  /** Whether this GuidanceGroup has been modified since last publish */
+  isDirty: Scalars['Boolean']['output'];
+  /** The date when this was last published */
+  latestPublishedDate?: Maybe<Scalars['String']['output']>;
+  /** The version identifier of the latest published version */
+  latestPublishedVersion?: Maybe<Scalars['String']['output']>;
+  /** The timestamp when the Object was last modified */
+  modified?: Maybe<Scalars['String']['output']>;
+  /** User who modified the guidance group last */
+  modifiedBy?: Maybe<User>;
+  /** The user who last modified the Object */
+  modifiedById?: Maybe<Scalars['Int']['output']>;
+  /** The name of the GuidanceGroup */
+  name: Scalars['String']['output'];
+  /** Whether this is an optional subset for departmental use */
+  optionalSubset: Scalars['Boolean']['output'];
+  /** VersionedGuidanceGroups associated with this GuidanceGroup */
+  versionedGuidanceGroup?: Maybe<Array<Maybe<VersionedGuidanceGroup>>>;
+};
+
+/** A collection of errors related to the GuidanceGroup */
+export type GuidanceGroupErrors = {
+  __typename?: 'GuidanceGroupErrors';
+  affiliationId?: Maybe<Scalars['String']['output']>;
+  bestPractice?: Maybe<Scalars['String']['output']>;
+  description?: Maybe<Scalars['String']['output']>;
+  /** General error messages such as the object already exists */
+  general?: Maybe<Scalars['String']['output']>;
+  name?: Maybe<Scalars['String']['output']>;
+};
+
 /** Output type for the initializePlanVersion mutation */
 export type InitializePlanVersionOutput = {
   __typename?: 'InitializePlanVersionOutput';
@@ -936,6 +1015,10 @@ export type Mutation = {
   addAnswerComment?: Maybe<AnswerComment>;
   /** Add feedback comment for an answer within a round of feedback */
   addFeedbackComment?: Maybe<PlanFeedbackComment>;
+  /** Create a new Guidance item */
+  addGuidance: Guidance;
+  /** Create a new GuidanceGroup */
+  addGuidanceGroup: GuidanceGroup;
   /** Add a new License (don't make the URI up! should resolve to an taxonomy HTML/JSON representation of the object) */
   addLicense?: Maybe<License>;
   /** Add a new member role (URL and label must be unique!) */
@@ -956,8 +1039,6 @@ export type Mutation = {
   addProjectFunding?: Maybe<ProjectFunding>;
   /** Add a Member to a research project */
   addProjectMember?: Maybe<ProjectMember>;
-  /** Add an output to a research project */
-  addProjectOutput?: Maybe<ProjectOutput>;
   /** Create a new Question */
   addQuestion: Question;
   /** Create a new QuestionCondition associated with a question */
@@ -966,6 +1047,8 @@ export type Mutation = {
   addRelatedWork?: Maybe<RelatedWorkSearchResult>;
   /** Add a new Repository */
   addRepository?: Maybe<Repository>;
+  /** Add a new research output type (name must be unique!) */
+  addResearchOutputType?: Maybe<ResearchOutputType>;
   /** Create a new Section. Leave the 'copyFromVersionedSectionId' blank to create a new section from scratch */
   addSection: Section;
   /** Add a new tag to available list of tags */
@@ -998,6 +1081,8 @@ export type Mutation = {
   mergeUsers?: Maybe<User>;
   /** Import a project from an external source */
   projectImport?: Maybe<Project>;
+  /** Publish a GuidanceGroup (creates a VersionedGuidanceGroup snapshot) */
+  publishGuidanceGroup: GuidanceGroup;
   /** Publish a plan (changes status to PUBLISHED) */
   publishPlan?: Maybe<Plan>;
   /** Delete an Affiliation (only applicable to AffiliationProvenance == DMPTOOL) */
@@ -1006,6 +1091,10 @@ export type Mutation = {
   removeAnswerComment?: Maybe<AnswerComment>;
   /** Remove feedback comment for an answer within a round of feedback */
   removeFeedbackComment?: Maybe<PlanFeedbackComment>;
+  /** Delete a Guidance item */
+  removeGuidance: Guidance;
+  /** Delete a GuidanceGroup */
+  removeGuidanceGroup: GuidanceGroup;
   /** Delete a License */
   removeLicense?: Maybe<License>;
   /** Delete the member role */
@@ -1022,16 +1111,14 @@ export type Mutation = {
   removeProjectFunding?: Maybe<ProjectFunding>;
   /** Remove a research project Member */
   removeProjectMember?: Maybe<ProjectMember>;
-  /** Remove a research project output */
-  removeProjectOutput?: Maybe<ProjectOutput>;
-  /** Remove an Output from a Plan */
-  removeProjectOutputFromPlan?: Maybe<ProjectOutput>;
   /** Delete a Question */
   removeQuestion?: Maybe<Question>;
   /** Remove a QuestionCondition using a specific QuestionCondition id */
   removeQuestionCondition?: Maybe<QuestionCondition>;
   /** Delete a Repository */
   removeRepository?: Maybe<Repository>;
+  /** Delete the research output type */
+  removeResearchOutputType?: Maybe<ResearchOutputType>;
   /** Delete a section */
   removeSection: Section;
   /** Delete a tag */
@@ -1046,14 +1133,14 @@ export type Mutation = {
   requestFeedback?: Maybe<PlanFeedback>;
   /** Resend an invite to a ProjectCollaborator */
   resendInviteToProjectCollaborator?: Maybe<ProjectCollaborator>;
-  /** Add an Output to a Plan */
-  selectProjectOutputForPlan?: Maybe<ProjectOutput>;
   /** Designate the email as the current user's primary email address */
   setPrimaryUserEmail?: Maybe<Array<Maybe<UserEmail>>>;
   /** Set the user's ORCID */
   setUserOrcid?: Maybe<User>;
   /** Initialize an PLanVersion record in the DynamoDB for all Plans that do not have one */
   superInitializePlanVersions: InitializePlanVersionOutput;
+  /** Unpublish a GuidanceGroup (sets active flag to false on current version) */
+  unpublishGuidanceGroup: GuidanceGroup;
   /** Update an Affiliation */
   updateAffiliation?: Maybe<Affiliation>;
   /** Edit an answer */
@@ -1062,6 +1149,10 @@ export type Mutation = {
   updateAnswerComment?: Maybe<AnswerComment>;
   /** Update feedback comment for an answer within a round of feedback */
   updateFeedbackComment?: Maybe<PlanFeedbackComment>;
+  /** Update an existing Guidance item */
+  updateGuidance: Guidance;
+  /** Update an existing GuidanceGroup */
+  updateGuidanceGroup: GuidanceGroup;
   /** Update a License record */
   updateLicense?: Maybe<License>;
   /** Update the member role */
@@ -1086,8 +1177,6 @@ export type Mutation = {
   updateProjectFunding?: Maybe<ProjectFunding>;
   /** Update a Member on the research project */
   updateProjectMember?: Maybe<ProjectMember>;
-  /** Update an output on the research project */
-  updateProjectOutput?: Maybe<ProjectOutput>;
   /** Update a Question */
   updateQuestion: Question;
   /** Update a QuestionCondition for a specific QuestionCondition id */
@@ -1098,6 +1187,8 @@ export type Mutation = {
   updateRelatedWorkStatus?: Maybe<RelatedWorkSearchResult>;
   /** Update a Repository record */
   updateRepository?: Maybe<Repository>;
+  /** Update the research output type */
+  updateResearchOutputType?: Maybe<ResearchOutputType>;
   /** Update a Section */
   updateSection: Section;
   /** Change the section's display order */
@@ -1147,6 +1238,16 @@ export type MutationAddFeedbackCommentArgs = {
 };
 
 
+export type MutationAddGuidanceArgs = {
+  input: AddGuidanceInput;
+};
+
+
+export type MutationAddGuidanceGroupArgs = {
+  input: AddGuidanceGroupInput;
+};
+
+
 export type MutationAddLicenseArgs = {
   description?: InputMaybe<Scalars['String']['input']>;
   name: Scalars['String']['input'];
@@ -1210,11 +1311,6 @@ export type MutationAddProjectMemberArgs = {
 };
 
 
-export type MutationAddProjectOutputArgs = {
-  input: AddProjectOutputInput;
-};
-
-
 export type MutationAddQuestionArgs = {
   input: AddQuestionInput;
 };
@@ -1235,6 +1331,12 @@ export type MutationAddRepositoryArgs = {
 };
 
 
+export type MutationAddResearchOutputTypeArgs = {
+  description?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+};
+
+
 export type MutationAddSectionArgs = {
   input: AddSectionInput;
 };
@@ -1328,6 +1430,11 @@ export type MutationProjectImportArgs = {
 };
 
 
+export type MutationPublishGuidanceGroupArgs = {
+  guidanceGroupId: Scalars['Int']['input'];
+};
+
+
 export type MutationPublishPlanArgs = {
   planId: Scalars['Int']['input'];
   visibility?: InputMaybe<PlanVisibility>;
@@ -1351,6 +1458,16 @@ export type MutationRemoveFeedbackCommentArgs = {
 };
 
 
+export type MutationRemoveGuidanceArgs = {
+  guidanceId: Scalars['Int']['input'];
+};
+
+
+export type MutationRemoveGuidanceGroupArgs = {
+  guidanceGroupId: Scalars['Int']['input'];
+};
+
+
 export type MutationRemoveLicenseArgs = {
   uri: Scalars['String']['input'];
 };
@@ -1391,17 +1508,6 @@ export type MutationRemoveProjectMemberArgs = {
 };
 
 
-export type MutationRemoveProjectOutputArgs = {
-  projectOutputId: Scalars['Int']['input'];
-};
-
-
-export type MutationRemoveProjectOutputFromPlanArgs = {
-  planId: Scalars['Int']['input'];
-  projectOutputId: Scalars['Int']['input'];
-};
-
-
 export type MutationRemoveQuestionArgs = {
   questionId: Scalars['Int']['input'];
 };
@@ -1417,6 +1523,11 @@ export type MutationRemoveRepositoryArgs = {
 };
 
 
+export type MutationRemoveResearchOutputTypeArgs = {
+  id: Scalars['Int']['input'];
+};
+
+
 export type MutationRemoveSectionArgs = {
   sectionId: Scalars['Int']['input'];
 };
@@ -1448,12 +1559,6 @@ export type MutationResendInviteToProjectCollaboratorArgs = {
 };
 
 
-export type MutationSelectProjectOutputForPlanArgs = {
-  planId: Scalars['Int']['input'];
-  projectOutputId: Scalars['Int']['input'];
-};
-
-
 export type MutationSetPrimaryUserEmailArgs = {
   email: Scalars['String']['input'];
 };
@@ -1464,6 +1569,11 @@ export type MutationSetUserOrcidArgs = {
 };
 
 
+export type MutationUnpublishGuidanceGroupArgs = {
+  guidanceGroupId: Scalars['Int']['input'];
+};
+
+
 export type MutationUpdateAffiliationArgs = {
   input: AffiliationInput;
 };
@@ -1489,6 +1599,16 @@ export type MutationUpdateFeedbackCommentArgs = {
 };
 
 
+export type MutationUpdateGuidanceArgs = {
+  input: UpdateGuidanceInput;
+};
+
+
+export type MutationUpdateGuidanceGroupArgs = {
+  input: UpdateGuidanceGroupInput;
+};
+
+
 export type MutationUpdateLicenseArgs = {
   description?: InputMaybe<Scalars['String']['input']>;
   name: Scalars['String']['input'];
@@ -1565,11 +1685,6 @@ export type MutationUpdateProjectMemberArgs = {
 };
 
 
-export type MutationUpdateProjectOutputArgs = {
-  input: UpdateProjectOutputInput;
-};
-
-
 export type MutationUpdateQuestionArgs = {
   input: UpdateQuestionInput;
 };
@@ -1596,6 +1711,13 @@ export type MutationUpdateRepositoryArgs = {
 };
 
 
+export type MutationUpdateResearchOutputTypeArgs = {
+  description?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['Int']['input'];
+  name: Scalars['String']['input'];
+};
+
+
 export type MutationUpdateSectionArgs = {
   input: UpdateSectionInput;
 };
@@ -1637,39 +1759,6 @@ export type MutationUploadPlanArgs = {
   projectId: Scalars['Int']['input'];
 };
 
-/** An output collected/produced during or as a result of a research project */
-export type OutputType = {
-  __typename?: 'OutputType';
-  /** The timestamp when the Object was created */
-  created?: Maybe<Scalars['String']['output']>;
-  /** The user who created the Object */
-  createdById?: Maybe<Scalars['Int']['output']>;
-  /** A description of the type of output to be collected/generated during the project */
-  description?: Maybe<Scalars['String']['output']>;
-  /** Errors associated with the Object */
-  errors?: Maybe<OutputTypeErrors>;
-  /** The unique identifer for the Object */
-  id?: Maybe<Scalars['Int']['output']>;
-  /** The timestamp when the Object was last modifed */
-  modified?: Maybe<Scalars['String']['output']>;
-  /** The user who last modified the Object */
-  modifiedById?: Maybe<Scalars['Int']['output']>;
-  /** The name of the output type */
-  name: Scalars['String']['output'];
-  /** The taxonomy URL of the output type */
-  uri: Scalars['String']['output'];
-};
-
-/** A collection of errors related to the OutputType */
-export type OutputTypeErrors = {
-  __typename?: 'OutputTypeErrors';
-  description?: Maybe<Scalars['String']['output']>;
-  /** General error messages such as the object already exists */
-  general?: Maybe<Scalars['String']['output']>;
-  name?: Maybe<Scalars['String']['output']>;
-  uri?: Maybe<Scalars['String']['output']>;
-};
-
 export type PaginatedQueryResults = {
   /** The sortFields that are available for this query (for standard offset pagination only!) */
   availableSortFields?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
@@ -1743,8 +1832,6 @@ export type Plan = {
   modified?: Maybe<Scalars['String']['output']>;
   /** The user who last modified the Object */
   modifiedById?: Maybe<Scalars['Int']['output']>;
-  /** Anticipated research outputs */
-  outputs?: Maybe<Array<PlanOutput>>;
   /** The progress the user has made within the plan */
   progress?: Maybe<PlanProgress>;
   /** The project the plan is associated with */
@@ -1869,6 +1956,12 @@ export type PlanFeedbackErrors = {
   summaryText?: Maybe<Scalars['String']['output']>;
 };
 
+export enum PlanFeedbackStatusEnum {
+  Completed = 'COMPLETED',
+  None = 'NONE',
+  Requested = 'REQUESTED'
+}
+
 /** Funding associated with a plan */
 export type PlanFunding = {
   __typename?: 'PlanFunding';
@@ -1939,29 +2032,6 @@ export type PlanMemberErrors = {
   projectMemberId?: Maybe<Scalars['String']['output']>;
 };
 
-export type PlanOutput = {
-  __typename?: 'PlanOutput';
-  /** The timestamp when the Object was created */
-  created?: Maybe<Scalars['String']['output']>;
-  /** The user who created the Object */
-  createdById?: Maybe<Scalars['Int']['output']>;
-  /** Errors associated with the Object */
-  errors?: Maybe<PlanOutputErrors>;
-  /** The unique identifer for the Object */
-  id?: Maybe<Scalars['Int']['output']>;
-  /** The timestamp when the Object was last modifed */
-  modified?: Maybe<Scalars['String']['output']>;
-  /** The user who last modified the Object */
-  modifiedById?: Maybe<Scalars['Int']['output']>;
-};
-
-/** A collection of errors related to the PlanOutput */
-export type PlanOutputErrors = {
-  __typename?: 'PlanOutputErrors';
-  /** General error messages such as the object already exists */
-  general?: Maybe<Scalars['String']['output']>;
-};
-
 export type PlanProgress = {
   __typename?: 'PlanProgress';
   /** The total number of questions the user has answered */
@@ -2013,6 +2083,8 @@ export type PlanSectionProgress = {
   answeredQuestions: Scalars['Int']['output'];
   /** The display order of the section */
   displayOrder: Scalars['Int']['output'];
+  /** Tags associated with the section */
+  tags?: Maybe<Array<Tag>>;
   /** The title of the section */
   title: Scalars['String']['output'];
   /** The number of questions in the section */
@@ -2077,8 +2149,6 @@ export type Project = {
   modified?: Maybe<Scalars['String']['output']>;
   /** The user who last modified the Object */
   modifiedById?: Maybe<Scalars['Int']['output']>;
-  /** The outputs that will be/were created as a reult of the research project */
-  outputs?: Maybe<Array<ProjectOutput>>;
   /** The plans that are associated with the research project */
   plans?: Maybe<Array<PlanSearchResult>>;
   /** The type of research being done */
@@ -2148,7 +2218,6 @@ export type ProjectErrors = {
   /** General error messages such as the object already exists */
   general?: Maybe<Scalars['String']['output']>;
   memberIds?: Maybe<Scalars['String']['output']>;
-  outputIds?: Maybe<Scalars['String']['output']>;
   researchDomainId?: Maybe<Scalars['String']['output']>;
   startDate?: Maybe<Scalars['String']['output']>;
   title?: Maybe<Scalars['String']['output']>;
@@ -2268,61 +2337,6 @@ export type ProjectMemberErrors = {
   surName?: Maybe<Scalars['String']['output']>;
 };
 
-/** Something produced/collected as part of (or as a result of) a research project */
-export type ProjectOutput = {
-  __typename?: 'ProjectOutput';
-  /** The date the output is expected to be deposited (YYYY-MM-DD format) */
-  anticipatedReleaseDate?: Maybe<Scalars['String']['output']>;
-  /** The timestamp when the Object was created */
-  created?: Maybe<Scalars['String']['output']>;
-  /** The user who created the Object */
-  createdById?: Maybe<Scalars['Int']['output']>;
-  /** A description of the output */
-  description?: Maybe<Scalars['String']['output']>;
-  /** Errors associated with the Object */
-  errors?: Maybe<ProjectOutputErrors>;
-  /** The unique identifer for the Object */
-  id?: Maybe<Scalars['Int']['output']>;
-  /** The initial access level that will be allowed for the output */
-  initialAccessLevel: AccessLevel;
-  /** The initial license that will apply to the output */
-  initialLicense?: Maybe<License>;
-  /** Whether or not the output may contain personally identifying information (PII) */
-  mayContainPII?: Maybe<Scalars['Boolean']['output']>;
-  /** Whether or not the output may contain sensitive data */
-  mayContainSensitiveInformation?: Maybe<Scalars['Boolean']['output']>;
-  /** The metadata standards that will be used to describe the output */
-  metadataStandards?: Maybe<Array<MetadataStandard>>;
-  /** The timestamp when the Object was last modifed */
-  modified?: Maybe<Scalars['String']['output']>;
-  /** The user who last modified the Object */
-  modifiedById?: Maybe<Scalars['Int']['output']>;
-  /** The type of output */
-  outputType?: Maybe<OutputType>;
-  /** The project associated with the output */
-  project?: Maybe<Project>;
-  /** The repositories the output will be deposited in */
-  repositories?: Maybe<Array<Repository>>;
-  /** The title/name of the output */
-  title: Scalars['String']['output'];
-};
-
-/** A collection of errors related to the ProjectOutput */
-export type ProjectOutputErrors = {
-  __typename?: 'ProjectOutputErrors';
-  anticipatedReleaseDate?: Maybe<Scalars['String']['output']>;
-  description?: Maybe<Scalars['String']['output']>;
-  /** General error messages such as the object already exists */
-  general?: Maybe<Scalars['String']['output']>;
-  initialAccessLevel?: Maybe<Scalars['String']['output']>;
-  initialLicenseId?: Maybe<Scalars['String']['output']>;
-  metadataStandardIds?: Maybe<Scalars['String']['output']>;
-  outputTypeId?: Maybe<Scalars['String']['output']>;
-  projectId?: Maybe<Scalars['String']['output']>;
-  repositoryIds?: Maybe<Scalars['String']['output']>;
-  title?: Maybe<Scalars['String']['output']>;
-};
-
 export type ProjectSearchResult = {
   __typename?: 'ProjectSearchResult';
   /** The research project abstract */
@@ -2448,18 +2462,32 @@ export type Query = {
   affiliationTypes?: Maybe<Array<Scalars['String']['output']>>;
   /** Perform a search for Affiliations matching the specified name */
   affiliations?: Maybe<AffiliationSearchResults>;
+  /** Get all projects for the Admin based on their role */
+  allProjects?: Maybe<ProjectSearchResults>;
   /** Get the specific answer */
   answer?: Maybe<Answer>;
   /** Get an answer by versionedQuestionId */
   answerByVersionedQuestionId?: Maybe<Answer>;
   /** Get all answers for the given project and plan and section */
   answers?: Maybe<Array<Maybe<Answer>>>;
+  /** Get the best practice VersionedGuidance for given Tag IDs */
+  bestPracticeGuidance: Array<VersionedGuidance>;
   /** Get all of the best practice VersionedSection */
   bestPracticeSections?: Maybe<Array<Maybe<VersionedSection>>>;
   /** Get all of the research domains related to the specified top level domain (more nuanced ones) */
   childResearchDomains?: Maybe<Array<Maybe<ResearchDomain>>>;
+  /** Get all of the research output types */
+  defaultResearchOutputTypes?: Maybe<Array<Maybe<ResearchOutputType>>>;
   /** Search for a User to add as a collaborator */
   findCollaborator?: Maybe<CollaboratorSearchResults>;
+  /** Get a specific Guidance item by ID */
+  guidance?: Maybe<Guidance>;
+  /** Get all Guidance items for a specific GuidanceGroup */
+  guidanceByGroup: Array<Guidance>;
+  /** Get a specific GuidanceGroup by ID */
+  guidanceGroup?: Maybe<GuidanceGroup>;
+  /** Get all GuidanceGroups for the user's organization (or for a specified affiliationId if provided and permitted) */
+  guidanceGroups: Array<GuidanceGroup>;
   /** Get all of the supported Languages */
   languages?: Maybe<Array<Maybe<Language>>>;
   /** Fetch a specific license */
@@ -2490,12 +2518,12 @@ export type Query = {
   planFeedback?: Maybe<Array<Maybe<PlanFeedback>>>;
   /** Get all of the comments associated with the round of admin feedback */
   planFeedbackComments?: Maybe<Array<Maybe<PlanFeedbackComment>>>;
+  /** Get the feedback status for a plan (NONE, REQUESTED, COMPLETED) */
+  planFeedbackStatus?: Maybe<PlanFeedbackStatusEnum>;
   /** Get all of the Funding information for the specific Plan */
   planFundings?: Maybe<Array<Maybe<PlanFunding>>>;
   /** Get all of the Users that are Members for the specific Plan */
   planMembers?: Maybe<Array<Maybe<PlanMember>>>;
-  /** The subset of project outputs associated with the sepcified Plan */
-  planOutputs?: Maybe<Array<Maybe<ProjectOutput>>>;
   /** Get all plans for the research project */
   plans?: Maybe<Array<PlanSearchResult>>;
   /** Returns a list of the top 20 funders ranked by popularity (nbr of plans) for the past year */
@@ -2512,12 +2540,6 @@ export type Query = {
   projectMember?: Maybe<ProjectMember>;
   /** Get all of the Users that a Members to the research project */
   projectMembers?: Maybe<Array<Maybe<ProjectMember>>>;
-  /** Fetch a single project output */
-  projectOutput?: Maybe<ProjectOutput>;
-  /** Get all the research output types */
-  projectOutputTypes?: Maybe<Array<Maybe<OutputType>>>;
-  /** Get all of the outputs for the research project */
-  projectOutputs?: Maybe<Array<Maybe<ProjectOutput>>>;
   /** Search for VersionedQuestions that belong to Section specified by sectionId */
   publishedConditionsForQuestion?: Maybe<Array<Maybe<VersionedQuestionCondition>>>;
   /** Get a specific VersionedQuestion based on versionedQuestionId */
@@ -2548,6 +2570,10 @@ export type Query = {
   repositories?: Maybe<RepositorySearchResults>;
   /** Fetch a specific repository */
   repository?: Maybe<Repository>;
+  /** Get the research output type by it's id */
+  researchOutputType?: Maybe<ResearchOutputType>;
+  /** Get the research output type by it's name */
+  researchOutputTypeByName?: Maybe<ResearchOutputType>;
   /** Search for projects within external APIs */
   searchExternalProjects?: Maybe<Array<Maybe<ExternalProject>>>;
   /** Get the specified section */
@@ -2573,6 +2599,8 @@ export type Query = {
   user?: Maybe<User>;
   /** Returns all of the users associated with the current admin's affiliation (Super admins get everything) */
   users?: Maybe<UserSearchResults>;
+  /** Get all VersionedGuidance for a given affiliation and Tag IDs */
+  versionedGuidance: Array<VersionedGuidance>;
 };
 
 
@@ -2593,6 +2621,13 @@ export type QueryAffiliationsArgs = {
 };
 
 
+export type QueryAllProjectsArgs = {
+  filterOptions?: InputMaybe<ProjectFilterOptions>;
+  paginationOptions?: InputMaybe<PaginationOptions>;
+  term?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type QueryAnswerArgs = {
   answerId: Scalars['Int']['input'];
   projectId: Scalars['Int']['input'];
@@ -2613,6 +2648,11 @@ export type QueryAnswersArgs = {
 };
 
 
+export type QueryBestPracticeGuidanceArgs = {
+  tagIds: Array<Scalars['Int']['input']>;
+};
+
+
 export type QueryChildResearchDomainsArgs = {
   parentResearchDomainId: Scalars['Int']['input'];
 };
@@ -2624,6 +2664,26 @@ export type QueryFindCollaboratorArgs = {
 };
 
 
+export type QueryGuidanceArgs = {
+  guidanceId: Scalars['Int']['input'];
+};
+
+
+export type QueryGuidanceByGroupArgs = {
+  guidanceGroupId: Scalars['Int']['input'];
+};
+
+
+export type QueryGuidanceGroupArgs = {
+  guidanceGroupId: Scalars['Int']['input'];
+};
+
+
+export type QueryGuidanceGroupsArgs = {
+  affiliationId?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type QueryLicenseArgs = {
   uri: Scalars['String']['input'];
 };
@@ -2686,17 +2746,17 @@ export type QueryPlanFeedbackCommentsArgs = {
 };
 
 
-export type QueryPlanFundingsArgs = {
+export type QueryPlanFeedbackStatusArgs = {
   planId: Scalars['Int']['input'];
 };
 
 
-export type QueryPlanMembersArgs = {
+export type QueryPlanFundingsArgs = {
   planId: Scalars['Int']['input'];
 };
 
 
-export type QueryPlanOutputsArgs = {
+export type QueryPlanMembersArgs = {
   planId: Scalars['Int']['input'];
 };
 
@@ -2736,16 +2796,6 @@ export type QueryProjectMembersArgs = {
 };
 
 
-export type QueryProjectOutputArgs = {
-  projectOutputId: Scalars['Int']['input'];
-};
-
-
-export type QueryProjectOutputsArgs = {
-  projectId: Scalars['Int']['input'];
-};
-
-
 export type QueryPublishedConditionsForQuestionArgs = {
   versionedQuestionId: Scalars['Int']['input'];
 };
@@ -2829,6 +2879,16 @@ export type QueryRepositoryArgs = {
 };
 
 
+export type QueryResearchOutputTypeArgs = {
+  id: Scalars['Int']['input'];
+};
+
+
+export type QueryResearchOutputTypeByNameArgs = {
+  name: Scalars['String']['input'];
+};
+
+
 export type QuerySearchExternalProjectsArgs = {
   input: ExternalSearchInput;
 };
@@ -2885,6 +2945,12 @@ export type QueryUsersArgs = {
   term?: InputMaybe<Scalars['String']['input']>;
 };
 
+
+export type QueryVersionedGuidanceArgs = {
+  affiliationId: Scalars['String']['input'];
+  tagIds: Array<Scalars['Int']['input']>;
+};
+
 /** Question always belongs to a Section, which always belongs to a Template */
 export type Question = {
   __typename?: 'Question';
@@ -3277,6 +3343,37 @@ export type ResearchDomainSearchResults = PaginatedQueryResults & {
   totalCount?: Maybe<Scalars['Int']['output']>;
 };
 
+export type ResearchOutputType = {
+  __typename?: 'ResearchOutputType';
+  /** The timestamp when the Object was created */
+  created?: Maybe<Scalars['String']['output']>;
+  /** The user who created the Object */
+  createdById?: Maybe<Scalars['Int']['output']>;
+  /** A longer description of the research output type useful for tooltips */
+  description?: Maybe<Scalars['String']['output']>;
+  /** Errors associated with the Object */
+  errors?: Maybe<ResearchOutputTypeErrors>;
+  /** The unique identifer for the Object */
+  id?: Maybe<Scalars['Int']['output']>;
+  /** The timestamp when the Object was last modifed */
+  modified?: Maybe<Scalars['String']['output']>;
+  /** The user who last modified the Object */
+  modifiedById?: Maybe<Scalars['Int']['output']>;
+  /** The name/label of the research output type */
+  name: Scalars['String']['output'];
+  /** The value/slug of the research output type */
+  value: Scalars['String']['output'];
+};
+
+/** A collection of errors related to the research output type */
+export type ResearchOutputTypeErrors = {
+  __typename?: 'ResearchOutputTypeErrors';
+  /** General error messages such as the object already exists */
+  general?: Maybe<Scalars['String']['output']>;
+  name?: Maybe<Scalars['String']['output']>;
+  value?: Maybe<Scalars['String']['output']>;
+};
+
 /** A Section that contains a list of questions in a template */
 export type Section = {
   __typename?: 'Section';
@@ -3356,6 +3453,8 @@ export type Tag = {
   modifiedById?: Maybe<Scalars['Int']['output']>;
   /** The tag name */
   name: Scalars['String']['output'];
+  /** The slug */
+  slug: Scalars['String']['output'];
 };
 
 /** A collection of errors related to the Tag */
@@ -3374,7 +3473,9 @@ export type TagInput = {
   /** The unique identifier for the Tag */
   id?: InputMaybe<Scalars['Int']['input']>;
   /** The name of the Tag */
-  name: Scalars['String']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  /** The slug of the Tag */
+  slug?: InputMaybe<Scalars['String']['input']>;
 };
 
 /** A Template used to create DMPs */
@@ -3552,6 +3653,30 @@ export type TypeCount = {
   typeId: Scalars['String']['output'];
 };
 
+/** Input for updating a GuidanceGroup */
+export type UpdateGuidanceGroupInput = {
+  /** Whether this is a best practice GuidanceGroup */
+  bestPractice?: InputMaybe<Scalars['Boolean']['input']>;
+  /** The description of the GuidanceGroup */
+  description?: InputMaybe<Scalars['String']['input']>;
+  /** The unique identifier for the GuidanceGroup to update */
+  guidanceGroupId: Scalars['Int']['input'];
+  /** The name of the GuidanceGroup */
+  name?: InputMaybe<Scalars['String']['input']>;
+  /** Whether this is an optional subset for departmental use */
+  optionalSubset?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+/** Input for updating a Guidance item */
+export type UpdateGuidanceInput = {
+  /** The unique identifier for the Guidance */
+  guidanceId: Scalars['Int']['input'];
+  /** The guidance text content */
+  guidanceText?: InputMaybe<Scalars['String']['input']>;
+  /** The Tags associated with this Guidance */
+  tagId?: InputMaybe<Scalars['Int']['input']>;
+};
+
 export type UpdateMetadataStandardInput = {
   /** A description of the metadata standard */
   description?: InputMaybe<Scalars['String']['input']>;
@@ -3614,31 +3739,6 @@ export type UpdateProjectMemberInput = {
   surName?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type UpdateProjectOutputInput = {
-  /** The date the output is expected to be deposited (YYYY-MM-DD format) */
-  anticipatedReleaseDate?: InputMaybe<Scalars['String']['input']>;
-  /** A description of the output */
-  description?: InputMaybe<Scalars['String']['input']>;
-  /** The initial access level that will be allowed for the output */
-  initialAccessLevel?: InputMaybe<Scalars['String']['input']>;
-  /** The initial license that will apply to the output */
-  initialLicenseId?: InputMaybe<Scalars['Int']['input']>;
-  /** Whether or not the output may contain personally identifying information (PII) */
-  mayContainPII?: InputMaybe<Scalars['Boolean']['input']>;
-  /** Whether or not the output may contain sensitive data */
-  mayContainSensitiveInformation?: InputMaybe<Scalars['Boolean']['input']>;
-  /** The metadata standards that will be used to describe the output */
-  metadataStandardIds?: InputMaybe<Array<Scalars['Int']['input']>>;
-  /** The type of output */
-  outputTypeId: Scalars['Int']['input'];
-  /** The id of the output */
-  projectOutputId: Scalars['Int']['input'];
-  /** The repositories the output will be deposited in */
-  respositoryIds?: InputMaybe<Array<Scalars['Int']['input']>>;
-  /** The title/name of the output */
-  title: Scalars['String']['input'];
-};
-
 /** Input for updating a new QuestionCondition based on a QuestionCondition id */
 export type UpdateQuestionConditionInput = {
   /** The action to take on a QuestionCondition */
@@ -3880,6 +3980,93 @@ export type UserSearchResults = PaginatedQueryResults & {
   totalCount?: Maybe<Scalars['Int']['output']>;
 };
 
+/** A snapshot of a Guidance item when its GuidanceGroup was published */
+export type VersionedGuidance = {
+  __typename?: 'VersionedGuidance';
+  /** The timestamp when the Object was created */
+  created?: Maybe<Scalars['String']['output']>;
+  /** The user who created the Object */
+  createdById?: Maybe<Scalars['Int']['output']>;
+  /** Errors associated with the Object */
+  errors?: Maybe<VersionedGuidanceErrors>;
+  /** The Guidance this is a snapshot of */
+  guidance?: Maybe<Guidance>;
+  /** The Guidance this is a snapshot of */
+  guidanceId?: Maybe<Scalars['Int']['output']>;
+  /** The guidance text content */
+  guidanceText?: Maybe<Scalars['String']['output']>;
+  /** The unique identifier for the Object */
+  id?: Maybe<Scalars['Int']['output']>;
+  /** The timestamp when the Object was last modified */
+  modified?: Maybe<Scalars['String']['output']>;
+  /** The user who last modified the Object */
+  modifiedById?: Maybe<Scalars['Int']['output']>;
+  /** The Tag ID (one of the associated tags) */
+  tagId: Scalars['Int']['output'];
+  /** All Tags associated with this VersionedGuidance */
+  tags?: Maybe<Array<Tag>>;
+  /** The VersionedGuidanceGroup this belongs to */
+  versionedGuidanceGroup?: Maybe<VersionedGuidanceGroup>;
+  /** The VersionedGuidanceGroup this belongs to */
+  versionedGuidanceGroupId: Scalars['Int']['output'];
+};
+
+/** A collection of errors related to VersionedGuidance */
+export type VersionedGuidanceErrors = {
+  __typename?: 'VersionedGuidanceErrors';
+  /** General error messages such as the object already exists */
+  general?: Maybe<Scalars['String']['output']>;
+  guidanceId?: Maybe<Scalars['String']['output']>;
+  guidanceText?: Maybe<Scalars['String']['output']>;
+  tagId?: Maybe<Scalars['String']['output']>;
+  versionedGuidanceGroupId?: Maybe<Scalars['String']['output']>;
+};
+
+/** A snapshot of a GuidanceGroup when it was published */
+export type VersionedGuidanceGroup = {
+  __typename?: 'VersionedGuidanceGroup';
+  /** Whether this is the currently active version */
+  active: Scalars['Boolean']['output'];
+  /** Whether this is a best practice VersionedGuidanceGroup */
+  bestPractice: Scalars['Boolean']['output'];
+  /** The timestamp when the Object was created */
+  created?: Maybe<Scalars['String']['output']>;
+  /** The user who created the Object */
+  createdById?: Maybe<Scalars['Int']['output']>;
+  /** Errors associated with the Object */
+  errors?: Maybe<VersionedGuidanceGroupErrors>;
+  /** The GuidanceGroup this is a snapshot of */
+  guidanceGroup?: Maybe<GuidanceGroup>;
+  /** The GuidanceGroup this is a snapshot of */
+  guidanceGroupId: Scalars['Int']['output'];
+  /** The unique identifier for the Object */
+  id?: Maybe<Scalars['Int']['output']>;
+  /** The timestamp when the Object was last modified */
+  modified?: Maybe<Scalars['String']['output']>;
+  /** The user who last modified the Object */
+  modifiedById?: Maybe<Scalars['Int']['output']>;
+  /** The name of the VersionedGuidanceGroup */
+  name: Scalars['String']['output'];
+  /** Whether this is an optional subset for departmental use */
+  optionalSubset: Scalars['Boolean']['output'];
+  /** The version number of this snapshot */
+  version?: Maybe<Scalars['Int']['output']>;
+  /** The VersionedGuidance items in this group */
+  versionedGuidance?: Maybe<Array<VersionedGuidance>>;
+};
+
+/** A collection of errors related to VersionedGuidanceGroup */
+export type VersionedGuidanceGroupErrors = {
+  __typename?: 'VersionedGuidanceGroupErrors';
+  active?: Maybe<Scalars['String']['output']>;
+  bestPractice?: Maybe<Scalars['String']['output']>;
+  /** General error messages such as the object already exists */
+  general?: Maybe<Scalars['String']['output']>;
+  guidanceGroupId?: Maybe<Scalars['String']['output']>;
+  name?: Maybe<Scalars['String']['output']>;
+  version?: Maybe<Scalars['String']['output']>;
+};
+
 /** A snapshot of a Question when it became published. */
 export type VersionedQuestion = {
   __typename?: 'VersionedQuestion';
@@ -4423,6 +4610,48 @@ export type AddFeedbackCommentMutationVariables = Exact<{
 
 export type AddFeedbackCommentMutation = { __typename?: 'Mutation', addFeedbackComment?: { __typename?: 'PlanFeedbackComment', id?: number | null, answerId?: number | null, commentText?: string | null, errors?: { __typename?: 'PlanFeedbackCommentErrors', general?: string | null } | null } | null };
 
+export type AddGuidanceMutationVariables = Exact<{
+  input: AddGuidanceInput;
+}>;
+
+
+export type AddGuidanceMutation = { __typename?: 'Mutation', addGuidance: { __typename?: 'Guidance', id?: number | null, guidanceText?: string | null, tagId?: number | null, errors?: { __typename?: 'GuidanceErrors', general?: string | null, guidanceGroupId?: string | null, guidanceText?: string | null } | null } };
+
+export type UpdateGuidanceMutationVariables = Exact<{
+  input: UpdateGuidanceInput;
+}>;
+
+
+export type UpdateGuidanceMutation = { __typename?: 'Mutation', updateGuidance: { __typename?: 'Guidance', id?: number | null, guidanceText?: string | null, tagId?: number | null, errors?: { __typename?: 'GuidanceErrors', general?: string | null, guidanceGroupId?: string | null, guidanceText?: string | null } | null } };
+
+export type AddGuidanceGroupMutationVariables = Exact<{
+  input: AddGuidanceGroupInput;
+}>;
+
+
+export type AddGuidanceGroupMutation = { __typename?: 'Mutation', addGuidanceGroup: { __typename?: 'GuidanceGroup', name: string, id?: number | null, errors?: { __typename?: 'GuidanceGroupErrors', affiliationId?: string | null, bestPractice?: string | null, general?: string | null, name?: string | null } | null } };
+
+export type PublishGuidanceGroupMutationVariables = Exact<{
+  guidanceGroupId: Scalars['Int']['input'];
+}>;
+
+
+export type PublishGuidanceGroupMutation = { __typename?: 'Mutation', publishGuidanceGroup: { __typename?: 'GuidanceGroup', id?: number | null, name: string, errors?: { __typename?: 'GuidanceGroupErrors', general?: string | null, affiliationId?: string | null, bestPractice?: string | null, name?: string | null, description?: string | null } | null } };
+
+export type UpdateGuidanceGroupMutationVariables = Exact<{
+  input: UpdateGuidanceGroupInput;
+}>;
+
+
+export type UpdateGuidanceGroupMutation = { __typename?: 'Mutation', updateGuidanceGroup: { __typename?: 'GuidanceGroup', id?: number | null, name: string, description?: string | null, bestPractice: boolean, errors?: { __typename?: 'GuidanceGroupErrors', affiliationId?: string | null, bestPractice?: string | null, general?: string | null, name?: string | null, description?: string | null } | null } };
+
+export type UnpublishGuidanceGroupMutationVariables = Exact<{
+  guidanceGroupId: Scalars['Int']['input'];
+}>;
+
+
+export type UnpublishGuidanceGroupMutation = { __typename?: 'Mutation', unpublishGuidanceGroup: { __typename?: 'GuidanceGroup', id?: number | null, name: string, errors?: { __typename?: 'GuidanceGroupErrors', affiliationId?: string | null, bestPractice?: string | null, description?: string | null, general?: string | null, name?: string | null } | null } };
+
 export type AddPlanMutationVariables = Exact<{
   projectId: Scalars['Int']['input'];
   versionedTemplateId: Scalars['Int']['input'];
@@ -4764,6 +4993,34 @@ export type PopularFundersQueryVariables = Exact<{ [key: string]: never; }>;
 
 export type PopularFundersQuery = { __typename?: 'Query', popularFunders?: Array<{ __typename?: 'FunderPopularityResult', displayName: string, id: number, nbrPlans: number, uri: string, apiTarget?: string | null } | null> | null };
 
+export type GuidanceByGroupQueryVariables = Exact<{
+  guidanceGroupId: Scalars['Int']['input'];
+}>;
+
+
+export type GuidanceByGroupQuery = { __typename?: 'Query', guidanceByGroup: Array<{ __typename?: 'Guidance', guidanceText?: string | null, id?: number | null, tagId?: number | null, modified?: string | null, modifiedBy?: { __typename?: 'User', givenName?: string | null, surName?: string | null, id?: number | null } | null, errors?: { __typename?: 'GuidanceErrors', general?: string | null, tagId?: string | null, guidanceText?: string | null, guidanceGroupId?: string | null } | null }> };
+
+export type GuidanceQueryVariables = Exact<{
+  guidanceId: Scalars['Int']['input'];
+}>;
+
+
+export type GuidanceQuery = { __typename?: 'Query', guidance?: { __typename?: 'Guidance', id?: number | null, guidanceText?: string | null, tagId?: number | null } | null };
+
+export type GuidanceGroupsQueryVariables = Exact<{
+  affiliationId?: InputMaybe<Scalars['String']['input']>;
+}>;
+
+
+export type GuidanceGroupsQuery = { __typename?: 'Query', guidanceGroups: Array<{ __typename?: 'GuidanceGroup', id?: number | null, name: string, description?: string | null, latestPublishedVersion?: string | null, latestPublishedDate?: string | null, modified?: string | null, isDirty: boolean, guidance?: Array<{ __typename?: 'Guidance', tagId?: number | null, guidanceText?: string | null, id?: number | null }> | null, modifiedBy?: { __typename?: 'User', givenName?: string | null, surName?: string | null, id?: number | null } | null, versionedGuidanceGroup?: Array<{ __typename?: 'VersionedGuidanceGroup', active: boolean, id?: number | null, version?: number | null } | null> | null }> };
+
+export type GuidanceGroupQueryVariables = Exact<{
+  guidanceGroupId: Scalars['Int']['input'];
+}>;
+
+
+export type GuidanceGroupQuery = { __typename?: 'Query', guidanceGroup?: { __typename?: 'GuidanceGroup', id?: number | null, name: string, description?: string | null, bestPractice: boolean, latestPublishedVersion?: string | null, latestPublishedDate?: string | null, isDirty: boolean, optionalSubset: boolean, guidance?: Array<{ __typename?: 'Guidance', guidanceText?: string | null, id?: number | null, tagId?: number | null }> | null, versionedGuidanceGroup?: Array<{ __typename?: 'VersionedGuidanceGroup', active: boolean, id?: number | null, version?: number | null } | null> | null } | null };
+
 export type LanguagesQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -4779,7 +5036,14 @@ export type PlanQueryVariables = Exact<{
 }>;
 
 
-export type PlanQuery = { __typename?: 'Query', plan?: { __typename?: 'Plan', id?: number | null, visibility?: PlanVisibility | null, status?: PlanStatus | null, created?: string | null, createdById?: number | null, modified?: string | null, dmpId?: string | null, registered?: string | null, title?: string | null, versionedTemplate?: { __typename?: 'VersionedTemplate', name: string, version: string, created?: string | null, template?: { __typename?: 'Template', id?: number | null, name: string } | null, owner?: { __typename?: 'Affiliation', uri: string, displayName: string } | null } | null, fundings?: Array<{ __typename?: 'PlanFunding', id?: number | null, projectFunding?: { __typename?: 'ProjectFunding', affiliation?: { __typename?: 'Affiliation', displayName: string } | null } | null }> | null, project?: { __typename?: 'Project', title: string, fundings?: Array<{ __typename?: 'ProjectFunding', funderOpportunityNumber?: string | null, affiliation?: { __typename?: 'Affiliation', displayName: string, name: string } | null }> | null, collaborators?: Array<{ __typename?: 'ProjectCollaborator', accessLevel?: ProjectCollaboratorAccessLevel | null, user?: { __typename?: 'User', id?: number | null } | null }> | null } | null, members?: Array<{ __typename?: 'PlanMember', isPrimaryContact?: boolean | null, projectMember?: { __typename?: 'ProjectMember', givenName?: string | null, surName?: string | null, email?: string | null, orcid?: string | null, memberRoles?: Array<{ __typename?: 'MemberRole', label: string }> | null } | null }> | null, versionedSections?: Array<{ __typename?: 'PlanSectionProgress', answeredQuestions: number, displayOrder: number, versionedSectionId: number, title: string, totalQuestions: number }> | null, progress?: { __typename?: 'PlanProgress', answeredQuestions: number, percentComplete: number, totalQuestions: number } | null, feedback?: Array<{ __typename?: 'PlanFeedback', id?: number | null, completed?: string | null }> | null } | null };
+export type PlanQuery = { __typename?: 'Query', plan?: { __typename?: 'Plan', id?: number | null, visibility?: PlanVisibility | null, status?: PlanStatus | null, created?: string | null, createdById?: number | null, modified?: string | null, dmpId?: string | null, registered?: string | null, title?: string | null, versionedTemplate?: { __typename?: 'VersionedTemplate', name: string, version: string, created?: string | null, template?: { __typename?: 'Template', id?: number | null, name: string } | null, owner?: { __typename?: 'Affiliation', uri: string, displayName: string } | null } | null, fundings?: Array<{ __typename?: 'PlanFunding', id?: number | null, projectFunding?: { __typename?: 'ProjectFunding', affiliation?: { __typename?: 'Affiliation', displayName: string } | null } | null }> | null, project?: { __typename?: 'Project', title: string, fundings?: Array<{ __typename?: 'ProjectFunding', funderOpportunityNumber?: string | null, affiliation?: { __typename?: 'Affiliation', displayName: string, name: string } | null }> | null, collaborators?: Array<{ __typename?: 'ProjectCollaborator', accessLevel?: ProjectCollaboratorAccessLevel | null, user?: { __typename?: 'User', id?: number | null } | null }> | null } | null, members?: Array<{ __typename?: 'PlanMember', isPrimaryContact?: boolean | null, projectMember?: { __typename?: 'ProjectMember', givenName?: string | null, surName?: string | null, email?: string | null, orcid?: string | null, memberRoles?: Array<{ __typename?: 'MemberRole', label: string }> | null } | null }> | null, versionedSections?: Array<{ __typename?: 'PlanSectionProgress', answeredQuestions: number, displayOrder: number, versionedSectionId: number, title: string, totalQuestions: number, tags?: Array<{ __typename?: 'Tag', name: string, slug: string, id?: number | null, description?: string | null }> | null }> | null, progress?: { __typename?: 'PlanProgress', answeredQuestions: number, percentComplete: number, totalQuestions: number } | null, feedback?: Array<{ __typename?: 'PlanFeedback', id?: number | null, completed?: string | null }> | null } | null };
+
+export type PlanFeedbackStatusQueryVariables = Exact<{
+  planId: Scalars['Int']['input'];
+}>;
+
+
+export type PlanFeedbackStatusQuery = { __typename?: 'Query', planFeedbackStatus?: PlanFeedbackStatusEnum | null };
 
 export type PlanMembersQueryVariables = Exact<{
   planId: Scalars['Int']['input'];
@@ -4822,7 +5086,7 @@ export type ProjectQueryVariables = Exact<{
 }>;
 
 
-export type ProjectQuery = { __typename?: 'Query', project?: { __typename?: 'Project', title: string, abstractText?: string | null, startDate?: string | null, endDate?: string | null, isTestProject?: boolean | null, fundings?: Array<{ __typename?: 'ProjectFunding', id?: number | null, grantId?: string | null, affiliation?: { __typename?: 'Affiliation', name: string, displayName: string, searchName: string } | null }> | null, members?: Array<{ __typename?: 'ProjectMember', givenName?: string | null, surName?: string | null, email?: string | null, memberRoles?: Array<{ __typename?: 'MemberRole', description?: string | null, displayOrder: number, label: string, uri: string }> | null }> | null, outputs?: Array<{ __typename?: 'ProjectOutput', title: string }> | null, researchDomain?: { __typename?: 'ResearchDomain', id?: number | null, parentResearchDomainId?: number | null } | null, plans?: Array<{ __typename?: 'PlanSearchResult', templateTitle?: string | null, id?: number | null, funding?: string | null, dmpId?: string | null, modified?: string | null, created?: string | null, versionedSections?: Array<{ __typename?: 'PlanSectionProgress', answeredQuestions: number, displayOrder: number, versionedSectionId: number, title: string, totalQuestions: number }> | null }> | null } | null };
+export type ProjectQuery = { __typename?: 'Query', project?: { __typename?: 'Project', title: string, abstractText?: string | null, startDate?: string | null, endDate?: string | null, isTestProject?: boolean | null, fundings?: Array<{ __typename?: 'ProjectFunding', id?: number | null, grantId?: string | null, affiliation?: { __typename?: 'Affiliation', name: string, displayName: string, searchName: string } | null }> | null, members?: Array<{ __typename?: 'ProjectMember', givenName?: string | null, surName?: string | null, email?: string | null, memberRoles?: Array<{ __typename?: 'MemberRole', description?: string | null, displayOrder: number, label: string, uri: string }> | null }> | null, researchDomain?: { __typename?: 'ResearchDomain', id?: number | null, parentResearchDomainId?: number | null } | null, plans?: Array<{ __typename?: 'PlanSearchResult', templateTitle?: string | null, id?: number | null, funding?: string | null, dmpId?: string | null, modified?: string | null, created?: string | null, versionedSections?: Array<{ __typename?: 'PlanSectionProgress', answeredQuestions: number, displayOrder: number, versionedSectionId: number, title: string, totalQuestions: number }> | null }> | null } | null };
 
 export type ProjectFundingsApiQueryVariables = Exact<{
   projectId: Scalars['Int']['input'];
@@ -4915,19 +5179,19 @@ export type PublishedSectionQueryVariables = Exact<{
 }>;
 
 
-export type PublishedSectionQuery = { __typename?: 'Query', publishedSection?: { __typename?: 'VersionedSection', id?: number | null, introduction?: string | null, name: string, requirements?: string | null, guidance?: string | null, displayOrder: number, tags?: Array<{ __typename?: 'Tag', id?: number | null, description?: string | null, name: string } | null> | null, errors?: { __typename?: 'VersionedSectionErrors', general?: string | null, name?: string | null, displayOrder?: string | null } | null } | null };
+export type PublishedSectionQuery = { __typename?: 'Query', publishedSection?: { __typename?: 'VersionedSection', id?: number | null, introduction?: string | null, name: string, requirements?: string | null, guidance?: string | null, displayOrder: number, tags?: Array<{ __typename?: 'Tag', id?: number | null, description?: string | null, name: string, slug: string } | null> | null, errors?: { __typename?: 'VersionedSectionErrors', general?: string | null, name?: string | null, displayOrder?: string | null } | null } | null };
 
 export type SectionQueryVariables = Exact<{
   sectionId: Scalars['Int']['input'];
 }>;
 
 
-export type SectionQuery = { __typename?: 'Query', section?: { __typename?: 'Section', id?: number | null, introduction?: string | null, name: string, requirements?: string | null, guidance?: string | null, displayOrder?: number | null, bestPractice?: boolean | null, isDirty: boolean, questions?: Array<{ __typename?: 'Question', displayOrder?: number | null, guidanceText?: string | null, id?: number | null, questionText?: string | null, sectionId: number, templateId: number, errors?: { __typename?: 'QuestionErrors', general?: string | null, templateId?: string | null, sectionId?: string | null, questionText?: string | null, displayOrder?: string | null } | null }> | null, tags?: Array<{ __typename?: 'Tag', id?: number | null, description?: string | null, name: string } | null> | null, errors?: { __typename?: 'SectionErrors', general?: string | null, name?: string | null, displayOrder?: string | null } | null, template?: { __typename?: 'Template', id?: number | null, bestPractice: boolean, isDirty: boolean, languageId: string, name: string, latestPublishVisibility?: TemplateVisibility | null } | null } | null };
+export type SectionQuery = { __typename?: 'Query', section?: { __typename?: 'Section', id?: number | null, introduction?: string | null, name: string, requirements?: string | null, guidance?: string | null, displayOrder?: number | null, bestPractice?: boolean | null, isDirty: boolean, questions?: Array<{ __typename?: 'Question', displayOrder?: number | null, guidanceText?: string | null, id?: number | null, questionText?: string | null, sectionId: number, templateId: number, errors?: { __typename?: 'QuestionErrors', general?: string | null, templateId?: string | null, sectionId?: string | null, questionText?: string | null, displayOrder?: string | null } | null }> | null, tags?: Array<{ __typename?: 'Tag', id?: number | null, description?: string | null, name: string, slug: string } | null> | null, errors?: { __typename?: 'SectionErrors', general?: string | null, name?: string | null, displayOrder?: string | null } | null, template?: { __typename?: 'Template', id?: number | null, bestPractice: boolean, isDirty: boolean, languageId: string, name: string, latestPublishVisibility?: TemplateVisibility | null } | null } | null };
 
 export type TagsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type TagsQuery = { __typename?: 'Query', tags: Array<{ __typename?: 'Tag', id?: number | null, name: string, description?: string | null }> };
+export type TagsQuery = { __typename?: 'Query', tags: Array<{ __typename?: 'Tag', id?: number | null, name: string, description?: string | null, slug: string }> };
 
 export type TemplateVersionsQueryVariables = Exact<{
   templateId: Scalars['Int']['input'];
@@ -5529,6 +5793,251 @@ export function useAddFeedbackCommentMutation(baseOptions?: Apollo.MutationHookO
 export type AddFeedbackCommentMutationHookResult = ReturnType<typeof useAddFeedbackCommentMutation>;
 export type AddFeedbackCommentMutationResult = Apollo.MutationResult<AddFeedbackCommentMutation>;
 export type AddFeedbackCommentMutationOptions = Apollo.BaseMutationOptions<AddFeedbackCommentMutation, AddFeedbackCommentMutationVariables>;
+export const AddGuidanceDocument = gql`
+    mutation AddGuidance($input: AddGuidanceInput!) {
+  addGuidance(input: $input) {
+    id
+    guidanceText
+    tagId
+    errors {
+      general
+      guidanceGroupId
+      guidanceText
+    }
+  }
+}
+    `;
+export type AddGuidanceMutationFn = Apollo.MutationFunction<AddGuidanceMutation, AddGuidanceMutationVariables>;
+
+/**
+ * __useAddGuidanceMutation__
+ *
+ * To run a mutation, you first call `useAddGuidanceMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useAddGuidanceMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [addGuidanceMutation, { data, loading, error }] = useAddGuidanceMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useAddGuidanceMutation(baseOptions?: Apollo.MutationHookOptions<AddGuidanceMutation, AddGuidanceMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<AddGuidanceMutation, AddGuidanceMutationVariables>(AddGuidanceDocument, options);
+      }
+export type AddGuidanceMutationHookResult = ReturnType<typeof useAddGuidanceMutation>;
+export type AddGuidanceMutationResult = Apollo.MutationResult<AddGuidanceMutation>;
+export type AddGuidanceMutationOptions = Apollo.BaseMutationOptions<AddGuidanceMutation, AddGuidanceMutationVariables>;
+export const UpdateGuidanceDocument = gql`
+    mutation UpdateGuidance($input: UpdateGuidanceInput!) {
+  updateGuidance(input: $input) {
+    id
+    guidanceText
+    tagId
+    errors {
+      general
+      guidanceGroupId
+      guidanceText
+    }
+  }
+}
+    `;
+export type UpdateGuidanceMutationFn = Apollo.MutationFunction<UpdateGuidanceMutation, UpdateGuidanceMutationVariables>;
+
+/**
+ * __useUpdateGuidanceMutation__
+ *
+ * To run a mutation, you first call `useUpdateGuidanceMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUpdateGuidanceMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [updateGuidanceMutation, { data, loading, error }] = useUpdateGuidanceMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useUpdateGuidanceMutation(baseOptions?: Apollo.MutationHookOptions<UpdateGuidanceMutation, UpdateGuidanceMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<UpdateGuidanceMutation, UpdateGuidanceMutationVariables>(UpdateGuidanceDocument, options);
+      }
+export type UpdateGuidanceMutationHookResult = ReturnType<typeof useUpdateGuidanceMutation>;
+export type UpdateGuidanceMutationResult = Apollo.MutationResult<UpdateGuidanceMutation>;
+export type UpdateGuidanceMutationOptions = Apollo.BaseMutationOptions<UpdateGuidanceMutation, UpdateGuidanceMutationVariables>;
+export const AddGuidanceGroupDocument = gql`
+    mutation AddGuidanceGroup($input: AddGuidanceGroupInput!) {
+  addGuidanceGroup(input: $input) {
+    name
+    id
+    errors {
+      affiliationId
+      bestPractice
+      general
+      name
+    }
+  }
+}
+    `;
+export type AddGuidanceGroupMutationFn = Apollo.MutationFunction<AddGuidanceGroupMutation, AddGuidanceGroupMutationVariables>;
+
+/**
+ * __useAddGuidanceGroupMutation__
+ *
+ * To run a mutation, you first call `useAddGuidanceGroupMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useAddGuidanceGroupMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [addGuidanceGroupMutation, { data, loading, error }] = useAddGuidanceGroupMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useAddGuidanceGroupMutation(baseOptions?: Apollo.MutationHookOptions<AddGuidanceGroupMutation, AddGuidanceGroupMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<AddGuidanceGroupMutation, AddGuidanceGroupMutationVariables>(AddGuidanceGroupDocument, options);
+      }
+export type AddGuidanceGroupMutationHookResult = ReturnType<typeof useAddGuidanceGroupMutation>;
+export type AddGuidanceGroupMutationResult = Apollo.MutationResult<AddGuidanceGroupMutation>;
+export type AddGuidanceGroupMutationOptions = Apollo.BaseMutationOptions<AddGuidanceGroupMutation, AddGuidanceGroupMutationVariables>;
+export const PublishGuidanceGroupDocument = gql`
+    mutation PublishGuidanceGroup($guidanceGroupId: Int!) {
+  publishGuidanceGroup(guidanceGroupId: $guidanceGroupId) {
+    id
+    name
+    errors {
+      general
+      affiliationId
+      bestPractice
+      name
+      description
+    }
+  }
+}
+    `;
+export type PublishGuidanceGroupMutationFn = Apollo.MutationFunction<PublishGuidanceGroupMutation, PublishGuidanceGroupMutationVariables>;
+
+/**
+ * __usePublishGuidanceGroupMutation__
+ *
+ * To run a mutation, you first call `usePublishGuidanceGroupMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `usePublishGuidanceGroupMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [publishGuidanceGroupMutation, { data, loading, error }] = usePublishGuidanceGroupMutation({
+ *   variables: {
+ *      guidanceGroupId: // value for 'guidanceGroupId'
+ *   },
+ * });
+ */
+export function usePublishGuidanceGroupMutation(baseOptions?: Apollo.MutationHookOptions<PublishGuidanceGroupMutation, PublishGuidanceGroupMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<PublishGuidanceGroupMutation, PublishGuidanceGroupMutationVariables>(PublishGuidanceGroupDocument, options);
+      }
+export type PublishGuidanceGroupMutationHookResult = ReturnType<typeof usePublishGuidanceGroupMutation>;
+export type PublishGuidanceGroupMutationResult = Apollo.MutationResult<PublishGuidanceGroupMutation>;
+export type PublishGuidanceGroupMutationOptions = Apollo.BaseMutationOptions<PublishGuidanceGroupMutation, PublishGuidanceGroupMutationVariables>;
+export const UpdateGuidanceGroupDocument = gql`
+    mutation UpdateGuidanceGroup($input: UpdateGuidanceGroupInput!) {
+  updateGuidanceGroup(input: $input) {
+    id
+    name
+    description
+    bestPractice
+    errors {
+      affiliationId
+      bestPractice
+      general
+      name
+      description
+    }
+  }
+}
+    `;
+export type UpdateGuidanceGroupMutationFn = Apollo.MutationFunction<UpdateGuidanceGroupMutation, UpdateGuidanceGroupMutationVariables>;
+
+/**
+ * __useUpdateGuidanceGroupMutation__
+ *
+ * To run a mutation, you first call `useUpdateGuidanceGroupMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUpdateGuidanceGroupMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [updateGuidanceGroupMutation, { data, loading, error }] = useUpdateGuidanceGroupMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useUpdateGuidanceGroupMutation(baseOptions?: Apollo.MutationHookOptions<UpdateGuidanceGroupMutation, UpdateGuidanceGroupMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<UpdateGuidanceGroupMutation, UpdateGuidanceGroupMutationVariables>(UpdateGuidanceGroupDocument, options);
+      }
+export type UpdateGuidanceGroupMutationHookResult = ReturnType<typeof useUpdateGuidanceGroupMutation>;
+export type UpdateGuidanceGroupMutationResult = Apollo.MutationResult<UpdateGuidanceGroupMutation>;
+export type UpdateGuidanceGroupMutationOptions = Apollo.BaseMutationOptions<UpdateGuidanceGroupMutation, UpdateGuidanceGroupMutationVariables>;
+export const UnpublishGuidanceGroupDocument = gql`
+    mutation UnpublishGuidanceGroup($guidanceGroupId: Int!) {
+  unpublishGuidanceGroup(guidanceGroupId: $guidanceGroupId) {
+    id
+    name
+    errors {
+      affiliationId
+      bestPractice
+      description
+      general
+      name
+    }
+  }
+}
+    `;
+export type UnpublishGuidanceGroupMutationFn = Apollo.MutationFunction<UnpublishGuidanceGroupMutation, UnpublishGuidanceGroupMutationVariables>;
+
+/**
+ * __useUnpublishGuidanceGroupMutation__
+ *
+ * To run a mutation, you first call `useUnpublishGuidanceGroupMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUnpublishGuidanceGroupMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [unpublishGuidanceGroupMutation, { data, loading, error }] = useUnpublishGuidanceGroupMutation({
+ *   variables: {
+ *      guidanceGroupId: // value for 'guidanceGroupId'
+ *   },
+ * });
+ */
+export function useUnpublishGuidanceGroupMutation(baseOptions?: Apollo.MutationHookOptions<UnpublishGuidanceGroupMutation, UnpublishGuidanceGroupMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<UnpublishGuidanceGroupMutation, UnpublishGuidanceGroupMutationVariables>(UnpublishGuidanceGroupDocument, options);
+      }
+export type UnpublishGuidanceGroupMutationHookResult = ReturnType<typeof useUnpublishGuidanceGroupMutation>;
+export type UnpublishGuidanceGroupMutationResult = Apollo.MutationResult<UnpublishGuidanceGroupMutation>;
+export type UnpublishGuidanceGroupMutationOptions = Apollo.BaseMutationOptions<UnpublishGuidanceGroupMutation, UnpublishGuidanceGroupMutationVariables>;
 export const AddPlanDocument = gql`
     mutation AddPlan($projectId: Int!, $versionedTemplateId: Int!) {
   addPlan(projectId: $projectId, versionedTemplateId: $versionedTemplateId) {
@@ -7561,6 +8070,220 @@ export type PopularFundersQueryHookResult = ReturnType<typeof usePopularFundersQ
 export type PopularFundersLazyQueryHookResult = ReturnType<typeof usePopularFundersLazyQuery>;
 export type PopularFundersSuspenseQueryHookResult = ReturnType<typeof usePopularFundersSuspenseQuery>;
 export type PopularFundersQueryResult = Apollo.QueryResult<PopularFundersQuery, PopularFundersQueryVariables>;
+export const GuidanceByGroupDocument = gql`
+    query GuidanceByGroup($guidanceGroupId: Int!) {
+  guidanceByGroup(guidanceGroupId: $guidanceGroupId) {
+    modifiedBy {
+      givenName
+      surName
+      id
+    }
+    guidanceText
+    id
+    tagId
+    errors {
+      general
+      tagId
+      guidanceText
+      guidanceGroupId
+    }
+    modified
+  }
+}
+    `;
+
+/**
+ * __useGuidanceByGroupQuery__
+ *
+ * To run a query within a React component, call `useGuidanceByGroupQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGuidanceByGroupQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGuidanceByGroupQuery({
+ *   variables: {
+ *      guidanceGroupId: // value for 'guidanceGroupId'
+ *   },
+ * });
+ */
+export function useGuidanceByGroupQuery(baseOptions: Apollo.QueryHookOptions<GuidanceByGroupQuery, GuidanceByGroupQueryVariables> & ({ variables: GuidanceByGroupQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GuidanceByGroupQuery, GuidanceByGroupQueryVariables>(GuidanceByGroupDocument, options);
+      }
+export function useGuidanceByGroupLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GuidanceByGroupQuery, GuidanceByGroupQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GuidanceByGroupQuery, GuidanceByGroupQueryVariables>(GuidanceByGroupDocument, options);
+        }
+export function useGuidanceByGroupSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<GuidanceByGroupQuery, GuidanceByGroupQueryVariables>) {
+          const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions}
+          return Apollo.useSuspenseQuery<GuidanceByGroupQuery, GuidanceByGroupQueryVariables>(GuidanceByGroupDocument, options);
+        }
+export type GuidanceByGroupQueryHookResult = ReturnType<typeof useGuidanceByGroupQuery>;
+export type GuidanceByGroupLazyQueryHookResult = ReturnType<typeof useGuidanceByGroupLazyQuery>;
+export type GuidanceByGroupSuspenseQueryHookResult = ReturnType<typeof useGuidanceByGroupSuspenseQuery>;
+export type GuidanceByGroupQueryResult = Apollo.QueryResult<GuidanceByGroupQuery, GuidanceByGroupQueryVariables>;
+export const GuidanceDocument = gql`
+    query Guidance($guidanceId: Int!) {
+  guidance(guidanceId: $guidanceId) {
+    id
+    guidanceText
+    tagId
+  }
+}
+    `;
+
+/**
+ * __useGuidanceQuery__
+ *
+ * To run a query within a React component, call `useGuidanceQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGuidanceQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGuidanceQuery({
+ *   variables: {
+ *      guidanceId: // value for 'guidanceId'
+ *   },
+ * });
+ */
+export function useGuidanceQuery(baseOptions: Apollo.QueryHookOptions<GuidanceQuery, GuidanceQueryVariables> & ({ variables: GuidanceQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GuidanceQuery, GuidanceQueryVariables>(GuidanceDocument, options);
+      }
+export function useGuidanceLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GuidanceQuery, GuidanceQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GuidanceQuery, GuidanceQueryVariables>(GuidanceDocument, options);
+        }
+export function useGuidanceSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<GuidanceQuery, GuidanceQueryVariables>) {
+          const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions}
+          return Apollo.useSuspenseQuery<GuidanceQuery, GuidanceQueryVariables>(GuidanceDocument, options);
+        }
+export type GuidanceQueryHookResult = ReturnType<typeof useGuidanceQuery>;
+export type GuidanceLazyQueryHookResult = ReturnType<typeof useGuidanceLazyQuery>;
+export type GuidanceSuspenseQueryHookResult = ReturnType<typeof useGuidanceSuspenseQuery>;
+export type GuidanceQueryResult = Apollo.QueryResult<GuidanceQuery, GuidanceQueryVariables>;
+export const GuidanceGroupsDocument = gql`
+    query GuidanceGroups($affiliationId: String) {
+  guidanceGroups(affiliationId: $affiliationId) {
+    id
+    name
+    description
+    latestPublishedVersion
+    latestPublishedDate
+    guidance {
+      tagId
+      guidanceText
+      id
+    }
+    modifiedBy {
+      givenName
+      surName
+      id
+    }
+    modified
+    isDirty
+    versionedGuidanceGroup {
+      active
+      id
+      version
+    }
+  }
+}
+    `;
+
+/**
+ * __useGuidanceGroupsQuery__
+ *
+ * To run a query within a React component, call `useGuidanceGroupsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGuidanceGroupsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGuidanceGroupsQuery({
+ *   variables: {
+ *      affiliationId: // value for 'affiliationId'
+ *   },
+ * });
+ */
+export function useGuidanceGroupsQuery(baseOptions?: Apollo.QueryHookOptions<GuidanceGroupsQuery, GuidanceGroupsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GuidanceGroupsQuery, GuidanceGroupsQueryVariables>(GuidanceGroupsDocument, options);
+      }
+export function useGuidanceGroupsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GuidanceGroupsQuery, GuidanceGroupsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GuidanceGroupsQuery, GuidanceGroupsQueryVariables>(GuidanceGroupsDocument, options);
+        }
+export function useGuidanceGroupsSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<GuidanceGroupsQuery, GuidanceGroupsQueryVariables>) {
+          const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions}
+          return Apollo.useSuspenseQuery<GuidanceGroupsQuery, GuidanceGroupsQueryVariables>(GuidanceGroupsDocument, options);
+        }
+export type GuidanceGroupsQueryHookResult = ReturnType<typeof useGuidanceGroupsQuery>;
+export type GuidanceGroupsLazyQueryHookResult = ReturnType<typeof useGuidanceGroupsLazyQuery>;
+export type GuidanceGroupsSuspenseQueryHookResult = ReturnType<typeof useGuidanceGroupsSuspenseQuery>;
+export type GuidanceGroupsQueryResult = Apollo.QueryResult<GuidanceGroupsQuery, GuidanceGroupsQueryVariables>;
+export const GuidanceGroupDocument = gql`
+    query GuidanceGroup($guidanceGroupId: Int!) {
+  guidanceGroup(guidanceGroupId: $guidanceGroupId) {
+    id
+    name
+    description
+    bestPractice
+    latestPublishedVersion
+    latestPublishedDate
+    isDirty
+    guidance {
+      guidanceText
+      id
+      tagId
+    }
+    versionedGuidanceGroup {
+      active
+      id
+      version
+    }
+    optionalSubset
+  }
+}
+    `;
+
+/**
+ * __useGuidanceGroupQuery__
+ *
+ * To run a query within a React component, call `useGuidanceGroupQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGuidanceGroupQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGuidanceGroupQuery({
+ *   variables: {
+ *      guidanceGroupId: // value for 'guidanceGroupId'
+ *   },
+ * });
+ */
+export function useGuidanceGroupQuery(baseOptions: Apollo.QueryHookOptions<GuidanceGroupQuery, GuidanceGroupQueryVariables> & ({ variables: GuidanceGroupQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GuidanceGroupQuery, GuidanceGroupQueryVariables>(GuidanceGroupDocument, options);
+      }
+export function useGuidanceGroupLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GuidanceGroupQuery, GuidanceGroupQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GuidanceGroupQuery, GuidanceGroupQueryVariables>(GuidanceGroupDocument, options);
+        }
+export function useGuidanceGroupSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<GuidanceGroupQuery, GuidanceGroupQueryVariables>) {
+          const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions}
+          return Apollo.useSuspenseQuery<GuidanceGroupQuery, GuidanceGroupQueryVariables>(GuidanceGroupDocument, options);
+        }
+export type GuidanceGroupQueryHookResult = ReturnType<typeof useGuidanceGroupQuery>;
+export type GuidanceGroupLazyQueryHookResult = ReturnType<typeof useGuidanceGroupLazyQuery>;
+export type GuidanceGroupSuspenseQueryHookResult = ReturnType<typeof useGuidanceGroupSuspenseQuery>;
+export type GuidanceGroupQueryResult = Apollo.QueryResult<GuidanceGroupQuery, GuidanceGroupQueryVariables>;
 export const LanguagesDocument = gql`
     query Languages {
   languages {
@@ -7706,6 +8429,13 @@ export const PlanDocument = gql`
       versionedSectionId
       title
       totalQuestions
+      tags {
+        name
+        slug
+        id
+        slug
+        description
+      }
     }
     progress {
       answeredQuestions
@@ -7758,6 +8488,44 @@ export type PlanQueryHookResult = ReturnType<typeof usePlanQuery>;
 export type PlanLazyQueryHookResult = ReturnType<typeof usePlanLazyQuery>;
 export type PlanSuspenseQueryHookResult = ReturnType<typeof usePlanSuspenseQuery>;
 export type PlanQueryResult = Apollo.QueryResult<PlanQuery, PlanQueryVariables>;
+export const PlanFeedbackStatusDocument = gql`
+    query PlanFeedbackStatus($planId: Int!) {
+  planFeedbackStatus(planId: $planId)
+}
+    `;
+
+/**
+ * __usePlanFeedbackStatusQuery__
+ *
+ * To run a query within a React component, call `usePlanFeedbackStatusQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePlanFeedbackStatusQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = usePlanFeedbackStatusQuery({
+ *   variables: {
+ *      planId: // value for 'planId'
+ *   },
+ * });
+ */
+export function usePlanFeedbackStatusQuery(baseOptions: Apollo.QueryHookOptions<PlanFeedbackStatusQuery, PlanFeedbackStatusQueryVariables> & ({ variables: PlanFeedbackStatusQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<PlanFeedbackStatusQuery, PlanFeedbackStatusQueryVariables>(PlanFeedbackStatusDocument, options);
+      }
+export function usePlanFeedbackStatusLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PlanFeedbackStatusQuery, PlanFeedbackStatusQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<PlanFeedbackStatusQuery, PlanFeedbackStatusQueryVariables>(PlanFeedbackStatusDocument, options);
+        }
+export function usePlanFeedbackStatusSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<PlanFeedbackStatusQuery, PlanFeedbackStatusQueryVariables>) {
+          const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions}
+          return Apollo.useSuspenseQuery<PlanFeedbackStatusQuery, PlanFeedbackStatusQueryVariables>(PlanFeedbackStatusDocument, options);
+        }
+export type PlanFeedbackStatusQueryHookResult = ReturnType<typeof usePlanFeedbackStatusQuery>;
+export type PlanFeedbackStatusLazyQueryHookResult = ReturnType<typeof usePlanFeedbackStatusLazyQuery>;
+export type PlanFeedbackStatusSuspenseQueryHookResult = ReturnType<typeof usePlanFeedbackStatusSuspenseQuery>;
+export type PlanFeedbackStatusQueryResult = Apollo.QueryResult<PlanFeedbackStatusQuery, PlanFeedbackStatusQueryVariables>;
 export const PlanMembersDocument = gql`
     query PlanMembers($planId: Int!) {
   planMembers(planId: $planId) {
@@ -8056,9 +8824,6 @@ export const ProjectDocument = gql`
       }
       email
     }
-    outputs {
-      title
-    }
     researchDomain {
       id
       parentResearchDomainId
@@ -8793,6 +9558,7 @@ export const PublishedSectionDocument = gql`
       id
       description
       name
+      slug
     }
     errors {
       general
@@ -8865,6 +9631,7 @@ export const SectionDocument = gql`
       id
       description
       name
+      slug
     }
     errors {
       general
@@ -8921,6 +9688,7 @@ export const TagsDocument = gql`
     id
     name
     description
+    slug
   }
 }
     `;
diff --git a/graphql/mutations/guidance.mutation.graphql b/graphql/mutations/guidance.mutation.graphql
new file mode 100644
index 000000000..3c36375ed
--- /dev/null
+++ b/graphql/mutations/guidance.mutation.graphql
@@ -0,0 +1,25 @@
+mutation AddGuidance($input: AddGuidanceInput!) {
+  addGuidance(input: $input) {
+    id
+    guidanceText
+    tagId
+    errors {
+      general
+      guidanceGroupId
+      guidanceText
+    }
+  }
+}
+
+mutation UpdateGuidance($input: UpdateGuidanceInput!) {
+  updateGuidance(input: $input) {
+    id
+    guidanceText
+    tagId
+    errors {
+      general
+      guidanceGroupId
+      guidanceText
+    }
+  }
+}
\ No newline at end of file
diff --git a/graphql/mutations/guidanceGroups.mutation.graphql b/graphql/mutations/guidanceGroups.mutation.graphql
new file mode 100644
index 000000000..910b32cd1
--- /dev/null
+++ b/graphql/mutations/guidanceGroups.mutation.graphql
@@ -0,0 +1,57 @@
+mutation AddGuidanceGroup($input: AddGuidanceGroupInput!) {
+  addGuidanceGroup(input: $input) {
+    name
+    id
+    errors {
+      affiliationId
+      bestPractice
+      general
+      name
+    }
+  }
+}
+
+mutation PublishGuidanceGroup($guidanceGroupId: Int!) {
+  publishGuidanceGroup(guidanceGroupId: $guidanceGroupId) {
+    id
+    name
+    errors {
+      general
+      affiliationId
+      bestPractice
+      name
+      description
+    }
+  }
+}
+
+mutation UpdateGuidanceGroup($input: UpdateGuidanceGroupInput!) {
+  updateGuidanceGroup(input: $input) {
+    id
+    name
+    description
+    bestPractice
+    errors {
+      affiliationId
+      bestPractice
+      general
+      name
+      description
+    }
+  }
+}
+
+
+mutation UnpublishGuidanceGroup($guidanceGroupId: Int!) {
+  unpublishGuidanceGroup(guidanceGroupId: $guidanceGroupId) {
+    id
+    name
+    errors {
+      affiliationId
+      bestPractice
+      description
+      general
+      name
+    }
+  }
+}
\ No newline at end of file
diff --git a/graphql/queries/guidance.query.graphql b/graphql/queries/guidance.query.graphql
new file mode 100644
index 000000000..9b2c09424
--- /dev/null
+++ b/graphql/queries/guidance.query.graphql
@@ -0,0 +1,27 @@
+query GuidanceByGroup($guidanceGroupId: Int!) {
+ guidanceByGroup(guidanceGroupId: $guidanceGroupId) {
+    modifiedBy {
+      givenName
+      surName
+      id
+    }
+    guidanceText
+    id
+    tagId
+    errors {
+      general
+      tagId
+      guidanceText
+      guidanceGroupId
+    }
+    modified
+  }
+}
+
+query Guidance($guidanceId: Int!) {
+  guidance(guidanceId: $guidanceId) {
+    id
+    guidanceText
+    tagId
+  }
+}
diff --git a/graphql/queries/guidanceGroup.query.graphql b/graphql/queries/guidanceGroup.query.graphql
new file mode 100644
index 000000000..aea340d5b
--- /dev/null
+++ b/graphql/queries/guidanceGroup.query.graphql
@@ -0,0 +1,49 @@
+query GuidanceGroups($affiliationId: String) {
+  guidanceGroups(affiliationId: $affiliationId) {
+    id
+    name
+    description
+    latestPublishedVersion
+    latestPublishedDate
+    guidance {
+      tagId
+      guidanceText
+      id
+    }
+    modifiedBy {
+      givenName
+      surName
+      id
+    }
+    modified
+    isDirty
+    versionedGuidanceGroup {
+      active
+      id
+      version
+    }
+  }
+}
+
+query GuidanceGroup($guidanceGroupId: Int!) {
+  guidanceGroup(guidanceGroupId: $guidanceGroupId) {
+    id
+    name
+    description
+    bestPractice
+    latestPublishedVersion
+    latestPublishedDate
+    isDirty
+    guidance {
+      guidanceText
+      id
+      tagId
+    }
+    versionedGuidanceGroup {
+      active
+      id
+      version
+    }
+    optionalSubset
+  }
+}
\ No newline at end of file
diff --git a/graphql/queries/plan.query.graphql b/graphql/queries/plan.query.graphql
index 9910f44cb..80d7eff32 100644
--- a/graphql/queries/plan.query.graphql
+++ b/graphql/queries/plan.query.graphql
@@ -58,6 +58,13 @@ query Plan($planId: Int!) {
       versionedSectionId
       title
       totalQuestions
+      tags {
+        name
+        slug
+        id
+        slug
+        description
+      }
     }
     progress {
       answeredQuestions
diff --git a/graphql/queries/planFeedback.query.graphql b/graphql/queries/planFeedback.query.graphql
new file mode 100644
index 000000000..3dc0d98cf
--- /dev/null
+++ b/graphql/queries/planFeedback.query.graphql
@@ -0,0 +1,3 @@
+query PlanFeedbackStatus($planId: Int!) {
+  planFeedbackStatus(planId: $planId)
+}
diff --git a/graphql/queries/projects.query.graphql b/graphql/queries/projects.query.graphql
index 490362495..b285ca923 100644
--- a/graphql/queries/projects.query.graphql
+++ b/graphql/queries/projects.query.graphql
@@ -51,9 +51,6 @@ query Project($projectId: Int!) {
       }
       email
     }
-    outputs {
-      title
-    }
     researchDomain {
       id
       parentResearchDomainId
diff --git a/graphql/queries/sections.query.graphql b/graphql/queries/sections.query.graphql
index d66aab0e2..e353e1e58 100644
--- a/graphql/queries/sections.query.graphql
+++ b/graphql/queries/sections.query.graphql
@@ -39,6 +39,7 @@ query PublishedSection($versionedSectionId: Int!) {
       id
       description
       name
+      slug
     }
     errors {
       general
@@ -77,6 +78,7 @@ query Section($sectionId: Int!) {
       id
       description
       name
+      slug
     }
     errors {
       general
@@ -92,4 +94,4 @@ query Section($sectionId: Int!) {
       latestPublishVisibility
     }
   }
-}
\ No newline at end of file
+}
diff --git a/graphql/queries/tags.query.graphql b/graphql/queries/tags.query.graphql
index 542cc6c9e..b112d5e15 100644
--- a/graphql/queries/tags.query.graphql
+++ b/graphql/queries/tags.query.graphql
@@ -3,5 +3,6 @@ query Tags {
     id
     name
     description
+    slug
   }
-}
\ No newline at end of file
+}
diff --git a/hooks/useFormatDate.ts b/hooks/useFormatDate.ts
index 535c75e12..eaac2d023 100644
--- a/hooks/useFormatDate.ts
+++ b/hooks/useFormatDate.ts
@@ -4,17 +4,28 @@ export const useFormatDate = () => {
   const formatter = useFormatter();
 
   return (date: string | null | undefined) => {
-    let formattedDate;
+    let formattedDate = '';
     if (date) {
-      formattedDate = formatter.dateTime(new Date(Number(date)), {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit',
-      });
-    } else {
-      formattedDate = '';
+      let dateObj: Date | null = null;
+      // Try to parse as number (timestamp)
+      if (!isNaN(Number(date)) && date.trim() !== '') {
+        dateObj = new Date(Number(date));
+      } else {
+        // Try to parse as ISO or other string
+        dateObj = new Date(date);
+      }
+      if (dateObj instanceof Date && !isNaN(dateObj.getTime())) {
+        formattedDate = formatter.dateTime(dateObj, {
+          year: 'numeric',
+          month: '2-digit',
+          day: '2-digit',
+        });
+        return formattedDate.replace(/\//g, '-');
+      } else {
+        console.warn('Invalid date value passed to useFormatDate:', date);
+        return '';
+      }
     }
-
-    return formattedDate.replace(/\//g, '-');
+    return '';
   };
 };
diff --git a/messages/en-US/global.json b/messages/en-US/global.json
index 8732fd448..215255d10 100644
--- a/messages/en-US/global.json
+++ b/messages/en-US/global.json
@@ -1,6 +1,32 @@
 {
   "HomePage": {
     "title": "Home page",
+    "createAndManage": {
+      "title": "Create & Manage",
+      "description": "Create new templates and projects"
+    },
+    "accountAndAdmin": {
+      "title": "Account & Administration",
+      "description": "Manage your account and access admin features"
+    },
+    "sections": {
+      "templateManagement": {
+        "title": "Template Management",
+        "description": "Create and manage templates (Must be Admin to access)"
+      },
+      "planDashboard": {
+        "title": "Plan Dashboard",
+        "description": "Create and manage projects and plans"
+      },
+      "accountSettings": {
+        "title": "Account Settings",
+        "description": "View and manage your account"
+      },
+      "adminOverview": {
+        "title": "Admin Overview",
+        "description": "Access administrative functions"
+      }
+    },
     "linkText": "Go to the Connections page",
     "content": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
   },
@@ -11,7 +37,7 @@
     "menuDashboard": "Dashboard",
     "menuUpload": "Upload Plan",
     "menuCreatePlan": "Create Plan",
-    "menuProjectsPlans": "Projects &amp; Plans",
+    "menuProjectsPlans": "Plan Dashboard",
     "menuPublicPlans": "Public Plans",
     "menuFunderRequirements": "Funder Requirements",
     "menuAbout": "About",
@@ -530,10 +556,11 @@
         "createGroup": "Create guidance group"
       },
       "groupIndex": {
-        "title": "Guidance Texts",
-        "description": "Manage guidance texts within this group",
+        "title": "Edit {groupName}",
+        "description": "Below are all the Tags that are applied to Questions and Sections. Add your Guidance below and it will show up on templates when that Tag is selected.",
         "createText": "Create guidance text",
-        "editGroup": "Edit group"
+        "editGroup": "Edit group information",
+        "noTags": "No guidance texts found in this group"
       },
       "groupCreate": {
         "title": "Create New Guidance Group",
@@ -562,9 +589,14 @@
     },
     "fields": {
       "groupName": {
-        "label": "Group Name",
+        "label": "Group name",
         "placeholder": "Enter group name"
       },
+      "groupDescription": {
+        "label": "Group description",
+        "placeholder": "Enter group description",
+        "helpText": "Optional - for internal use only"
+      },
       "title": {
         "label": "Title",
         "placeholder": "Enter guidance text title"
@@ -582,11 +614,16 @@
       }
     },
     "status": {
+      "publicationStatus": "Publication Status",
+      "lastPublished": "Last Published",
+      "notYetPublished": "Not yet published",
       "published": "Published",
       "draft": "Draft",
       "archived": "Archived",
       "lastUpdated": "Last Updated",
-      "status": "Status"
+      "status": "Status",
+      "unpublishedChanges": "Unpublished changes",
+      "publishedVersion": "Published Version"
     },
     "actions": {
       "createGroup": "Create Group",
@@ -606,7 +643,21 @@
     },
     "messages": {
       "noGroups": "No guidance groups found",
-      "noTexts": "No guidance texts found in this group"
+      "noTexts": "No guidance texts found in this group",
+      "loadingPleaseWait": "Loading, please wait...",
+      "unPublishBtnTooltipMessage": "Cannot unpublish guidance group because there are no published versions.",
+      "publishBtnTooltipMessage": "Guidance group is already published.",
+      "success": {
+        "guidanceGroupCreated": "Guidance group {groupName} successfully created",
+        "guidanceGroupPublished": "Guidance group {groupName} successfully published",
+        "guidanceGroupUnpublished": "Guidance group {groupName} successfully unpublished",
+        "guidanceGroupUpdated": "Guidance group {groupName} successfully updated",
+        "guidanceTextAdded": "Guidance text successfully added to {tagName}. The change(s) need to be published to take effect.",
+        "guidanceTextUpdated": "Guidance text for {tagName} successfully updated. The change(s) need to be published to take effect."
+      }
+    },
+    "labels": {
+      "optionalSubset": "Is this an optional subset for departmental use?"
     }
   },
   "Global": {
@@ -629,11 +680,14 @@
       "selectQuestionType": "Select Question Type",
       "project": "Project",
       "projects": "Projects",
+      "planDashboard": "Plan Dashboard",
+      "startDMP": "Start DMP",
       "projectOverview": "Project overview",
       "projectFunding": "Project funding",
       "projectFundingSearch": "Project funding search",
       "planOverview": "Plan overview",
       "planFunding": "Plan funding",
+      "downloadPlan": "Download plan",
       "sectionOverview": "Section overview",
       "feedback": "Feedback",
       "questionDetails": "Question details",
@@ -652,6 +706,7 @@
     "lastRevisedBy": "Last revised by",
     "lastUpdated": "Last updated",
     "published": "Published",
+    "draft": "Draft",
     "visibility": "Visibility",
     "notPublished": "Not published",
     "editTitle": "Edit title",
@@ -683,6 +738,8 @@
       "delete": "Delete",
       "preview": "Preview",
       "publish": "Publish",
+      "publishChanges": "Publish changes",
+      "unpublish": "Unpublish",
       "close": "Close",
       "closeModal": "Close modal",
       "loadMore": "Load more",
@@ -693,7 +750,8 @@
       "customize": "Customize",
       "applyFilter": "Apply filter(s)",
       "moreInfo": "More info",
-      "lessInfo": "Less info"
+      "lessInfo": "Less info",
+      "createNewPlan": "Create New DMP"
     },
     "labels": {
       "required": "required",
@@ -715,7 +773,7 @@
       "funderSearch": "Search by research organization, funder name, or related keywords."
     },
     "descriptions": {
-      "requiredFieldDescription": "Should this question include a warning to the plan builder that an answer is required as a condition of accepting the DMP?(Users will be able to submit the DMP even if they don't answer)"
+      "requiredFieldDescription": "Warn users that this is considered a required question for this DMP template by the organization. Users will be able to choose to ignore this within the tool and will not be required to answer before moving it."
     },
     "placeholders": {
       "funderSearch": "Enter funder name..."
@@ -741,6 +799,7 @@
       "unsupportedQuestionType": "Unsupported question type {questionType}",
       "sectionIsExpanded": "Section is expanded",
       "sectionIsCollapsed": "Section is collapsed",
+      "continueAnyway": "Continue anyway",
       "error": "Something went wrong. Please try again.",
       "errors": {
         "invalidQuestionType": "Invalid question type found.",
diff --git a/messages/en-US/planBuilderPlanOverview.json b/messages/en-US/planBuilderPlanOverview.json
index 86478d504..0b794424b 100644
--- a/messages/en-US/planBuilderPlanOverview.json
+++ b/messages/en-US/planBuilderPlanOverview.json
@@ -13,7 +13,8 @@
     },
     "headings": {
       "comments": "Comments",
-      "leaveAComment": "Leave a comment"
+      "leaveAComment": "Leave a comment",
+      "requirementsBy": "Requirements by {funder}"
     },
     "labels": {
       "saveAnswer": "Save answer",
@@ -28,7 +29,7 @@
       "jumpToGuidance": "Jump to additional guidance",
       "viewSampleAnswer": "View sample answer",
       "commentTooltip": "You need to save an answer before users can comment.",
-      "guidanceBy": "Guidance by {funder}",
+      "guidanceBy": "Guidance by {name}",
       "funderSampleText": "{funder} sample text",
       "participantsWillBeNotified": "Participants will be notified once submitted.",
       "planTitlePlaceholder": "Enter plan title"
@@ -77,7 +78,10 @@
         "title": "Download"
       },
       "feedback": {
-        "title": "Feedback"
+        "title": "Feedback",
+        "none": "No feedback",
+        "requested": "Feedback requested",
+        "completed": "Feedback received"
       }
     },
     "publishModal": {
@@ -256,5 +260,51 @@
         "encourageInfo": "Encourage your team to leave constructive comments or suggestions, this makes the collaborative process much smoother and ensures nothing is overlooked."
       }
     }
+  },
+  "ProjectsProjectPlanDownloadPage": {
+    "title": "Download plan",
+    "download": "Download",
+    "description": "You can download your Data Management Plan (DMP) in any of the formats listed below.",
+    "labels": {
+      "fileFormat": "File format",
+      "font": "Font",
+      "fontSize": "Font size",
+      "fontSizeUnit": "pt",
+      "includeCoverSheet": "Include a project details coversheet",
+      "includeSectionHeadings": "Include the section headings",
+      "includeQuestionText": "Include the question text",
+      "includeUnansweredQuestions": "Include any unanswered questions",
+      "top": "Top",
+      "bottom": "Bottom",
+      "left": "Left",
+      "right": "Right"
+    },
+    "downloadSection": {
+      "downloadText": "Download \"{fileName}.{fileExtension}\"",
+      "downloadButton": "Download {format}"
+    },
+    "headings": {
+      "chooseFileFormat": "Choose file format",
+      "settings": "Settings",
+      "formattingOptions": "Formatting options (PDF only)",
+      "font": "Font",
+      "fontSize": "Font size",
+      "margins": "Margins"
+    },
+    "bestPracticep1": "PDFs offer universal compatibility and preserve formatting across all devices and platforms, ensuring your document looks perfect every time - unlike Word documents. Choose PDF to guarantee a consistent, professional, and secure presentation for your documents. Plus, most Funders require that DMPs be submitted in PDF format.",
+    "bestPracticep2": "If your organization, funder or project have specific requirements, you can also download your DMP in HTML, CSV or JSON formats.",
+    "messages": {
+      "errors": {
+        "downloadFailed": "Download failed. Please try again."
+      }
+    }
+  },
+  "ProjectsProjectPlanNew": {
+    "title": "Add a Data Management Plan to your project",
+    "labels": {
+      "startNewPlan": "Create a plan in the DMP Tool",
+      "uploadExistingPlan": "Upload a plan created elsewhere",
+      "startNewOrUploadExisting": "Would you like to create a new plan or upload an existing one?"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/messages/en-US/planBuilderProjectOverview.json b/messages/en-US/planBuilderProjectOverview.json
index 224d03942..f862960a9 100644
--- a/messages/en-US/planBuilderProjectOverview.json
+++ b/messages/en-US/planBuilderProjectOverview.json
@@ -23,7 +23,6 @@
     "memberInfo": "{name} ({role})",
     "editMembers": "Edit project members",
     "editProjectMembers": "Edit project members",
-    "researchOutputs": "Research outputs",
     "outputCount": "{count, plural, =0 {0 outputs} one {1 output} other {{count} outputs}}",
     "editOutputs": "Edit research outputs",
     "editResearchOutputs": "Edit research outputs",
@@ -66,7 +65,7 @@
     }
   },
   "ProjectsListPage": {
-    "intro": "Manager or create DMSP project or by DMP",
+    "intro": "Manage your data management plans and projects. To create a new plan within the same research project, open the project below first and then create a new plan within it.",
     "buttons": {
       "createProject": "Create project"
     },
@@ -77,15 +76,13 @@
     }
   },
   "ProjectsCreateProject": {
-    "pageTitle": "Create a new project",
+    "pageTitle": "Create project details",
+    "description": "We'll start with asking for details about your research project so we can help you create the right data management plan for it. You can then add additional plans to the same project.",
     "isThisMockProject": "Is this a mock project?",
     "form": {
-      "projectTitle": "What is the title for the project?",
-      "projectTitleHelpText": "You can change this at any time. If you already applied for funding, we recommend using the formal project title for consistency.",
-      "checkboxGroupLabel": "This project is mock project for testing, practice, or educational purposes",
-      "checkboxGroupHelpText": "This is a mock project intended solely for testing, practice, or educational purposes. It allows you to create a project and plans, but you will not be able to receive feedback or publish them.",
-      "checkboxLabel": "Yes, set this project to a mock or a test project.",
-      "checkboxHelpText": "If you aim on publishing your DMSP eventually, we recommend leaving this unticked, so you get the full features. All real projects have a draft status you can use for testing."
+      "projectTitle": "What is the title of the research project for this DMP?",
+      "projectTitleHelpText": "You can change this at any time. If you already applied for funding, we recommend using the formal project title for consistency and to help find details in funder databases.",
+      "radioGroupLabel": "Is this a mock project for testing purposes or a real project?"
     },
     "messages": {
       "success": "Successfully created project",
@@ -94,6 +91,14 @@
         "title": "Project title is required",
         "createProjectError": "Error creating project"
       }
+    },
+    "labels": {
+      "mockProject": "Mock project",
+      "realProject": "Real project"
+    },
+    "descriptions": {
+      "mockProject": "For testing/educational purposes: cannot request feedback or publish plan, excluded from statistics.",
+      "realProject": "Full functionality. Cannot be changed back to Mock project."
     }
   },
   "ProjectsCreateProjectFunding": {
@@ -123,7 +128,7 @@
       "researchDomain": "Research domain",
       "mockProject": "Mock project",
       "realProject": "Real project",
-      "childDomain": "Select a subdomain for {name}:",
+      "childDomain": "Select a subdomain for {name}",
       "item": "Item"
     },
     "helpText": {
@@ -429,4 +434,4 @@
       "projectMemberSearch": "Project member search"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/messages/en-US/templateBuilder.json b/messages/en-US/templateBuilder.json
index f33d95e0b..bb6ffc4d2 100644
--- a/messages/en-US/templateBuilder.json
+++ b/messages/en-US/templateBuilder.json
@@ -282,22 +282,23 @@
       "sampleText": "Provide an example or template of expected answer (optional but recommended)",
       "sampleTextAsDefault": "Have this answer entered into the DMP by default",
       "previewText": "See how this question will look to users.",
-      "bestPracticePara1": "Keep the question concise and clear. Use the requirements or guidance to provide additional explanation.",
-      "bestPracticePara2": "Outline the requirements that a user must consider for this question.",
-      "bestPracticePara3": "Researchers will be able to copy the sample text into the field as a starting point, as a way to speed up content entry.",
+      "bestPracticePara1": "Keep the Question short so it can be used as a heading in the final DMP.",
+      "bestPracticePara2": "Use the Requirements to add more detailed instructions to the question, making sure to include all instructions for what needs to be answered in the question.",
+      "bestPracticePara3": "Use Guidance to add advice on how to come up with responses to the Question. Keep it concise and specific so they can get the information they need to respond to the question. You can add links to outside resources for longer policy documents that won't show up as well in the tool.",
       "deleteWarning": "This question will be removed from the template. This is not reversible."
     },
     "helpText": {
-      "textField": "Changing the question type, for example from Short question to Radio button, may result in some data being lost.",
+      "textField": "Changing the question type, for example from Text Field to Radio Buttons, may result in some data being lost.",
       "questionOptions": "Please enter answer choices for the {questionType}",
       "questionText": "Keep the question text concise and clear. Use the requirements or guidance to provide additional explanation.",
-      "requirementText": "Try to be precise and concise, so the plan writers won't miss any requirements. Question guidance is better for more general advice.",
+      "requirementText": "Use this for specific instructions on what researchers are required to include in their answer, such as what properties of their data they should be listing.",
+      "guidanceText": "Let researchers know how to best provide answers to the requirements, such as policies to consider from your organization or what factors to consider.",
       "sampleText": "Plan creators will be able to copy the sample text into the field as a starting point, to speed up content entry."
     },
     "labels": {
       "type": "Type",
       "questionText": "Question text",
-      "requirementText": "Requirements plan writer must meet (optional but recommended)",
+      "requirementText": "Question requirements (optional but recommended)",
       "guidanceText": "Question guidance (optional but recommended)",
       "sampleText": "Sample text"
     },
@@ -349,9 +350,9 @@
       "sampleText": "Provide an example or template of expected answer (optional but recommended)",
       "sampleTextAsDefault": "Have this answer entered into the DMP by default",
       "previewText": "See how this question will look to users.",
-      "bestPracticePara1": "Keep the question concise and clear. Use the requirements or guidance to provide additional explanation.",
-      "bestPracticePara2": "Outline the requirements that a user must consider for this question.",
-      "bestPracticePara3": "Researchers will be able to copy the sample text into the field as a starting point, as a way to speed up content entry."
+      "bestPracticePara1": "Keep the Question short so it can be used as a heading in the final DMP.",
+      "bestPracticePara2": "Use the Requirements to add more detailed instructions to the question, making sure to include all instructions for what needs to be answered in the question.",
+      "bestPracticePara3": "Use Guidance to add advice on how to come up with responses to the Question. Keep it concise and specific so they can get the information they need to respond to the question. You can add links to outside resources for longer policy documents that won't show up as well in the tool."
     },
     "labels": {
       "order": "Order",
@@ -359,21 +360,32 @@
       "default": "Default",
       "type": "Type",
       "questionText": "Question text",
-      "requirementText": "Requirements plan writer must meet (optional but recommended)",
+      "requirementText": "Question requirements (optional but recommended)",
       "guidanceText": "Question guidance (optional but recommended)",
       "sampleText": "Sample text",
-      "questionEditing": "Question editing"
+      "questionEditing": "Question editing",
+      "clickForMoreInfo": "Click for more info",
+      "typeDescription": "{type} description",
+      "accessLevelDescription": "{level} description",
+      "addCustomOutputType": "Add custom output type",
+      "addCustomAccessLevel": "Add custom access level",
+      "customTypeList": "Custom output types list",
+      "customAccessLevelList": "Custom access levels list",
+      "helpText": "Help text for {fieldName}"
     },
     "buttons": {
       "addRow": "Add Row",
       "previewQuestion": "Preview question",
-      "changeType": "Change type"
+      "changeType": "Change type",
+      "removeType": "Remove {type}",
+      "removeAccessLevel": "Remove {level}"
     },
     "helpText": {
-      "textField": "Changing the question type, for example from Short question to Radio button, may result in some data being lost.",
+      "textField": "Changing the question type, for example from Text Field to Radio Buttons, may result in some data being lost.",
       "questionOptions": "Please enter answer choices for the {questionName}",
       "questionText": "Keep the question text concise and clear. Use the requirements or guidance to provide additional explanation.",
-      "requirementText": "Try to be precise and concise, so the plan writers won't miss any requirements. Question guidance is better for more general advice.",
+      "requirementText": "Use this for specific instructions on what researchers are required to include in their answer, such as what properties of their data they should be listing.",
+      "guidanceText": "Let researchers know how to best provide answers to the requirements, such as policies to consider from your organization or what factors to consider.",
       "sampleText": "Plan creators will be able to copy the sample text into the field as a starting point, to speed up content entry."
     },
     "headings": {
@@ -391,6 +403,7 @@
       }
     },
     "researchOutput": {
+      "helpText": "Max length is 300 characters.",
       "headings": {
         "enableStandardFields": "Enable standard fields",
         "additionalTextFields": "Additional text fields"
@@ -483,7 +496,8 @@
       "outputType": {
         "labels": {
           "defineOutputTypes": "Define output types",
-          "enterOutputType": "Enter an output type",
+          "enterOutputType": "Enter type",
+          "typeDescription": "Type description",
           "removeOutputType": "Remove {type}"
         },
         "legends": {
@@ -494,6 +508,21 @@
           "addOutputType": "Add output type"
         }
       },
+      "accessLevels": {
+        "labels": {
+          "defineAccessLevels": "Define access levels",
+          "enterAccessLevel": "Enter access level",
+          "accessLevelDescription": "Access level description",
+          "removeAccessLevel": "Remove {level}"
+        },
+        "legends": {
+          "default": "Default Access Levels",
+          "myAccessLevels": "My Access Levels"
+        },
+        "buttons": {
+          "addAccessLevel": "Add access level"
+        }
+      },
       "licenses": {
         "labels": {
           "define": "Define preferred licenses",
@@ -513,7 +542,7 @@
         },
         "helpText": {
           "label": "Help text",
-          "helpText": "Optional help text to guide users"
+          "helpText": "Optional help text to guide users. Max length 300 characters."
         },
         "maxLength": {
           "label": "Maximum length",
diff --git a/messages/pt-BR/global.json b/messages/pt-BR/global.json
index 948d51fe6..c85a35518 100644
--- a/messages/pt-BR/global.json
+++ b/messages/pt-BR/global.json
@@ -1,8 +1,34 @@
 {
   "HomePage": {
     "title": "Página inicial",
-    "linkText": "Ir para a página de conexões",
-    "content": "É um fato estabelecido há muito tempo que um leitor se distrairá com o conteúdo legível de uma página ao observar sua disposição."
+    "createAndManage": {
+      "title": "Criar e Gerenciar",
+      "description": "Criar novos modelos e projetos"
+    },
+    "accountAndAdmin": {
+      "title": "Conta e Administração",
+      "description": "Gerenciar sua conta e acessar recursos administrativos"
+    },
+    "sections": {
+      "templateManagement": {
+        "title": "Gerenciamento de Modelos",
+        "description": "Criar e gerenciar modelos (É necessário ser administrador para acessar)"
+      },
+      "planDashboard": {
+        "title": "Painel de Planos",
+        "description": "Criar e gerenciar projetos"
+      },
+      "accountSettings": {
+        "title": "Configurações da Conta",
+        "description": "Visualizar e gerenciar sua conta"
+      },
+      "adminOverview": {
+        "title": "Visão Geral do Administrador",
+        "description": "Acessar funções administrativas"
+      }
+    },
+    "linkText": "Ir para a página de Conexões",
+    "content": "É um fato amplamente estabelecido que um leitor será distraído pelo conteúdo legível de uma página ao olhar para seu layout."
   },
   "About": {
     "title": "Bem-vindo à Ferramenta DMP"
@@ -11,7 +37,7 @@
     "menuDashboard": "Painel de controle",
     "menuUpload": "Carregar plano",
     "menuCreatePlan": "Criar plano",
-    "menuProjectsPlans": "Projetos e Planos",
+    "menuProjectsPlans": "Painel de Planos",
     "menuPublicPlans": "Planos públicos",
     "menuFunderRequirements": "Requisitos de Barbatana",
     "menuAbout": "Sobre",
@@ -530,7 +556,7 @@
         "createGroup": "Criar grupo de orientação"
       },
       "groupIndex": {
-        "title": "Textos de Orientação",
+        "title": "Editar {groupName}",
         "description": "Gerenciar os textos de orientação neste grupo",
         "createText": "Criar texto de orientação",
         "editGroup": "Editar grupo"
@@ -586,7 +612,12 @@
       "draft": "Rascunho",
       "archived": "Arquivado",
       "lastUpdated": "Última atualização",
-      "status": "SItuação"
+      "status": "SItuação",
+      "publicationStatus": "Status da Publicação",
+      "lastPublished": "Última publicação",
+      "notYetPublished": "Ainda não publicado",
+      "unpublishedChanges": "Alterações não publicadas",
+      "publishedVersion": "Versão publicada"
     },
     "actions": {
       "createGroup": "Criar grupo",
@@ -606,7 +637,18 @@
     },
     "messages": {
       "noGroups": "Não foram encontrados grupos de orientação",
-      "noTexts": "Não há textos de orientação encontrados neste grupo"
+      "noTexts": "Não há textos de orientação encontrados neste grupo",
+      "loadingPleaseWait": "Carregando, por favor aguarde...",
+      "unPublishBtnTooltipMessage": "Não é possível despublicar o grupo de orientação porque não há versões publicadas.",
+      "publishBtnTooltipMessage": "O grupo de orientação já está publicado.",
+      "success": {
+        "guidanceGroupCreated": "Grupo de orientação {groupName} criado com sucesso",
+        "guidanceGroupPublished": "Grupo de orientação {groupName} publicado com sucesso",
+        "guidanceGroupUnpublished": "Grupo de orientação {groupName} despublicado com sucesso",
+        "guidanceGroupUpdated": "Grupo de orientação {groupName} atualizado com sucesso",
+        "guidanceTextAdded": "Texto de orientação adicionado com sucesso a {tagName}. As alterações precisam ser publicadas para entrarem em vigor.",
+        "guidanceTextUpdated": "Texto de orientação para {tagName} atualizado com sucesso. As alterações precisam ser publicadas para entrarem em vigor."
+      }
     }
   },
   "Global": {
@@ -629,6 +671,8 @@
       "selectQuestionType": "Selecionar o tipo de questão",
       "project": "Projeto",
       "projects": "Projetos",
+      "planDashboard": "Painel do plano",
+      "startDMP": "Iniciar DMP",
       "projectOverview": "Visão geral do projeto",
       "projectFunding": "Orçamento do projeto",
       "projectFundingSearch": "Pesquisa de financiamento de projeto",
@@ -683,6 +727,8 @@
       "delete": "Apagar",
       "preview": "Pré-visualizar",
       "publish": "Publicar",
+      "publishChanges": "Publicar alterações",
+      "unpublish": "Despublicar",
       "close": "Fechar",
       "closeModal": "Fechar modal",
       "loadMore": "Carregar mais",
@@ -693,7 +739,8 @@
       "customize": "Personalizar",
       "applyFilter": "Aplicar filtro(s)",
       "moreInfo": "Mais informações",
-      "lessInfo": "Menos informações"
+      "lessInfo": "Menos informações",
+      "createNewPlan": "Criar novo DMP"
     },
     "labels": {
       "required": "Obrigatório",
@@ -715,7 +762,7 @@
       "funderSearch": "Pesquisar por organização de pesquisa, nome do financiador ou palavras-chave relacionadas."
     },
     "descriptions": {
-      "requiredFieldDescription": "Esta pergunta deve incluir um aviso para o construtor do plano de que é necessária uma resposta como condição para aceitar o DMP? Os usuários poderão enviar o DMP, mesmo se eles não responderem)"
+      "requiredFieldDescription": "Avise os usuários que esta é considerada uma pergunta obrigatória para este modelo de DMP pela organização. Os usuários poderão optar por ignorá-la na ferramenta e não precisarão respondê-la antes de prosseguir."
     },
     "placeholders": {
       "funderSearch": "Insira o nome da pasta"
@@ -741,6 +788,7 @@
       "unsupportedQuestionType": "Tipo de pergunta {questionType} sem suporte",
       "sectionIsExpanded": "Secção expandida",
       "sectionIsCollapsed": "Seção colapsada",
+      "continueAnyway": "Continuar assim mesmo",
       "error": "Ocorreu um erro. Tente novamente.",
       "errors": {
         "invalidQuestionType": "Tipo de questão inválido encontrado.",
diff --git a/messages/pt-BR/planBuilderPlanOverview.json b/messages/pt-BR/planBuilderPlanOverview.json
index 6a0880c11..325f8d14b 100644
--- a/messages/pt-BR/planBuilderPlanOverview.json
+++ b/messages/pt-BR/planBuilderPlanOverview.json
@@ -13,7 +13,8 @@
     },
     "headings": {
       "comments": "Comments",
-      "leaveAComment": "Deixar uma foto"
+      "leaveAComment": "Deixar uma foto",
+      "requirementsBy": "Requisitos definidos por {funder}"
     },
     "labels": {
       "saveAnswer": "Resposta salva",
@@ -28,7 +29,7 @@
       "jumpToGuidance": "Pule para orientação adicional",
       "viewSampleAnswer": "Ver amostra da resposta",
       "commentTooltip": "Você precisa salvar uma resposta antes que os usuários possam comentar.",
-      "guidanceBy": "Guia por {funder}",
+      "guidanceBy": "Guia por {name}",
       "funderSampleText": "{funder} texto de exemplo",
       "participantsWillBeNotified": "Os participantes serão notificados assim que submetidos.",
       "planTitlePlaceholder": "Inserir título do plano"
@@ -77,7 +78,10 @@
         "title": "Baixar"
       },
       "feedback": {
-        "title": "Registrar"
+        "title": "Registrar",
+        "none": "Sem feedback",
+        "requested": "Feedback solicitado",
+        "completed": "Feedback recebido"
       }
     },
     "publishModal": {
@@ -256,5 +260,51 @@
         "encourageInfo": "Incentive sua equipe a deixar comentários ou sugestões construtivas, isso torna o processo de colaboração muito mais suave e garante que nada é ignorado."
       }
     }
+  },
+  "ProjectsProjectPlanDownloadPage": {
+    "title": "Baixar plano",
+    "download": "Baixar",
+    "description": "Você pode baixar seu Plano de Gerenciamento de Dados (DMP) em qualquer um dos formatos listados abaixo.",
+    "labels": {
+      "fileFormat": "FFormato do arquivo",
+      "font": "Fonte",
+      "fontSize": "Tamanho da fonte",
+      "fontSizeUnit": "pt",
+      "includeCoverSheet": "Incluir uma folha de rosto com detalhes do projeto",
+      "includeSectionHeadings": "Incluir os títulos das seções",
+      "includeQuestionText": "Incluir o texto da pergunta",
+      "includeUnansweredQuestions": "Incluir quaisquer perguntas não respondidas",
+      "top": "Superior",
+      "bottom": "Inferior",
+      "left": "Esquerda",
+      "right": "Direita"
+    },
+    "downloadSection": {
+      "downloadText": "Baixar \"{fileName}.{fileExtension}\"",
+      "downloadButton": "Baixar {format}"
+    },
+    "headings": {
+      "chooseFileFormat": "Escolher formato de arquivo",
+      "settings": "Configurações",
+      "formattingOptions": "Opções de formatação (somente PDF)",
+      "font": "Fonte",
+      "fontSize": "Tamanho da fonte",
+      "margins": "Margens"
+    },
+    "bestPracticep1": "PDFs oferecem compatibilidade universal e preservam a formatação em todos os dispositivos e plataformas, garantindo que seu documento tenha uma aparência perfeita a cada vez - ao contrário dos documentos do Word. Escolha PDF para garantir uma apresentação consistente, profissional e segura para seus documentos. Além disso, a maioria dos financiadores exige que os DMPs sejam enviados em formato PDF.",
+    "bestPracticep2": "Se sua organização, financiador ou projeto tiver requisitos específicos, você também pode baixar seu DMP nos formatos HTML, CSV ou JSON.",
+    "messages": {
+      "errors": {
+        "downloadFailed": "Falha no download. Por favor, tente novamente."
+      }
+    }
+  },
+  "ProjectsProjectPlanNew": {
+    "title": "Adicionar um Plano de Gerenciamento de Dados ao seu projeto",
+    "labels": {
+      "startNewPlan": "Criar um plano na ferramenta DMP",
+      "uploadExistingPlan": "Carregar um plano criado em outro lugar",
+      "startNewOrUploadExisting": "Você gostaria de criar um novo plano ou carregar um existente?"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/messages/pt-BR/planBuilderProjectOverview.json b/messages/pt-BR/planBuilderProjectOverview.json
index 9d9fe48f5..781e5007f 100644
--- a/messages/pt-BR/planBuilderProjectOverview.json
+++ b/messages/pt-BR/planBuilderProjectOverview.json
@@ -23,10 +23,6 @@
     "memberInfo": "{name} ({role})",
     "editMembers": "Editar Detalhes do Projeto",
     "editProjectMembers": "Editar Detalhes do Projeto",
-    "researchOutputs": "Resultados da pesquisa",
-    "outputCount": "{count, plural, =0 {0 outputs} one {1 output} other {{count} outputs}}",
-    "editOutputs": "Editar resultados de pesquisa",
-    "editResearchOutputs": "Editar resultados de pesquisa",
     "plan": "Planejamento",
     "plans": "Planos",
     "sections": "Turmas",
@@ -66,7 +62,7 @@
     }
   },
   "ProjectsListPage": {
-    "intro": "Gerenciador ou criar projeto DMSP ou por DMP",
+    "intro": "Gerencie seus planos de gerenciamento de dados e projetos. Para criar um novo plano dentro do mesmo projeto de pesquisa, abra o projeto abaixo primeiro e depois crie um novo plano dentro dele.",
     "buttons": {
       "createProject": "Criar projeto"
     },
@@ -77,15 +73,13 @@
     }
   },
   "ProjectsCreateProject": {
-    "pageTitle": "Criar um novo blog",
+    "pageTitle": "Criar detalhes do projeto",
+    "description": "Começaremos pedindo detalhes sobre seu projeto de pesquisa para que possamos ajudá-lo a criar o plano de gerenciamento de dados certo para ele. Você pode então adicionar planos adicionais ao mesmo projeto.",
     "isThisMockProject": "Este é um projeto fictício?",
     "form": {
-      "projectTitle": "Qual é o título do projeto?",
+      "projectTitle": "Qual é o título do projeto de pesquisa para este DMP?",
       "projectTitleHelpText": "Você pode mudar isso a qualquer momento. Se já solicitou financiamento, recomendamos que se utilize o título formal do projeto para ser consistente.",
-      "checkboxGroupLabel": "Este projeto é uma simulação (mock, em inglês) para fins de teste, prática ou educacional",
-      "checkboxGroupHelpText": "Este é um projeto simulado (mock, em inglês) destinado exclusivamente a testes, práticas ou propósitos educativos. Isso permite que você crie um projeto e planos, mas você não poderá receber comentários ou publicá-los.",
-      "checkboxLabel": "Sim, defina este projeto para um simulação (mock, em inglês) ou um projeto de teste.",
-      "checkboxHelpText": "Sim, defina este projeto para um simulação (mock, em inglês) ou um projeto de teste."
+      "radioGroupLabel": "Este é um projeto fictício para fins de teste ou um projeto real?"
     },
     "messages": {
       "success": "Projeto criado com sucesso",
@@ -94,6 +88,14 @@
         "title": "Título do projeto é obrigatório",
         "createProjectError": "Erro ao criar projeto"
       }
+    },
+    "labels": {
+      "mockProject": "Projeto simulado",
+      "realProject": "Projeto real"
+    },
+    "descriptions": {
+      "mockProject": "Para fins de teste/educação: não é possível solicitar feedback ou publicar plano, excluído das estatísticas.",
+      "realProject": "Funcionalidade completa. Não pode ser alterado de volta para projeto fictício."
     }
   },
   "ProjectsCreateProjectFunding": {
@@ -123,7 +125,7 @@
       "researchDomain": "Domínio de pesquisa",
       "mockProject": "Projeto fictício",
       "realProject": "Projeto real",
-      "childDomain": "Selecione um subdomínio para {name}:",
+      "childDomain": "Selecione um subdomínio para {name}",
       "item": "Produto"
     },
     "helpText": {
@@ -429,4 +431,4 @@
       "projectMemberSearch": "Busca de membros"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/messages/pt-BR/templateBuilder.json b/messages/pt-BR/templateBuilder.json
index 7990e1318..8439f810c 100644
--- a/messages/pt-BR/templateBuilder.json
+++ b/messages/pt-BR/templateBuilder.json
@@ -282,22 +282,23 @@
       "sampleText": "Forneça um exemplo ou modelo de resposta esperada (opcional, mas recomendado)",
       "sampleTextAsDefault": "Peça que esta resposta entre no DMP por padrão",
       "previewText": "Veja como esta pergunta ficará para os usuários.",
-      "bestPracticePara1": "Mantenha a pergunta concisa e clara. Use os requisitos ou orientações para fornecer explicações adicionais.",
-      "bestPracticePara2": "Esboça os requisitos que um usuário deve considerar para esta pergunta.",
-      "bestPracticePara3": "Pesquisadores poderão copiar o texto de amostra para o campo como ponto de partida, como uma maneira de acelerar a entrada de conteúdo.",
+      "bestPracticePara1": "Mantenha a pergunta concisa para que possa ser usada como título no DMP final.",
+      "bestPracticePara2": "Utilize os Requisitos para adicionar instruções mais detalhadas à pergunta, certificando-se de incluir todas as instruções sobre o que precisa ser respondido na pergunta.",
+      "bestPracticePara3": "Use a seção de Orientações para adicionar conselhos sobre como elaborar respostas para a pergunta. Seja conciso e específico para que os usuários possam obter as informações necessárias para responder à pergunta. Você pode adicionar links para recursos externos, como documentos de políticas mais extensos que não aparecem tão bem na ferramenta.",
       "deleteWarning": "Esta pergunta será removida do modelo. Isso não é reversível."
     },
     "helpText": {
-      "textField": "Alterar o tipo de questão, por exemplo, da pergunta curta para o botão Rádio, pode resultar na perda de alguns dados.",
+      "textField": "Alterar o tipo de pergunta, por exemplo, de Campo de Texto para Botões de Opção, pode resultar na perda de alguns dados.",
       "questionOptions": "Por favor, insira as opções de resposta para o {questionType}",
       "questionText": "Mantenha a pergunta concisa e clara. Use os requisitos ou orientações para fornecer explicações adicionais.",
-      "requirementText": "Tente ser preciso e conciso, para que os autores do plano não faltem a quaisquer requisitos. Orientação às perguntas é melhor para conselhos mais gerais.",
+      "requirementText": "Use isto para obter instruções específicas sobre o que os pesquisadores devem incluir em suas respostas, como por exemplo, quais propriedades dos dados eles devem listar.",
+      "guidanceText": "Informe aos pesquisadores como fornecer as melhores respostas aos requisitos, como políticas a serem consideradas da sua organização ou quais fatores levar em conta.",
       "sampleText": "Pesquisadores poderão copiar o texto de amostra para o campo como ponto de partida, como uma maneira de acelerar a entrada de conteúdo."
     },
     "labels": {
       "type": "Tipo",
       "questionText": "Texto da questão",
-      "requirementText": "Escritor do plano de requisitos deve atender (opcional, mas recomendado)",
+      "requirementText": "Requisitos de perguntas (opcional, mas recomendado)",
       "guidanceText": "Orientação para perguntas (opcional mas recomendado)",
       "sampleText": "Texto de amostra"
     },
@@ -349,9 +350,9 @@
       "sampleText": "Forneça um exemplo ou modelo de resposta esperada (opcional, mas recomendado)",
       "sampleTextAsDefault": "Peça que esta resposta entre no DMP por padrão",
       "previewText": "Veja como esta pergunta ficará para os usuários.",
-      "bestPracticePara1": "Mantenha a pergunta concisa e clara. Use os requisitos ou orientações para fornecer explicações adicionais.",
-      "bestPracticePara2": "Esboça os requisitos que um usuário deve considerar para esta pergunta.",
-      "bestPracticePara3": "Pesquisadores poderão copiar o texto de amostra para o campo como ponto de partida, como uma maneira de acelerar a entrada de conteúdo."
+      "bestPracticePara1": "Mantenha a pergunta concisa para que possa ser usada como título no DMP final.",
+      "bestPracticePara2": "Utilize os Requisitos para adicionar instruções mais detalhadas à pergunta, certificando-se de incluir todas as instruções sobre o que precisa ser respondido na pergunta.",
+      "bestPracticePara3": "Use a seção de Orientações para adicionar conselhos sobre como elaborar respostas para a pergunta. Seja conciso e específico para que os usuários possam obter as informações necessárias para responder à pergunta. Você pode adicionar links para recursos externos, como documentos de políticas mais extensos que não aparecem tão bem na ferramenta."
     },
     "labels": {
       "order": "Ordem",
@@ -359,10 +360,18 @@
       "default": "Padrão",
       "type": "Tipo",
       "questionText": "Texto da pergunta",
-      "requirementText": "Escritor do plano de requisitos deve atender (opcional, mas recomendado)",
+      "requirementText": "Requisitos de perguntas (opcional, mas recomendado)",
       "guidanceText": "Orientação para perguntas (opcional mas recomendado)",
       "sampleText": "Texto de amostra",
-      "questionEditing": "Edição da questão"
+      "questionEditing": "Edição da questão",
+      "clickForMoreInfo": "Clique para mais informações",
+      "typeDescription": "{type} descrição",
+      "accessLevelDescription": "{level} descrição",
+      "addCustomOutputType": "Adicionar tipo de saída personalizado",
+      "addCustomAccessLevel": "Adicionar nível de acesso personalizado",
+      "customTypeList": "Lista de tipos de saída personalizados",
+      "customAccessLevelList": "Lista de níveis de acesso personalizados",
+      "helpText": "Texto de ajuda para {fieldName}"
     },
     "buttons": {
       "addRow": "Adicionar linha",
@@ -370,10 +379,11 @@
       "changeType": "Mudar os Tipos"
     },
     "helpText": {
-      "textField": "Alterar o tipo de questão, por exemplo, da pergunta curta para o botão Rádio, pode resultar na perda de alguns dados.",
+      "textField": "Alterar o tipo de pergunta, por exemplo, de Campo de Texto para Botões de Opção, pode resultar na perda de alguns dados.",
       "questionOptions": "Por favor, insira as opções de resposta para o {questionName}",
       "questionText": "Mantenha a pergunta concisa e clara. Use os requisitos ou orientações para fornecer explicações adicionais.",
-      "requirementText": "Tente ser preciso e conciso, para que os autores do plano não faltem a quaisquer requisitos. Orientação às perguntas é melhor para conselhos mais gerais.",
+      "requirementText": "Use isto para obter instruções específicas sobre o que os pesquisadores devem incluir em suas respostas, como por exemplo, quais propriedades dos dados eles devem listar.",
+      "guidanceText": "Informe aos pesquisadores como fornecer as melhores respostas aos requisitos, como políticas a serem consideradas da sua organização ou quais fatores levar em conta.",
       "sampleText": "Os criadores de planos poderão copiar o texto da amostra para o campo como ponto de partida, para acelerar a entrada de conteúdo."
     },
     "headings": {
@@ -391,6 +401,7 @@
       }
     },
     "researchOutput": {
+      "helpText": "O comprimento máximo é de 300 caracteres.",
       "headings": {
         "enableStandardFields": "Ativar campos padrão"
       },
@@ -493,6 +504,21 @@
           "addOutputType": "Adicionar tipo de saída"
         }
       },
+      "accessLevels": {
+        "labels": {
+          "defineAccessLevels": "Definir níveis de acesso",
+          "enterAccessLevel": "Insira o nível de acesso",
+          "accessLevelDescription": "Descrição do nível de acesso",
+          "removeAccessLevel": "Remover {level}"
+        },
+        "legends": {
+          "default": "Níveis de acesso padrão",
+          "myAccessLevels": "Meus níveis de acesso"
+        },
+        "buttons": {
+          "addAccessLevel": "Adicionar nível de acesso"
+        }
+      },
       "licenses": {
         "labels": {
           "define": "Definir licenças preferidas",
@@ -510,18 +536,18 @@
           "helpText": "O rótulo que será exibido para este campo"
         },
         "helpText": {
-          "label": "Help text",
-          "helpText": "Optional help text to guide users"
+          "label": "Texto de ajuda",
+          "helpText": "Texto de ajuda opcional para orientar os usuários. Comprimento máximo de 300 caracteres."
         },
         "maxLength": {
-          "label": "Maximum length",
-          "helpText": "Maximum number of characters allowed (leave empty for no limit)"
+          "label": "Comprimento máximo",
+          "helpText": "Número máximo de caracteres permitidos (deixe vazio para sem limite)"
         },
         "defaultValue": {
-          "label": "Default value",
-          "helpText": "Default value for this field"
+          "label": "Valor padrão",
+          "helpText": "Valor padrão para este campo"
         },
-        "addFieldBtn": "Add additional field"
+        "addFieldBtn": "Adicionar campo adicional"
       }
     }
   },
diff --git a/middleware.ts b/middleware.ts
index 3d105ab2e..986f7c916 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -129,14 +129,12 @@ export async function middleware(request: NextRequest) {
         // We need to redirect to the same URL to ensure cookies are set properly in browser
         const newResponse = NextResponse.redirect(request.url);
 
-        // Copy Set-Cookie headers from backend → NextResponse
-        const setCookie = backendResponse.headers.get("set-cookie");
-        if (setCookie) {
-          // Multiple cookies can be comma-separated, handle them individually
-          setCookie.split(",").forEach(cookie => {
-            newResponse.headers.append("set-cookie", cookie);
-          });
-        }
+        // Copy Set-Cookie headers from backend response to NextResponse
+        backendResponse.headers.forEach((value, key) => {
+          if (key.toLowerCase() === 'set-cookie') {
+            newResponse.headers.append('set-cookie', value);
+          }
+        });
 
         return newResponse;
       }
diff --git a/package-lock.json b/package-lock.json
index 4d33c950a..434994ee1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,13 +25,13 @@
         "@typescript-eslint/parser": "8.34.0",
         "classnames": "2.5.1",
         "deepmerge": "4.3.1",
-        "dompurify": "3.2.6",
+        "dompurify": "3.3.0",
         "graphql": "16.11.0",
         "husky": "9.0.11",
         "jose": "6.0.11",
         "jsonwebtoken": "9.0.2",
         "loglevel": "1.9.2",
-        "next": "15.5.2",
+        "next": "15.5.7",
         "next-intl": "4.1.0",
         "node-fetch": "3.3.1",
         "pino": "9.12.0",
@@ -58,7 +58,7 @@
         "@types/sanitize-html": "2.16.0",
         "brace-expansion": "2.0.2",
         "cypress": "14.5.4",
-        "dotenv": "16.5.0",
+        "dotenv": "16.6.1",
         "eslint": "9.28.0",
         "eslint-config-next": "15.3.3",
         "eslint-plugin-unused-imports": "4.1.4",
@@ -81,7 +81,6 @@
       "version": "3.13.8",
       "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.13.8.tgz",
       "integrity": "sha512-YM9lQpm0VfVco4DSyKooHS/fDTiKQcCHfxr7i3iL6a0kP/jNO5+4NFK6vtRDxaYisd5BrwOZHLJpPBnvRVpKPg==",
-      "peer": true,
       "dependencies": {
         "@graphql-typed-document-node/core": "^3.1.1",
         "@wry/caches": "^1.0.0",
@@ -250,7 +249,6 @@
       "version": "7.28.4",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
       "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -1225,7 +1223,6 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1248,7 +1245,6 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -1632,7 +1628,6 @@
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.6.0.tgz",
       "integrity": "sha512-KHwPkCk6oRT4HADE7smhfsKudt9N/9lm6EJ5BVg0tD1yPA5hht837fB87F8pn15D8JfTqQOjhKTktwmLMiD7Kg==",
-      "peer": true,
       "dependencies": {
         "@fortawesome/fontawesome-common-types": "6.6.0"
       },
@@ -3394,10 +3389,11 @@
       }
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -4076,7 +4072,6 @@
       "integrity": "sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/environment": "30.2.0",
         "@jest/expect": "30.2.0",
@@ -4438,9 +4433,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.2.tgz",
-      "integrity": "sha512-Qe06ew4zt12LeO6N7j8/nULSOe3fMXE4dM6xgpBQNvdzyK1sv5y4oAP3bq4LamrvGCZtmRYnW8URFCeX5nFgGg==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.7.tgz",
+      "integrity": "sha512-4h6Y2NyEkIEN7Z8YxkA27pq6zTkS09bUSYC0xjd0NpwFxjnIKeZEeH591o5WECSmjpUhLn3H2QLJcDye3Uzcvg==",
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
@@ -4481,9 +4476,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.2.tgz",
-      "integrity": "sha512-8bGt577BXGSd4iqFygmzIfTYizHb0LGWqH+qgIF/2EDxS5JsSdERJKA8WgwDyNBZgTIIA4D8qUtoQHmxIIquoQ==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.7.tgz",
+      "integrity": "sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw==",
       "cpu": [
         "arm64"
       ],
@@ -4497,9 +4492,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.2.tgz",
-      "integrity": "sha512-2DjnmR6JHK4X+dgTXt5/sOCu/7yPtqpYt8s8hLkHFK3MGkka2snTv3yRMdHvuRtJVkPwCGsvBSwmoQCHatauFQ==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.7.tgz",
+      "integrity": "sha512-UP6CaDBcqaCBuiq/gfCEJw7sPEoX1aIjZHnBWN9v9qYHQdMKvCKcAVs4OX1vIjeE+tC5EIuwDTVIoXpUes29lg==",
       "cpu": [
         "x64"
       ],
@@ -4513,9 +4508,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.2.tgz",
-      "integrity": "sha512-3j7SWDBS2Wov/L9q0mFJtEvQ5miIqfO4l7d2m9Mo06ddsgUK8gWfHGgbjdFlCp2Ek7MmMQZSxpGFqcC8zGh2AA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.7.tgz",
+      "integrity": "sha512-NCslw3GrNIw7OgmRBxHtdWFQYhexoUCq+0oS2ccjyYLtcn1SzGzeM54jpTFonIMUjNbHmpKpziXnpxhSWLcmBA==",
       "cpu": [
         "arm64"
       ],
@@ -4529,9 +4524,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.2.tgz",
-      "integrity": "sha512-s6N8k8dF9YGc5T01UPQ08yxsK6fUow5gG1/axWc1HVVBYQBgOjca4oUZF7s4p+kwhkB1bDSGR8QznWrFZ/Rt5g==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.7.tgz",
+      "integrity": "sha512-nfymt+SE5cvtTrG9u1wdoxBr9bVB7mtKTcj0ltRn6gkP/2Nu1zM5ei8rwP9qKQP0Y//umK+TtkKgNtfboBxRrw==",
       "cpu": [
         "arm64"
       ],
@@ -4545,9 +4540,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.2.tgz",
-      "integrity": "sha512-o1RV/KOODQh6dM6ZRJGZbc+MOAHww33Vbs5JC9Mp1gDk8cpEO+cYC/l7rweiEalkSm5/1WGa4zY7xrNwObN4+Q==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.7.tgz",
+      "integrity": "sha512-hvXcZvCaaEbCZcVzcY7E1uXN9xWZfFvkNHwbe/n4OkRhFWrs1J1QV+4U1BN06tXLdaS4DazEGXwgqnu/VMcmqw==",
       "cpu": [
         "x64"
       ],
@@ -4561,9 +4556,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.2.tgz",
-      "integrity": "sha512-/VUnh7w8RElYZ0IV83nUcP/J4KJ6LLYliiBIri3p3aW2giF+PAVgZb6mk8jbQSB3WlTai8gEmCAr7kptFa1H6g==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.7.tgz",
+      "integrity": "sha512-4IUO539b8FmF0odY6/SqANJdgwn1xs1GkPO5doZugwZ3ETF6JUdckk7RGmsfSf7ws8Qb2YB5It33mvNL/0acqA==",
       "cpu": [
         "x64"
       ],
@@ -4577,9 +4572,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.2.tgz",
-      "integrity": "sha512-sMPyTvRcNKXseNQ/7qRfVRLa0VhR0esmQ29DD6pqvG71+JdVnESJaHPA8t7bc67KD5spP3+DOCNLhqlEI2ZgQg==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.7.tgz",
+      "integrity": "sha512-CpJVTkYI3ZajQkC5vajM7/ApKJUOlm6uP4BknM3XKvJ7VXAvCqSjSLmM0LKdYzn6nBJVSjdclx8nYJSa3xlTgQ==",
       "cpu": [
         "arm64"
       ],
@@ -4593,9 +4588,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.2.tgz",
-      "integrity": "sha512-W5VvyZHnxG/2ukhZF/9Ikdra5fdNftxI6ybeVKYvBPDtyx7x4jPPSNduUkfH5fo3zG0JQ0bPxgy41af2JX5D4Q==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.7.tgz",
+      "integrity": "sha512-gMzgBX164I6DN+9/PGA+9dQiwmTkE4TloBNx8Kv9UiGARsr9Nba7IpcBRA1iTV9vwlYnrE3Uy6I7Aj6qLjQuqw==",
       "cpu": [
         "x64"
       ],
@@ -4649,279 +4644,6 @@
         "node": ">=12.4.0"
       }
     },
-    "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -6986,7 +6708,8 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -7068,7 +6791,6 @@
       "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "expect": "^29.0.0",
         "pretty-format": "^29.0.0"
@@ -7199,7 +6921,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz",
       "integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -7226,7 +6947,6 @@
       "integrity": "sha512-RFA/bURkcKzx/X9oumPG9Vp3D3JUgus/d0b67KB0t5S/raciymilkOa66olh78MUI92QLbEJevO7rvqU/kjwKA==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -7238,7 +6958,6 @@
       "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "@types/react": "^18.0.0"
       }
@@ -7909,7 +7628,6 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -8603,7 +8321,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.3",
         "caniuse-lite": "^1.0.30001741",
@@ -9623,19 +9340,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -9691,7 +9395,8 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/dom-serializer": {
       "version": "2.0.0",
@@ -9732,9 +9437,10 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz",
-      "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.0.tgz",
+      "integrity": "sha512-r+f6MYR1gGN1eJv0TVQbhA7if/U7P87cdPl3HN5rikqaBSBxLiCb/b9O+2eG0cxz0ghyU+mU1QkbsOwERMYlWQ==",
+      "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
       }
@@ -9762,9 +9468,10 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.5.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
-      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       },
@@ -9857,7 +9564,6 @@
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
       "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "ansi-colors": "^4.1.1",
         "strip-ansi": "^6.0.1"
@@ -10077,7 +9783,6 @@
       "version": "9.28.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
       "integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -10245,7 +9950,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -11182,9 +10886,9 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -11309,7 +11013,6 @@
       "version": "16.11.0",
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.11.0.tgz",
       "integrity": "sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw==",
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
@@ -11382,7 +11085,6 @@
       "version": "6.0.6",
       "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-6.0.6.tgz",
       "integrity": "sha512-zgfER9s+ftkGKUZgc0xbx8T7/HMO4AV5/YuYiFc+AtgcO5T0v8AxYYNQ+ltzuzDZgNkYJaFspm5MMYLjQzrkmw==",
-      "peer": true,
       "engines": {
         "node": ">=20"
       },
@@ -12523,7 +12225,6 @@
       "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/core": "30.2.0",
         "@jest/types": "30.2.0",
@@ -14409,9 +14110,10 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -14430,7 +14132,6 @@
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -14893,6 +14594,7 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
+      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -15127,13 +14829,12 @@
       }
     },
     "node_modules/next": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.5.2.tgz",
-      "integrity": "sha512-H8Otr7abj1glFhbGnvUt3gz++0AF1+QoCXEBmd/6aKbfdFwrn0LpA836Ed5+00va/7HQSDD+mOoVhn3tNy3e/Q==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/next/-/next-15.5.7.tgz",
+      "integrity": "sha512-+t2/0jIJ48kUpGKkdlhgkv+zPTEOoXyr60qXe68eB/pl3CMJaLeIGjzp5D6Oqt25hCBiBTt8wEeeAzfJvUKnPQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@next/env": "15.5.2",
+        "@next/env": "15.5.7",
         "@swc/helpers": "0.5.15",
         "caniuse-lite": "^1.0.30001579",
         "postcss": "8.4.31",
@@ -15146,14 +14847,14 @@
         "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.5.2",
-        "@next/swc-darwin-x64": "15.5.2",
-        "@next/swc-linux-arm64-gnu": "15.5.2",
-        "@next/swc-linux-arm64-musl": "15.5.2",
-        "@next/swc-linux-x64-gnu": "15.5.2",
-        "@next/swc-linux-x64-musl": "15.5.2",
-        "@next/swc-win32-arm64-msvc": "15.5.2",
-        "@next/swc-win32-x64-msvc": "15.5.2",
+        "@next/swc-darwin-arm64": "15.5.7",
+        "@next/swc-darwin-x64": "15.5.7",
+        "@next/swc-linux-arm64-gnu": "15.5.7",
+        "@next/swc-linux-arm64-musl": "15.5.7",
+        "@next/swc-linux-x64-gnu": "15.5.7",
+        "@next/swc-linux-x64-musl": "15.5.7",
+        "@next/swc-win32-arm64-msvc": "15.5.7",
+        "@next/swc-win32-x64-msvc": "15.5.7",
         "sharp": "^0.34.3"
       },
       "peerDependencies": {
@@ -15231,13 +14932,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/node-domexception": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
@@ -15988,6 +15682,7 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -16002,6 +15697,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -16013,7 +15709,8 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/process": {
       "version": "0.11.10",
@@ -16142,7 +15839,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
       "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16247,7 +15943,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
       "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -16674,7 +16369,6 @@
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
       "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -17611,7 +17305,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -17741,7 +17434,6 @@
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -17945,7 +17637,6 @@
       "version": "5.8.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -18482,7 +18173,6 @@
       "version": "8.18.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
       "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -18615,7 +18305,6 @@
       "version": "3.24.4",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz",
       "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index 49e0cafb7..71cda76b6 100644
--- a/package.json
+++ b/package.json
@@ -40,13 +40,13 @@
     "@typescript-eslint/parser": "8.34.0",
     "classnames": "2.5.1",
     "deepmerge": "4.3.1",
-    "dompurify": "3.2.6",
+    "dompurify": "3.3.0",
     "graphql": "16.11.0",
     "husky": "9.0.11",
     "jose": "6.0.11",
     "jsonwebtoken": "9.0.2",
     "loglevel": "1.9.2",
-    "next": "15.5.2",
+    "next": "15.5.7",
     "next-intl": "4.1.0",
     "node-fetch": "3.3.1",
     "pino": "9.12.0",
@@ -73,7 +73,7 @@
     "@types/sanitize-html": "2.16.0",
     "brace-expansion": "2.0.2",
     "cypress": "14.5.4",
-    "dotenv": "16.5.0",
+    "dotenv": "16.6.1",
     "eslint": "9.28.0",
     "eslint-config-next": "15.3.3",
     "eslint-plugin-unused-imports": "4.1.4",
diff --git a/styles/_elements.scss b/styles/_elements.scss
index c366d9780..7fb73dc96 100644
--- a/styles/_elements.scss
+++ b/styles/_elements.scss
@@ -85,7 +85,11 @@
   background: var(--background-color);
   color: var(--text-color);
   outline: none;
-  max-width: 250px;
+  max-width: fit-content; // On mobile span width of content
+
+    @include r.device(sm) { // On desktop, limit to 300px
+      max-width: 300px;
+    }
 
   .react-aria-OverlayArrow svg {
     display: block;
@@ -657,7 +661,6 @@
   }
 }
 
-
 // This is used to contain the content of a section
 .sectionContainer {
   margin-top: var(--space-6);
diff --git a/styles/form/_button.scss b/styles/form/_button.scss
index 54d54e1ca..63d91cf0f 100644
--- a/styles/form/_button.scss
+++ b/styles/form/_button.scss
@@ -71,7 +71,7 @@
 }
 
 @mixin button-secondary {
-  background: transparent;
+  background: var(--bg-white);
 
   // box-shadow makes border appear on the inside of button, keeping it same size as primary button, as opposed to
   // border, which renders the border on the outside of the button, making secondary larger than primary. An
@@ -334,5 +334,33 @@ button.medium {
   display: flex;
   gap: 10px; // Space between buttons
   align-items: flex-start;
+  justify-content: space-around;
+
+}
+
+// For info icon buttons used in popovers
+.popover-btn {
+  display: inline-flex;
+  align-items: center;
+  background: none;
+  padding: 0 0 0 0.1rem;
+  border: none;
+  vertical-align: middle;
+  cursor: pointer;
+
+  &:hover {
+    background: none !important;
+  }
 
-}
\ No newline at end of file
+  .icon.info {
+    svg {
+      fill: var(--blue-500);
+      width: 20px;
+      height: 20px;
+
+      &:hover {
+        fill: var(--blue-900);
+      }
+    }
+  }
+}
diff --git a/styles/form/_checkbox.scss b/styles/form/_checkbox.scss
index e509f5b20..938c62ef9 100644
--- a/styles/form/_checkbox.scss
+++ b/styles/form/_checkbox.scss
@@ -133,20 +133,6 @@
     }
   }
 
-  .popover-btn {
-    display: inline-flex;
-    align-items: center;
-    background: none;
-    padding: 0 0 0 0.25rem;
-    border: none;
-    vertical-align: middle;
-    cursor: pointer;
-
-    &:hover {
-      background: none;
-    }
-  }
-
   .checkbox-wrapper {
     display: inline-flex;
     white-space: wrap;
diff --git a/styles/form/_radio.scss b/styles/form/_radio.scss
index 6e02f47ea..54134d6b2 100644
--- a/styles/form/_radio.scss
+++ b/styles/form/_radio.scss
@@ -7,6 +7,10 @@
   label {
     font-weight: 400;
   }
+
+  div {
+    margin-bottom: var(--space-2);
+  }
 }
 
 .react-aria-Radio {
diff --git a/tsconfig.json b/tsconfig.json
index ed7e9ebb2..b1c810620 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -46,6 +46,7 @@
     "node_modules",
     "cypress",
     "./cypress.config.ts",
-    "**/cypress.config.ts"
+    "**/cypress.config.ts",
+    ".next"
   ]
 }
diff --git a/utils/authHelper.ts b/utils/authHelper.ts
index 1113b9eae..ef224c61e 100644
--- a/utils/authHelper.ts
+++ b/utils/authHelper.ts
@@ -33,82 +33,114 @@ export class AuthError extends Error {
 
 
 export const refreshAuthTokens = async (cookies?: string) => {
+  // Use SERVER_ENDPOINT for server-side (middleware), NEXT_PUBLIC_SERVER_ENDPOINT for client-side
+  const endpoint = cookies ? process.env.SERVER_ENDPOINT : process.env.NEXT_PUBLIC_SERVER_ENDPOINT;
   try {
-    // Get CSRF token first
-    const crsfFetchResponse = await fetchCsrfToken(cookies);
-    if (crsfFetchResponse) {
-      const csrfToken = crsfFetchResponse.headers.get('X-CSRF-TOKEN');
-      if (!csrfToken) {
-        throw new AuthError({
-          status: 403,
-          message: "Forbidden. No csrf token",
-          source: "refreshAuthTokens",
-        });
-      }
+    // Get CSRF token first using GET request (doesn't require CSRF validation)
+    const csrfFetchResponse = await fetchCsrfToken(cookies, endpoint);
+
+    if (!csrfFetchResponse || !csrfFetchResponse.ok) {
+      throw new AuthError({
+        status: csrfFetchResponse?.status || 500,
+        message: "Failed to fetch CSRF token",
+        source: "refreshAuthTokens",
+      });
+    }
+
+    const csrfToken = csrfFetchResponse.headers.get('X-CSRF-TOKEN');
+
+    if (!csrfToken) {
+      throw new AuthError({
+        status: 403,
+        message: "Forbidden. No CSRF token returned from server",
+        source: "refreshAuthTokens",
+      });
+    }
+
+    // Refresh auth tokens using POST request (requires CSRF token)
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+      'X-CSRF-TOKEN': csrfToken,
+    };
+
+    const fetchOptions: RequestInit = {
+      method: 'POST',
+      headers
+    };
+
+    // Server-side request: manually pass cookies, don't use credentials: 'include'
+    if (cookies) {
+      headers['Cookie'] = cookies;
+    } else {
+      // Client-side request: use credentials: 'include'
+      fetchOptions.credentials = 'include';
+    }
+
+    const response = await fetch(`${endpoint}/apollo-refresh`, fetchOptions);
 
-      try {
-        // Refresh auth tokens
-        const headers: Record<string, string> = {
-          'Content-Type': 'application/json',
-          'X-CSRF-TOKEN': csrfToken,
-          Cookie: cookies || '',
-        };
-
-
-        //Refresh auth tokens
-        const response = await fetch(`${process.env.NEXT_PUBLIC_SERVER_ENDPOINT}/apollo-refresh`, {
-          method: 'POST',
-          credentials: 'include',// This is needed or else the frontend can't access the csrf token in the header
-          headers
-        });
-
-        if (!response.ok) {
-          if (response.status === 401) {
-            // Handle unauthorized access for server
-            return { shouldRedirect: true, redirectTo: '/login' };
-          }
-          throw new AuthError({
-            status: response.status,
-            message: "Error in response from refreshing auth tokens",
-            source: 'refreshAuthTokens',
-          });
-        }
-
-        if (response) {
-          const message = await response.json();
-          return { response, message };
-        }
-      } catch (err) {
-        throw new AuthError({
-          status: null,
-          message: `Error refreshing auth tokens ${err}`,
-          source: 'refreshAuthTokens',
-        });
+    if (!response.ok) {
+      if (response.status === 401) {
+        // Handle unauthorized access - token refresh failed, redirect to login
+        return { shouldRedirect: true, redirectTo: '/login' };
       }
+      throw new AuthError({
+        status: response.status,
+        message: `Error refreshing auth tokens: ${response.statusText}`,
+        source: 'refreshAuthTokens',
+      });
     }
 
+    const message = await response.json();
+    return { response, message };
+
   } catch (err) {
+    if (err instanceof AuthError) {
+      throw err;
+    }
     logECS('error', `Error refreshing auth token: ${err}`, {
       source: 'refreshAuthTokens'
     });
-    throw new Error('Error refreshing auth token');
+    // Return redirect for any auth-related errors
+    return { shouldRedirect: true, redirectTo: '/login' };
   }
 };
 
 
-//Function to fetch CSRF token from the backend
-export const fetchCsrfToken = async (cookies?: string) => {
+//Function to fetch CSRF token from the backend (GET request - no CSRF validation needed)
+export const fetchCsrfToken = async (cookies?: string, endpoint?: string) => {
   try {
-    const response = await fetch(`${process.env.NEXT_PUBLIC_SERVER_ENDPOINT}/apollo-csrf`, {
-      credentials: 'include',// This is needed or else the frontend can't access the csrf token in the header
-      headers: {
-        ...(cookies ? { Cookie: cookies } : {}),
-      },
-    });
+    // Use SERVER_ENDPOINT for server-side (middleware), NEXT_PUBLIC_SERVER_ENDPOINT for client-side
+    const serverUrl = endpoint || (cookies ? process.env.SERVER_ENDPOINT : process.env.NEXT_PUBLIC_SERVER_ENDPOINT);
+
+    const headers: Record<string, string> = {};
+    const fetchOptions: RequestInit = {
+      method: 'GET',
+      headers,
+    };
+
+    // Server-side request: manually pass cookies, don't use credentials: 'include'
+    if (cookies) {
+      headers['Cookie'] = cookies;
+      // When manually setting Cookie header, we should NOT use credentials: 'include'
+    } else {
+      // Client-side request: use credentials: 'include' to send cookies automatically
+      fetchOptions.credentials = 'include';
+    }
+
+    const response = await fetch(`${serverUrl}/apollo-csrf`, fetchOptions);
+
+    if (!response.ok) {
+      const errorText = await response.text().catch(() => 'Could not read error body');
+      logECS('error', `Failed to fetch CSRF token: ${response.status} ${response.statusText} - ${errorText}`, {
+        source: 'fetchCsrfToken'
+      });
+      return null;
+    }
+
     return response;
   } catch (err) {
     logECS('error', `Error getting csrf token from backend: ${err}`, {
-      source: 'CsrfProvider'
+      source: 'fetchCsrfToken'
     });
     return null;
   }
diff --git a/utils/general.ts b/utils/general.ts
index f5200c64e..f08c3a470 100644
--- a/utils/general.ts
+++ b/utils/general.ts
@@ -44,10 +44,10 @@ export const stripHtmlTags = (input: string | null | undefined, tagsToRemove?: s
       // Remove only the specified tags
       const pattern = `<\\/?(?:${tagsToRemove.join('|')})\\b[^>]*>`;
       const regex = new RegExp(pattern, 'gi');
-      return input.replace(regex, ' ');
+      return input.replace(regex, ' ').replace(/&nbsp;/g, ' ');
     } else {
       // Remove all tags
-      return input.replace(/<[^>]*>/g, ' ');
+      return input.replace(/<[^>]*>/g, ' ').replace(/&nbsp;/g, ' ');
     }
   }
   return '';
diff --git a/utils/routes.ts b/utils/routes.ts
index edd7990d6..663e1742d 100644
--- a/utils/routes.ts
+++ b/utils/routes.ts
@@ -70,6 +70,7 @@ const routes = {
 
   // DMP (Data Management Plan) routes
   'projects.dmp.index': '/projects/:projectId/dmp',
+  'projects.dmp.start': '/projects/:projectId/dmp/start',
   'projects.dmp.show': '/projects/:projectId/dmp/:dmpId',
   'projects.dmp.download': '/projects/:projectId/dmp/:dmpId/download',
   'projects.dmp.fundings': '/projects/:projectId/dmp/:dmpId/fundings',
@@ -78,6 +79,7 @@ const routes = {
   'projects.dmp.versionedQuestion.detail': '/projects/:projectId/dmp/:dmpId/s/:versionedSectionId/q/:versionedQuestionId',
   'projects.dmp.versionedSection': '/projects/:projectId/dmp/:dmpId/s/:versionedSectionId',
   'projects.dmp.create': '/projects/:projectId/dmp/create',
+  'projects.dmp.upload': '/projects/:projectId/dmp/upload',
 
   'projects.dmp.feedback': '/projects/:projectId/dmp/:dmpId/feedback',
   'projects.collaboration': '/projects/:projectId/collaboration',
@@ -111,7 +113,7 @@ const routes = {
   'admin.notifications': '/admin/notifications',
   'admin.templates': '/admin/templates',
   'admin.templateCustomizations': '/admin/template-customizations',
-  
+
   // Guidance routes
   'admin.guidance.index': '/admin/guidance',
   'admin.guidance.groups.index': '/admin/guidance/groups/:groupId',
@@ -119,7 +121,7 @@ const routes = {
   'admin.guidance.groups.create': '/admin/guidance/groups/create',
   'admin.guidance.groups.texts.create': '/admin/guidance/groups/:groupId/create',
   'admin.guidance.groups.texts.edit': '/admin/guidance/groups/:groupId/edit/:textId',
-  
+
   'admin.projects': '/admin/projects',
   'admin.organizationDetails': '/admin/organization-details',
   'admin.departments': '/admin/departments',