diff --git a/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap
index f369adcf06..b23b9f61df 100644
--- a/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap
@@ -156,12 +156,12 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
-                    data-scroll="abbreviation"
+                    data-scroll="plan-basics-abbreviation"
                   >
                     <label
                       class="usa-label"
                       data-testid="label"
-                      for="plan-basics-model-name"
+                      for="plan-basics-abbreviation"
                     >
                       Short name
                     </label>
@@ -214,7 +214,7 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects
                       >
                         <div
                           class="usa-form-group margin-top-0"
-                          data-scroll="basics.amsModelID"
+                          data-scroll="plan-basics-ams-model-id"
                         >
                           <label
                             class="usa-label"
@@ -239,7 +239,7 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects
                       >
                         <div
                           class="usa-form-group margin-top-0"
-                          data-scroll="basics.demoCode"
+                          data-scroll="plan-basics-demo-code"
                         >
                           <label
                             class="usa-label"
@@ -262,7 +262,7 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
-                    data-scroll="modelCategory"
+                    data-scroll="plan-basics-model-category"
                   >
                     <label
                       class="usa-label"
@@ -675,11 +675,12 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
+                    data-scroll="plan-basics-model-additional-category"
                   >
                     <label
                       class="usa-label text-normal"
                       data-testid="label"
-                      for="basics.additionalModelCategories"
+                      for="plan-basics-model-additional-category"
                     >
                       Additional model categories
                     </label>
@@ -1070,154 +1071,150 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
-                    data-scroll="cmsCenters"
+                    data-scroll="new-plan-cmsCenters"
                   >
-                    <fieldset
-                      class="usa-fieldset"
-                      data-testid="fieldset"
+                    <label
+                      class="usa-label"
+                      data-testid="label"
+                      for="new-plan-cmsCenters"
                     >
+                      CMS component
+                      <span
+                        aria-label="(Field required)"
+                        class="text-red margin-x-05"
+                      >
+                        *
+                      </span>
+                    </label>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CMMI"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CMMI"
+                      />
                       <label
-                        class="usa-label"
-                        data-testid="label"
-                        for="plan-basics-cmsCenters"
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CMMI"
                       >
-                        CMS component
-                        <span
-                          aria-label="(Field required)"
-                          class="text-red margin-x-05"
-                        >
-                          *
-                        </span>
+                        Center for Medicare and Medicaid Innovation (CMMI)
                       </label>
-                      <div
-                        class="mint-checkbox usa-checkbox"
-                      >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CMMI"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CMMI"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CMMI"
-                        >
-                          Center for Medicare and Medicaid Innovation (CMMI)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
-                        >
-                          Center for Clinical Standards and Quality (CCSQ)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Center for Clinical Standards and Quality (CCSQ)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
-                        >
-                          Center for Medicaid and CHIP Services (CMCS)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Center for Medicaid and CHIP Services (CMCS)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_MEDICARE"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_MEDICARE"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
-                        >
-                          Center for Medicare (CM)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Center for Medicare (CM)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
-                        >
-                          Federal Coordinated Health Care Office (FCHCO)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Federal Coordinated Health Care Office (FCHCO)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_PROGRAM_INTEGRITY"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_PROGRAM_INTEGRITY"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
-                        >
-                          Center for Program Integrity (CPI)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                    </fieldset>
+                        Center for Program Integrity (CPI)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
+                    data-scroll="new-plan-cmmiGroup"
                   >
                     <label
                       class="usa-label text-normal"
                       data-testid="label"
-                      for="basics.cmmiGroups"
+                      for="new-plan-cmmiGroup"
                     >
                       CMMI Group
                     </label>
@@ -1572,12 +1569,12 @@ exports[`Model Plan Basics page > matches snapshot 1`] = `
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
-                    data-scroll="abbreviation"
+                    data-scroll="plan-basics-abbreviation"
                   >
                     <label
                       class="usa-label"
                       data-testid="label"
-                      for="plan-basics-model-name"
+                      for="plan-basics-abbreviation"
                     >
                       Short name
                     </label>
@@ -1630,7 +1627,7 @@ exports[`Model Plan Basics page > matches snapshot 1`] = `
                       >
                         <div
                           class="usa-form-group margin-top-0"
-                          data-scroll="basics.amsModelID"
+                          data-scroll="plan-basics-ams-model-id"
                         >
                           <label
                             class="usa-label"
@@ -1655,7 +1652,7 @@ exports[`Model Plan Basics page > matches snapshot 1`] = `
                       >
                         <div
                           class="usa-form-group margin-top-0"
-                          data-scroll="basics.demoCode"
+                          data-scroll="plan-basics-demo-code"
                         >
                           <label
                             class="usa-label"
@@ -1678,7 +1675,7 @@ exports[`Model Plan Basics page > matches snapshot 1`] = `
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
-                    data-scroll="modelCategory"
+                    data-scroll="plan-basics-model-category"
                   >
                     <label
                       class="usa-label"
@@ -2091,11 +2088,12 @@ exports[`Model Plan Basics page > matches snapshot 1`] = `
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
+                    data-scroll="plan-basics-model-additional-category"
                   >
                     <label
                       class="usa-label text-normal"
                       data-testid="label"
-                      for="basics.additionalModelCategories"
+                      for="plan-basics-model-additional-category"
                     >
                       Additional model categories
                     </label>
@@ -2486,154 +2484,150 @@ exports[`Model Plan Basics page > matches snapshot 1`] = `
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
-                    data-scroll="cmsCenters"
+                    data-scroll="new-plan-cmsCenters"
                   >
-                    <fieldset
-                      class="usa-fieldset"
-                      data-testid="fieldset"
+                    <label
+                      class="usa-label"
+                      data-testid="label"
+                      for="new-plan-cmsCenters"
                     >
+                      CMS component
+                      <span
+                        aria-label="(Field required)"
+                        class="text-red margin-x-05"
+                      >
+                        *
+                      </span>
+                    </label>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CMMI"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CMMI"
+                      />
                       <label
-                        class="usa-label"
-                        data-testid="label"
-                        for="plan-basics-cmsCenters"
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CMMI"
                       >
-                        CMS component
-                        <span
-                          aria-label="(Field required)"
-                          class="text-red margin-x-05"
-                        >
-                          *
-                        </span>
+                        Center for Medicare and Medicaid Innovation (CMMI)
                       </label>
-                      <div
-                        class="mint-checkbox usa-checkbox"
-                      >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CMMI"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CMMI"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CMMI"
-                        >
-                          Center for Medicare and Medicaid Innovation (CMMI)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_CLINICAL_STANDARDS_AND_QUALITY"
-                        >
-                          Center for Clinical Standards and Quality (CCSQ)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Center for Clinical Standards and Quality (CCSQ)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_MEDICAID_AND_CHIP_SERVICES"
-                        >
-                          Center for Medicaid and CHIP Services (CMCS)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Center for Medicaid and CHIP Services (CMCS)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_MEDICARE"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_MEDICARE"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_MEDICARE"
-                        >
-                          Center for Medicare (CM)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Center for Medicare (CM)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-FEDERAL_COORDINATED_HEALTH_CARE_OFFICE"
-                        >
-                          Federal Coordinated Health Care Office (FCHCO)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                      <div
-                        class="mint-checkbox usa-checkbox"
+                        Federal Coordinated Health Care Office (FCHCO)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
+                    <div
+                      class="mint-checkbox usa-checkbox"
+                    >
+                      <input
+                        class="usa-checkbox__input"
+                        id="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
+                        name="basics.cmsCenters"
+                        type="checkbox"
+                        value="CENTER_FOR_PROGRAM_INTEGRITY"
+                      />
+                      <label
+                        class="usa-checkbox__label"
+                        for="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
                       >
-                        <input
-                          class="usa-checkbox__input"
-                          id="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
-                          name="basics.cmsCenters"
-                          type="checkbox"
-                          value="CENTER_FOR_PROGRAM_INTEGRITY"
-                        />
-                        <label
-                          class="usa-checkbox__label"
-                          for="new-plan-cmsCenters-CENTER_FOR_PROGRAM_INTEGRITY"
-                        >
-                          Center for Program Integrity (CPI)
-                        </label>
-                        <p
-                          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-                        />
-                      </div>
-                    </fieldset>
+                        Center for Program Integrity (CPI)
+                      </label>
+                      <p
+                        class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+                      />
+                    </div>
                   </div>
                   <div
                     class="usa-form-group margin-top-4"
+                    data-scroll="new-plan-cmmiGroup"
                   >
                     <label
                       class="usa-label text-normal"
                       data-testid="label"
-                      for="basics.cmmiGroups"
+                      for="new-plan-cmmiGroup"
                     >
                       CMMI Group
                     </label>
diff --git a/src/views/ModelPlan/TaskList/Basics/index.tsx b/src/views/ModelPlan/TaskList/Basics/index.tsx
index d9eb320d07..06e2a28209 100644
--- a/src/views/ModelPlan/TaskList/Basics/index.tsx
+++ b/src/views/ModelPlan/TaskList/Basics/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useRef, useState } from 'react';
+import React, { Fragment, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, Route, Switch, useHistory, useParams } from 'react-router-dom';
 import {
@@ -17,7 +17,7 @@ import {
   TextInput
 } from '@trussworks/react-uswds';
 import classNames from 'classnames';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   CmsCenter,
   GetBasicsQuery,
@@ -70,10 +70,6 @@ const BasicsContent = () => {
 
   const history = useHistory();
 
-  const [areCmmiGroupsShown, setAreCmmiGroupsShown] = useState(
-    formikRef?.current?.values.basics.cmsCenters.includes(CmsCenter.CMMI)
-  );
-
   const { data, loading, error } = useGetBasicsQuery({
     variables: {
       id: modelID
@@ -274,11 +270,11 @@ const BasicsContent = () => {
                         </FieldGroup>
 
                         <FieldGroup
-                          scrollElement="abbreviation"
+                          scrollElement="plan-basics-abbreviation"
                           error={!!flatErrors.abbreviation}
                           className="margin-top-4"
                         >
-                          <Label htmlFor="plan-basics-model-name">
+                          <Label htmlFor="plan-basics-abbreviation">
                             {modelPlanT('abbreviation.label')}
                           </Label>
 
@@ -331,7 +327,7 @@ const BasicsContent = () => {
                           <Grid row gap>
                             <Grid desktop={{ col: 6 }}>
                               <FieldGroup
-                                scrollElement="basics.amsModelID"
+                                scrollElement="plan-basics-ams-model-id"
                                 error={!!flatErrors['basics.amsModelID']}
                                 className="margin-top-0"
                               >
@@ -353,7 +349,7 @@ const BasicsContent = () => {
                             </Grid>
                             <Grid desktop={{ col: 6 }}>
                               <FieldGroup
-                                scrollElement="basics.demoCode"
+                                scrollElement="plan-basics-demo-code"
                                 error={!!flatErrors['basics.demoCode']}
                                 className="margin-top-0"
                               >
@@ -377,7 +373,7 @@ const BasicsContent = () => {
                         </div>
 
                         <FieldGroup
-                          scrollElement="modelCategory"
+                          scrollElement="plan-basics-model-category"
                           error={!!flatErrors['basics.modelCategory']}
                           className="margin-top-4"
                         >
@@ -421,6 +417,8 @@ const BasicsContent = () => {
                                   }
                                   value={key}
                                   checked={values.basics.modelCategory === key}
+                                  // the onChange below is necessary to have a dynamic interaction
+                                  // with the Additional Model Categories question
                                   onChange={() => {
                                     setFieldValue('basics.modelCategory', key);
                                     if (
@@ -443,13 +441,14 @@ const BasicsContent = () => {
                         </FieldGroup>
 
                         <FieldGroup
+                          scrollElement="plan-basics-model-additional-category"
                           error={
                             !!flatErrors['basics.additionalModelCategories']
                           }
                           className="margin-top-4"
                         >
                           <Label
-                            htmlFor="basics.additionalModelCategories"
+                            htmlFor="plan-basics-model-additional-category"
                             className="text-normal"
                           >
                             {basicsT('additionalModelCategories.label')}
@@ -510,73 +509,43 @@ const BasicsContent = () => {
                         </FieldGroup>
 
                         <FieldGroup
-                          scrollElement="cmsCenters"
+                          scrollElement="new-plan-cmsCenters"
                           error={!!flatErrors['basics.cmsCenters']}
                           className="margin-top-4"
                         >
-                          <Fieldset>
-                            <FieldArray
-                              name="basics.cmsCenters"
-                              render={arrayHelpers => (
-                                <>
-                                  <Label htmlFor="plan-basics-cmsCenters">
-                                    {basicsT('cmsCenters.label')}
-                                    <RequiredAsterisk />
-                                  </Label>
-
-                                  <FieldErrorMsg>
-                                    {flatErrors['basics.cmsCenters']}
-                                  </FieldErrorMsg>
-
-                                  {getKeys(cmsCentersConfig.options).map(
-                                    center => {
-                                      return (
-                                        <Field
-                                          key={center}
-                                          as={CheckboxField}
-                                          id={`new-plan-cmsCenters-${center}`}
-                                          name="basics.cmsCenters"
-                                          label={
-                                            cmsCentersConfig.options[center]
-                                          }
-                                          value={center}
-                                          checked={values.basics.cmsCenters.includes(
-                                            center
-                                          )}
-                                          onChange={(
-                                            e: React.ChangeEvent<HTMLInputElement>
-                                          ) => {
-                                            if (e.target.checked) {
-                                              arrayHelpers.push(e.target.value);
-                                            } else {
-                                              const idx = values.basics.cmsCenters.indexOf(
-                                                e.target.value as CmsCenter
-                                              );
-                                              arrayHelpers.remove(idx);
-                                            }
-                                            if (
-                                              e.target.value === CmsCenter.CMMI
-                                            ) {
-                                              setAreCmmiGroupsShown(
-                                                !areCmmiGroupsShown
-                                              );
-                                            }
-                                          }}
-                                        />
-                                      );
-                                    }
-                                  )}
-                                </>
-                              )}
-                            />
-                          </Fieldset>
+                          <Label htmlFor="new-plan-cmsCenters">
+                            {basicsT('cmsCenters.label')}
+                            <RequiredAsterisk />
+                          </Label>
+
+                          <FieldErrorMsg>
+                            {flatErrors['basics.cmsCenters']}
+                          </FieldErrorMsg>
+
+                          {getKeys(cmsCentersConfig.options).map(center => {
+                            return (
+                              <Field
+                                key={center}
+                                as={CheckboxField}
+                                id={`new-plan-cmsCenters-${center}`}
+                                name="basics.cmsCenters"
+                                label={cmsCentersConfig.options[center]}
+                                value={center}
+                                checked={values.basics.cmsCenters.includes(
+                                  center
+                                )}
+                              />
+                            );
+                          })}
                         </FieldGroup>
+
                         <FieldGroup
+                          scrollElement="new-plan-cmmiGroup"
                           error={!!flatErrors['basics.cmmiGroups']}
                           className="margin-top-4"
                         >
                           <Label
-                            htmlFor="basics.cmmiGroups"
+                            htmlFor="new-plan-cmmiGroup"
                             className="text-normal"
                           >
                             {basicsT('cmmiGroups.label')}
diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap
index edac36ba67..b31bbe93a2 100644
--- a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap
@@ -111,7 +111,7 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = `
           >
             <div
               class="usa-form-group"
-              data-scroll="numberPeopleImpacted"
+              data-scroll="expected-people-impacted"
             >
               <label
                 class="usa-label"
diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx
index 2674148aed..3c755db075 100644
--- a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx
+++ b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx
@@ -205,7 +205,7 @@ const PeopleImpact = () => {
                     >
                       <Fieldset disabled={!!error || loading}>
                         <FieldGroup
-                          scrollElement="numberPeopleImpacted"
+                          scrollElement="expected-people-impacted"
                           error={!!flatErrors.numberPeopleImpacted}
                         >
                           <Label htmlFor="expected-people-impacted">
@@ -293,9 +293,6 @@ const PeopleImpact = () => {
                                   label={estimateConfidenceConfig.options[key]}
                                   value={key}
                                   checked={values.estimateConfidence === key}
-                                  onChange={() => {
-                                    setFieldValue('estimateConfidence', key);
-                                  }}
                                 />
                               )
                             )}
diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap
index ecac42ac09..1b5a8fbba2 100644
--- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap
@@ -99,7 +99,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
     >
       <div
         class="usa-form-group margin-y-4"
-        data-scroll="rulemakingRequired"
+        data-scroll="plan-characteristics-rulemaking-required"
       >
         <label
           class="usa-label"
@@ -136,7 +136,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
           >
             <div
               class="usa-form-group flex-1"
-              data-scroll="rulemakingRequiredDescription"
+              data-scroll="plan-characteristics-rulemaking-required-description"
             >
               <label
                 class="usa-label margin-bottom-1 text-normal"
@@ -204,12 +204,15 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group"
+        data-scroll="plan-characteristics-authority-allowance"
       >
-        <legend
+        <label
           class="usa-label"
+          data-testid="label"
+          for="plan-characteristics-authority-allowance"
         >
           What authority allows CMMI to test the model?
-        </legend>
+        </label>
         <div
           class="mint-checkbox usa-checkbox"
         >
@@ -318,7 +321,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-y-4"
-        data-scroll="waiversRequired"
+        data-scroll="plan-characteristics-waivers-required"
       >
         <label
           class="usa-label"
@@ -371,9 +374,6 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
           </div>
         </fieldset>
       </div>
-      <div
-        class="usa-form-group"
-      />
       <div
         class="margin-top-4 margin-bottom-8"
       >
diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx
index 59c2900cef..fdfc5eeb22 100644
--- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx
+++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx
@@ -8,15 +8,15 @@ import {
   Button,
   Fieldset,
   Icon,
-  Label
+  Label,
+  TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   AuthorityAllowance,
   GetAuthorityQuery,
   useGetAuthorityQuery,
-  useUpdatePlanGeneralCharacteristicsMutation,
-  WaiverType
+  useUpdatePlanGeneralCharacteristicsMutation
 } from 'gql/gen/graphql';
 
 import AddNote from 'components/AddNote';
@@ -229,7 +229,7 @@ const Authority = () => {
               >
                 <Fieldset disabled={!!error || loading}>
                   <FieldGroup
-                    scrollElement="rulemakingRequired"
+                    scrollElement="plan-characteristics-rulemaking-required"
                     error={!!flatErrors.rulemakingRequired}
                     className="margin-y-4"
                   >
@@ -253,7 +253,7 @@ const Authority = () => {
                         <div className="display-flex margin-left-4 margin-bottom-1">
                           <FieldGroup
                             className="flex-1"
-                            scrollElement="rulemakingRequiredDescription"
+                            scrollElement="plan-characteristics-rulemaking-required-description"
                             error={!!flatErrors.rulemakingRequiredDescription}
                           >
                             <Label
@@ -290,88 +290,55 @@ const Authority = () => {
                     field="rulemakingRequiredNote"
                   />
 
-                  <FieldGroup>
-                    <FieldArray
-                      name="authorityAllowances"
-                      render={arrayHelpers => (
-                        <>
-                          <legend className="usa-label">
-                            {generalCharacteristicsT(
-                              'authorityAllowances.label'
+                  <FieldGroup scrollElement="plan-characteristics-authority-allowance">
+                    <Label htmlFor="plan-characteristics-authority-allowance">
+                      {generalCharacteristicsT('authorityAllowances.label')}
+                    </Label>
+                    <FieldErrorMsg>
+                      {flatErrors.authorityAllowances}
+                    </FieldErrorMsg>
+
+                    {getKeys(authorityAllowancesConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`plan-characteristics-authority-allowance-${type}`}
+                            name="authorityAllowances"
+                            label={authorityAllowancesConfig.options[type]}
+                            value={type}
+                            checked={values.authorityAllowances.includes(type)}
+                          />
+                          {type === AuthorityAllowance.OTHER &&
+                            values.authorityAllowances.includes(type) && (
+                              <FieldGroup
+                                scrollElement="plan-characteristics-authority-allowance-other"
+                                className="margin-left-4 margin-top-2 margin-bottom-4"
+                                error={!!flatErrors.authorityAllowancesOther}
+                              >
+                                <Label
+                                  htmlFor="plan-characteristics-authority-allowance-other"
+                                  className="text-normal"
+                                >
+                                  {generalCharacteristicsT(
+                                    'authorityAllowancesOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.authorityAllowancesOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="plan-characteristics-authority-allowance-other"
+                                  name="authorityAllowancesOther"
+                                />
+                              </FieldGroup>
                             )}
-                          </legend>
-
-                          <FieldErrorMsg>
-                            {flatErrors.authorityAllowances}
-                          </FieldErrorMsg>
-
-                          {getKeys(authorityAllowancesConfig.options).map(
-                            type => {
-                              return (
-                                <Fragment key={type}>
-                                  <Field
-                                    as={CheckboxField}
-                                    id={`plan-characteristics-authority-allowance-${type}`}
-                                    name="authorityAllowances"
-                                    label={
-                                      authorityAllowancesConfig.options[type]
-                                    }
-                                    value={type}
-                                    checked={values.authorityAllowances.includes(
-                                      type
-                                    )}
-                                    onChange={(
-                                      e: React.ChangeEvent<HTMLInputElement>
-                                    ) => {
-                                      if (e.target.checked) {
-                                        arrayHelpers.push(e.target.value);
-                                      } else {
-                                        const idx = values.authorityAllowances.indexOf(
-                                          e.target.value as AuthorityAllowance
-                                        );
-                                        arrayHelpers.remove(idx);
-                                      }
-                                    }}
-                                  />
-                                  {type === AuthorityAllowance.OTHER &&
-                                    values.authorityAllowances.includes(
-                                      type
-                                    ) && (
-                                      <FieldGroup
-                                        className="margin-left-4 margin-top-2 margin-bottom-4"
-                                        error={
-                                          !!flatErrors.authorityAllowancesOther
-                                        }
-                                      >
-                                        <Label
-                                          htmlFor="plan-characteristics-authority-allowance-other"
-                                          className="text-normal"
-                                        >
-                                          {generalCharacteristicsT(
-                                            'authorityAllowancesOther.label'
-                                          )}
-                                        </Label>
-
-                                        <FieldErrorMsg>
-                                          {flatErrors.authorityAllowancesOther}
-                                        </FieldErrorMsg>
-
-                                        <Field
-                                          as={TextAreaField}
-                                          className="mint-textarea"
-                                          id="plan-characteristics-authority-allowance-other"
-                                          maxLength={5000}
-                                          name="authorityAllowancesOther"
-                                        />
-                                      </FieldGroup>
-                                    )}
-                                </Fragment>
-                              );
-                            }
-                          )}
-                        </>
-                      )}
-                    />
+                        </Fragment>
+                      );
+                    })}
                   </FieldGroup>
 
                   <AddNote
@@ -380,7 +347,7 @@ const Authority = () => {
                   />
 
                   <FieldGroup
-                    scrollElement="waiversRequired"
+                    scrollElement="plan-characteristics-waivers-required"
                     error={!!flatErrors.waiversRequired}
                     className="margin-y-4"
                   >
@@ -399,63 +366,37 @@ const Authority = () => {
                     />
                   </FieldGroup>
 
-                  <FieldGroup>
-                    {values.waiversRequired && (
-                      <FieldArray
-                        name="waiversRequiredTypes"
-                        render={arrayHelpers => (
-                          <>
-                            <legend className="usa-label text-normal">
-                              {generalCharacteristicsT(
-                                'waiversRequiredTypes.label'
-                              )}
-                            </legend>
+                  {values.waiversRequired && (
+                    <FieldGroup scrollElement="plan-characteristics-waiver-types">
+                      <Label htmlFor="plan-characteristics-waiver-types">
+                        {generalCharacteristicsT('waiversRequiredTypes.label')}
+                      </Label>
 
-                            <FieldErrorMsg>
-                              {flatErrors.waiversRequiredTypes}
-                            </FieldErrorMsg>
+                      <FieldErrorMsg>
+                        {flatErrors.waiversRequiredTypes}
+                      </FieldErrorMsg>
 
-                            {getKeys(waiversRequiredTypesConfig.options).map(
-                              type => {
-                                return (
-                                  <Fragment key={type}>
-                                    <Field
-                                      as={CheckboxField}
-                                      id={`plan-characteristics-waiver-types-${type}`}
-                                      name="waiversRequiredTypes"
-                                      label={
-                                        waiversRequiredTypesConfig.options[type]
-                                      }
-                                      subLabel={
-                                        waiversRequiredTypesConfig
-                                          .optionsLabels?.[type]
-                                      }
-                                      value={type}
-                                      checked={values.waiversRequiredTypes.includes(
-                                        type
-                                      )}
-                                      onChange={(
-                                        e: React.ChangeEvent<HTMLInputElement>
-                                      ) => {
-                                        if (e.target.checked) {
-                                          arrayHelpers.push(e.target.value);
-                                        } else {
-                                          const idx = values.waiversRequiredTypes.indexOf(
-                                            e.target.value as WaiverType
-                                          );
-                                          arrayHelpers.remove(idx);
-                                        }
-                                      }}
-                                    />
-                                  </Fragment>
-                                );
+                      {getKeys(waiversRequiredTypesConfig.options).map(type => {
+                        return (
+                          <Fragment key={type}>
+                            <Field
+                              as={CheckboxField}
+                              id={`plan-characteristics-waiver-types-${type}`}
+                              name="waiversRequiredTypes"
+                              label={waiversRequiredTypesConfig.options[type]}
+                              subLabel={
+                                waiversRequiredTypesConfig.optionsLabels?.[type]
                               }
-                            )}
-                          </>
-                        )}
-                      />
-                    )}
-                  </FieldGroup>
+                              value={type}
+                              checked={values.waiversRequiredTypes.includes(
+                                type
+                              )}
+                            />
+                          </Fragment>
+                        );
+                      })}
+                    </FieldGroup>
+                  )}
 
                   <AddNote
                     id="plan-characteristics-waivers-required-note"
diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap
index d60e5372b3..c9771b1076 100644
--- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap
@@ -99,7 +99,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
     >
       <div
         class="usa-form-group margin-y-4 margin-bottom-8"
-        data-scroll="geographiesTargeted"
+        data-scroll="plan-characteristics-geographies-targeted"
       >
         <label
           class="usa-label"
@@ -151,11 +151,13 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
             </label>
           </div>
         </fieldset>
-        <legend
+        <label
           class="usa-label text-normal"
+          data-testid="label"
+          for="plan-characteristics-geographies-type"
         >
           Geography type is
-        </legend>
+        </label>
         <div
           class="mint-checkbox usa-checkbox"
         >
@@ -219,6 +221,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
         </div>
         <div
           class="usa-form-group margin-left-4 margin-y-2"
+          data-scroll="plan-characteristics-geographies-targeted-other"
         >
           <label
             class="usa-label text-normal"
@@ -227,101 +230,105 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
           >
             Please specify what the other geography type is.
           </label>
-          <textarea
-            aria-labelledby="label-plan-characteristics-geographies-targeted-other hint-plan-characteristics-geographies-targeted-other"
-            class="mint-textarea usa-textarea"
+          <input
+            class="usa-input"
             data-testid="plan-characteristics-geographies-targeted-other"
             id="plan-characteristics-geographies-targeted-other"
-            maxlength="5000"
             name="geographiesTargetedTypesOther"
-          >
-            Other geography type
-          </textarea>
-        </div>
-        <legend
-          class="usa-label text-normal"
-        >
-          Geographies are applied to
-        </legend>
-        <div
-          class="mint-checkbox usa-checkbox"
-        >
-          <input
-            class="usa-checkbox__input"
-            id="plan-characteristics-geographies-applied-to-BENEFICIARIES"
-            name="geographiesTargetedAppliedTo"
-            type="checkbox"
-            value="BENEFICIARIES"
-          />
-          <label
-            class="usa-checkbox__label"
-            for="plan-characteristics-geographies-applied-to-BENEFICIARIES"
-          >
-            Beneficiaries
-          </label>
-          <p
-            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+            value="Other geography type"
           />
         </div>
         <div
-          class="mint-checkbox usa-checkbox"
+          class="usa-form-group"
+          data-scroll="plan-characteristics-geographies-applied-to"
         >
-          <input
-            class="usa-checkbox__input"
-            id="plan-characteristics-geographies-applied-to-PARTICIPANTS"
-            name="geographiesTargetedAppliedTo"
-            type="checkbox"
-            value="PARTICIPANTS"
-          />
           <label
-            class="usa-checkbox__label"
-            for="plan-characteristics-geographies-applied-to-PARTICIPANTS"
+            class="usa-label text-normal"
+            data-testid="label"
+            for="plan-characteristics-geographies-applied-to"
           >
-            Participants
+            Geographies are applied to
           </label>
-          <p
-            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-          />
-        </div>
-        <div
-          class="mint-checkbox usa-checkbox"
-        >
-          <input
-            class="usa-checkbox__input"
-            id="plan-characteristics-geographies-applied-to-PROVIDERS"
-            name="geographiesTargetedAppliedTo"
-            type="checkbox"
-            value="PROVIDERS"
-          />
-          <label
-            class="usa-checkbox__label"
-            for="plan-characteristics-geographies-applied-to-PROVIDERS"
+          <div
+            class="mint-checkbox usa-checkbox"
           >
-            Providers
-          </label>
-          <p
-            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-          />
-        </div>
-        <div
-          class="mint-checkbox usa-checkbox"
-        >
-          <input
-            class="usa-checkbox__input"
-            id="plan-characteristics-geographies-applied-to-OTHER"
-            name="geographiesTargetedAppliedTo"
-            type="checkbox"
-            value="OTHER"
-          />
-          <label
-            class="usa-checkbox__label"
-            for="plan-characteristics-geographies-applied-to-OTHER"
+            <input
+              class="usa-checkbox__input"
+              id="plan-characteristics-geographies-applied-to-BENEFICIARIES"
+              name="geographiesTargetedAppliedTo"
+              type="checkbox"
+              value="BENEFICIARIES"
+            />
+            <label
+              class="usa-checkbox__label"
+              for="plan-characteristics-geographies-applied-to-BENEFICIARIES"
+            >
+              Beneficiaries
+            </label>
+            <p
+              class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+            />
+          </div>
+          <div
+            class="mint-checkbox usa-checkbox"
           >
-            Other
-          </label>
-          <p
-            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-          />
+            <input
+              class="usa-checkbox__input"
+              id="plan-characteristics-geographies-applied-to-PARTICIPANTS"
+              name="geographiesTargetedAppliedTo"
+              type="checkbox"
+              value="PARTICIPANTS"
+            />
+            <label
+              class="usa-checkbox__label"
+              for="plan-characteristics-geographies-applied-to-PARTICIPANTS"
+            >
+              Participants
+            </label>
+            <p
+              class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+            />
+          </div>
+          <div
+            class="mint-checkbox usa-checkbox"
+          >
+            <input
+              class="usa-checkbox__input"
+              id="plan-characteristics-geographies-applied-to-PROVIDERS"
+              name="geographiesTargetedAppliedTo"
+              type="checkbox"
+              value="PROVIDERS"
+            />
+            <label
+              class="usa-checkbox__label"
+              for="plan-characteristics-geographies-applied-to-PROVIDERS"
+            >
+              Providers
+            </label>
+            <p
+              class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+            />
+          </div>
+          <div
+            class="mint-checkbox usa-checkbox"
+          >
+            <input
+              class="usa-checkbox__input"
+              id="plan-characteristics-geographies-applied-to-OTHER"
+              name="geographiesTargetedAppliedTo"
+              type="checkbox"
+              value="OTHER"
+            />
+            <label
+              class="usa-checkbox__label"
+              for="plan-characteristics-geographies-applied-to-OTHER"
+            >
+              Other
+            </label>
+            <p
+              class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+            />
+          </div>
         </div>
         <div
           class="margin-top-4 margin-bottom-8"
@@ -351,7 +358,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-y-4"
-        data-scroll="participationOptions"
+        data-scroll="plan-characteristics-participation"
       >
         <label
           class="usa-label"
@@ -431,13 +438,15 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group"
-        data-scroll="agreementTypes"
+        data-scroll="plan-characteristics-agreement-type"
       >
-        <legend
+        <label
           class="usa-label"
+          data-testid="label"
+          for="plan-characteristics-agreement-type"
         >
           What is the agreement type?
-        </legend>
+        </label>
         <div
           class="usa-alert usa-alert--warning flex it-solutions-warning"
           data-testid="alert"
diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx
index 8a55583ba8..415194f175 100644
--- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx
+++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx
@@ -8,9 +8,10 @@ import {
   Button,
   Fieldset,
   Icon,
-  Label
+  Label,
+  TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   AgreementType,
   GeographyApplication,
@@ -31,7 +32,6 @@ import CheckboxField from 'components/shared/CheckboxField';
 import { ErrorAlert, ErrorAlertMessage } from 'components/shared/ErrorAlert';
 import FieldErrorMsg from 'components/shared/FieldErrorMsg';
 import FieldGroup from 'components/shared/FieldGroup';
-import TextAreaField from 'components/shared/TextAreaField';
 import usePlanTranslation from 'hooks/usePlanTranslation';
 import useScrollElement from 'hooks/useScrollElement';
 import { getKeys } from 'types/translation';
@@ -232,7 +232,7 @@ const TargetsAndOptions = () => {
               >
                 <Fieldset disabled={!!error || loading}>
                   <FieldGroup
-                    scrollElement="geographiesTargeted"
+                    scrollElement="plan-characteristics-geographies-targeted"
                     error={!!flatErrors.geographiesTargeted}
                     className="margin-y-4 margin-bottom-8"
                   >
@@ -254,179 +254,140 @@ const TargetsAndOptions = () => {
 
                     {values.geographiesTargeted && (
                       <>
-                        <FieldArray
-                          name="geographiesTargetedTypes"
-                          render={arrayHelpers => (
-                            <>
-                              <legend className="usa-label text-normal">
-                                {generalCharacteristicsT(
-                                  'geographiesTargetedTypes.label'
-                                )}
-                              </legend>
-
-                              <FieldErrorMsg>
-                                {flatErrors.geographiesTargetedTypes}
-                              </FieldErrorMsg>
-
-                              {getKeys(
-                                geographiesTargetedTypesConfig.options
-                              ).map(type => {
-                                type KeyType = keyof typeof geographiesTargetedTypesConfig.options;
-
-                                return (
-                                  <Fragment key={type}>
-                                    <Field
-                                      as={CheckboxField}
-                                      id={`plan-characteristics-geographies-type-${type}`}
-                                      name="geographiesTargetedTypes"
-                                      label={
-                                        geographiesTargetedTypesConfig.options[
-                                          type
-                                        ]
+                        <Label
+                          htmlFor="plan-characteristics-geographies-type"
+                          className="text-normal"
+                        >
+                          {generalCharacteristicsT(
+                            'geographiesTargetedTypes.label'
+                          )}
+                        </Label>
+                        <FieldErrorMsg>
+                          {flatErrors.geographiesTargetedTypes}
+                        </FieldErrorMsg>
+
+                        {getKeys(geographiesTargetedTypesConfig.options).map(
+                          type => {
+                            return (
+                              <Fragment key={type}>
+                                <Field
+                                  as={CheckboxField}
+                                  id={`plan-characteristics-geographies-type-${type}`}
+                                  name="geographiesTargetedTypes"
+                                  label={
+                                    geographiesTargetedTypesConfig.options[type]
+                                  }
+                                  value={type}
+                                  checked={values.geographiesTargetedTypes.includes(
+                                    type
+                                  )}
+                                />
+
+                                {type === GeographyType.OTHER &&
+                                  values.geographiesTargetedTypes.includes(
+                                    GeographyType.OTHER
+                                  ) && (
+                                    <FieldGroup
+                                      scrollElement="plan-characteristics-geographies-targeted-other"
+                                      className="margin-left-4 margin-y-2"
+                                      error={
+                                        !!flatErrors.geographiesTargetedTypesOther
                                       }
-                                      value={type}
-                                      checked={values.geographiesTargetedTypes.includes(
-                                        type
-                                      )}
-                                      onChange={(
-                                        e: React.ChangeEvent<HTMLInputElement>
-                                      ) => {
-                                        if (e.target.checked) {
-                                          arrayHelpers.push(e.target.value);
-                                        } else {
-                                          const idx = values.geographiesTargetedTypes.indexOf(
-                                            e.target.value as KeyType
-                                          );
-                                          arrayHelpers.remove(idx);
+                                    >
+                                      <Label
+                                        htmlFor="plan-characteristics-geographies-targeted-other"
+                                        className="text-normal"
+                                      >
+                                        {generalCharacteristicsT(
+                                          'geographiesTargetedTypesOther.label'
+                                        )}
+                                      </Label>
+                                      <FieldErrorMsg>
+                                        {
+                                          flatErrors.geographiesTargetedTypesOther
                                         }
-                                      }}
-                                    />
-
-                                    {type === GeographyType.OTHER &&
-                                      values.geographiesTargetedTypes.includes(
-                                        type
-                                      ) && (
-                                        <FieldGroup
-                                          className="margin-left-4 margin-y-2"
-                                          error={
-                                            !!flatErrors.geographiesTargetedTypesOther
-                                          }
-                                        >
-                                          <Label
-                                            htmlFor="plan-characteristics-geographies-targeted-other"
-                                            className="text-normal"
-                                          >
-                                            {generalCharacteristicsT(
-                                              'geographiesTargetedTypesOther.label'
-                                            )}
-                                          </Label>
-                                          <FieldErrorMsg>
-                                            {
-                                              flatErrors.geographiesTargetedTypesOther
-                                            }
-                                          </FieldErrorMsg>
-                                          <Field
-                                            as={TextAreaField}
-                                            data-testid="plan-characteristics-geographies-targeted-other"
-                                            id="plan-characteristics-geographies-targeted-other"
-                                            maxLength={5000}
-                                            className="mint-textarea"
-                                            name="geographiesTargetedTypesOther"
-                                          />
-                                        </FieldGroup>
-                                      )}
-                                  </Fragment>
-                                );
-                              })}
-                            </>
-                          )}
-                        />
+                                      </FieldErrorMsg>
+                                      <Field
+                                        as={TextInput}
+                                        data-testid="plan-characteristics-geographies-targeted-other"
+                                        id="plan-characteristics-geographies-targeted-other"
+                                        name="geographiesTargetedTypesOther"
+                                      />
+                                    </FieldGroup>
+                                  )}
+                              </Fragment>
+                            );
+                          }
+                        )}
+
+                        <FieldGroup scrollElement="plan-characteristics-geographies-applied-to">
+                          <Label
+                            htmlFor="plan-characteristics-geographies-applied-to"
+                            className="text-normal"
+                          >
+                            {generalCharacteristicsT(
+                              'geographiesTargetedAppliedTo.label'
+                            )}
+                          </Label>
+                          <FieldErrorMsg>
+                            {flatErrors.geographiesTargetedAppliedTo}
+                          </FieldErrorMsg>
 
-                        <FieldArray
-                          name="geographiesTargetedAppliedTo"
-                          render={arrayHelpers => (
-                            <>
-                              <legend className="usa-label text-normal">
-                                {generalCharacteristicsT(
-                                  'geographiesTargetedAppliedTo.label'
-                                )}
-                              </legend>
-
-                              <FieldErrorMsg>
-                                {flatErrors.geographiesTargetedAppliedTo}
-                              </FieldErrorMsg>
-
-                              {getKeys(
-                                geographiesTargetedAppliedToConfig.options
-                              ).map(type => {
-                                type KeyType = keyof typeof geographiesTargetedAppliedToConfig.options;
-
-                                return (
-                                  <Fragment key={type}>
-                                    <Field
-                                      as={CheckboxField}
-                                      id={`plan-characteristics-geographies-applied-to-${type}`}
-                                      name="geographiesTargetedAppliedTo"
-                                      label={
-                                        geographiesTargetedAppliedToConfig
-                                          .options[type]
+                          {getKeys(
+                            geographiesTargetedAppliedToConfig.options
+                          ).map(type => {
+                            return (
+                              <Fragment key={type}>
+                                <Field
+                                  as={CheckboxField}
+                                  id={`plan-characteristics-geographies-applied-to-${type}`}
+                                  name="geographiesTargetedAppliedTo"
+                                  label={
+                                    geographiesTargetedAppliedToConfig.options[
+                                      type
+                                    ]
+                                  }
+                                  value={type}
+                                  checked={values.geographiesTargetedAppliedTo.includes(
+                                    type
+                                  )}
+                                />
+
+                                {type === GeographyApplication.OTHER &&
+                                  values.geographiesTargetedAppliedTo.includes(
+                                    GeographyApplication.OTHER
+                                  ) && (
+                                    <FieldGroup
+                                      scrollElement="plan-characteristics-geographies-applied-to-other"
+                                      className="margin-left-4 margin-top-2 margin-bottom-0"
+                                      error={
+                                        !!flatErrors.geographiesTargetedAppliedToOther
                                       }
-                                      value={type}
-                                      checked={values.geographiesTargetedAppliedTo.includes(
-                                        type
-                                      )}
-                                      onChange={(
-                                        e: React.ChangeEvent<HTMLInputElement>
-                                      ) => {
-                                        if (e.target.checked) {
-                                          arrayHelpers.push(e.target.value);
-                                        } else {
-                                          const idx = values.geographiesTargetedAppliedTo.indexOf(
-                                            e.target.value as KeyType
-                                          );
-                                          arrayHelpers.remove(idx);
+                                    >
+                                      <Label
+                                        htmlFor="plan-characteristics-geographies-applied-to-other"
+                                        className="text-normal"
+                                      >
+                                        {generalCharacteristicsT(
+                                          'geographiesTargetedAppliedToOther.label'
+                                        )}
+                                      </Label>
+                                      <FieldErrorMsg>
+                                        {
+                                          flatErrors.geographiesTargetedAppliedToOther
                                         }
-                                      }}
-                                    />
-
-                                    {type === GeographyApplication.OTHER &&
-                                      values.geographiesTargetedAppliedTo.includes(
-                                        type
-                                      ) && (
-                                        <FieldGroup
-                                          className="margin-left-4 margin-top-2 margin-bottom-0"
-                                          error={
-                                            !!flatErrors.geographiesTargetedAppliedToOther
-                                          }
-                                        >
-                                          <Label
-                                            htmlFor="plan-characteristics-geographies-applied-to-other"
-                                            className="text-normal"
-                                          >
-                                            {generalCharacteristicsT(
-                                              'geographiesTargetedAppliedToOther.label'
-                                            )}
-                                          </Label>
-                                          <FieldErrorMsg>
-                                            {
-                                              flatErrors.geographiesTargetedAppliedToOther
-                                            }
-                                          </FieldErrorMsg>
-                                          <Field
-                                            as={TextAreaField}
-                                            id="plan-characteristics-geographies-applied-to-other"
-                                            maxLength={5000}
-                                            className="mint-textarea"
-                                            name="geographiesTargetedAppliedToOther"
-                                          />
-                                        </FieldGroup>
-                                      )}
-                                  </Fragment>
-                                );
-                              })}
-                            </>
-                          )}
-                        />
+                                      </FieldErrorMsg>
+                                      <Field
+                                        as={TextInput}
+                                        id="plan-characteristics-geographies-applied-to-other"
+                                        name="geographiesTargetedAppliedToOther"
+                                      />
+                                    </FieldGroup>
+                                  )}
+                              </Fragment>
+                            );
+                          })}
+                        </FieldGroup>
 
                         <AddNote
                           id="plan-characteristics-geographies-targeted-note"
@@ -437,7 +398,7 @@ const TargetsAndOptions = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="participationOptions"
+                    scrollElement="plan-characteristics-participation"
                     error={!!flatErrors.participationOptions}
                     className="margin-y-4"
                   >
@@ -464,95 +425,71 @@ const TargetsAndOptions = () => {
                   />
 
                   <FieldGroup
-                    scrollElement="agreementTypes"
+                    scrollElement="plan-characteristics-agreement-type"
                     error={!!flatErrors.agreementTypes}
                   >
-                    <FieldArray
-                      name="agreementTypes"
-                      render={arrayHelpers => (
-                        <>
-                          <legend className="usa-label">
-                            {generalCharacteristicsT('agreementTypes.label')}
-                          </legend>
-
-                          {itSolutionsStarted && (
-                            <ITSolutionsWarning
-                              id="ops-eval-and-learning-data-needed-warning"
-                              onClick={() =>
-                                handleFormSubmit(
-                                  `/models/${modelID}/task-list/it-solutions`
-                                )
-                              }
-                            />
-                          )}
-
-                          <p className="text-base margin-y-1">
-                            {generalCharacteristicsT('agreementTypes.sublabel')}
-                          </p>
+                    <Label htmlFor="plan-characteristics-agreement-type">
+                      {generalCharacteristicsT('agreementTypes.label')}
+                    </Label>
 
-                          <FieldErrorMsg>
-                            {flatErrors.agreementTypes}
-                          </FieldErrorMsg>
+                    {itSolutionsStarted && (
+                      <ITSolutionsWarning
+                        id="ops-eval-and-learning-data-needed-warning"
+                        onClick={() =>
+                          handleFormSubmit(
+                            `/models/${modelID}/task-list/it-solutions`
+                          )
+                        }
+                      />
+                    )}
+                    <p className="text-base margin-y-1">
+                      {generalCharacteristicsT('agreementTypes.sublabel')}
+                    </p>
+                    <FieldErrorMsg>{flatErrors.agreementTypes}</FieldErrorMsg>
+
+                    {getKeys(agreementTypesConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`plan-characteristics-agreement-type-${type}`}
+                            name="agreementTypes"
+                            label={agreementTypesConfig.options[type]}
+                            value={type}
+                            checked={values.agreementTypes.includes(type)}
+                          />
+                          {type === AgreementType.OTHER &&
+                            values.agreementTypes.includes(
+                              AgreementType.OTHER
+                            ) && (
+                              <FieldGroup
+                                scrollElement="plan-characteristics-agreement-type-other"
+                                className="margin-left-4 margin-top-2 margin-bottom-0"
+                                error={!!flatErrors.agreementTypesOther}
+                              >
+                                <Label
+                                  htmlFor="plan-characteristics-agreement-type-other"
+                                  className="text-normal"
+                                >
+                                  {generalCharacteristicsT(
+                                    'agreementTypesOther.label'
+                                  )}
+                                </Label>
 
-                          {getKeys(agreementTypesConfig.options).map(type => {
-                            type KeyType = keyof typeof agreementTypesConfig.options;
+                                <FieldErrorMsg>
+                                  {flatErrors.agreementTypesOther}
+                                </FieldErrorMsg>
 
-                            return (
-                              <Fragment key={type}>
                                 <Field
-                                  as={CheckboxField}
-                                  id={`plan-characteristics-agreement-type-${type}`}
-                                  name="agreementTypes"
-                                  label={agreementTypesConfig.options[type]}
-                                  value={type}
-                                  checked={values.agreementTypes.includes(type)}
-                                  onChange={(
-                                    e: React.ChangeEvent<HTMLInputElement>
-                                  ) => {
-                                    if (e.target.checked) {
-                                      arrayHelpers.push(e.target.value);
-                                    } else {
-                                      const idx = values.agreementTypes.indexOf(
-                                        e.target.value as KeyType
-                                      );
-                                      arrayHelpers.remove(idx);
-                                    }
-                                  }}
+                                  as={TextInput}
+                                  id="plan-characteristics-agreement-type-other"
+                                  name="agreementTypesOther"
                                 />
-                                {type === AgreementType.OTHER &&
-                                  values.agreementTypes.includes(type) && (
-                                    <FieldGroup
-                                      className="margin-left-4 margin-top-2 margin-bottom-0"
-                                      error={!!flatErrors.agreementTypesOther}
-                                    >
-                                      <Label
-                                        htmlFor="plan-characteristics-agreement-type-other"
-                                        className="text-normal"
-                                      >
-                                        {generalCharacteristicsT(
-                                          'agreementTypesOther.label'
-                                        )}
-                                      </Label>
-
-                                      <FieldErrorMsg>
-                                        {flatErrors.agreementTypesOther}
-                                      </FieldErrorMsg>
-
-                                      <Field
-                                        as={TextAreaField}
-                                        className="mint-textarea"
-                                        id="plan-characteristics-agreement-type-other"
-                                        maxLength={5000}
-                                        name="agreementTypesOther"
-                                      />
-                                    </FieldGroup>
-                                  )}
-                              </Fragment>
-                            );
-                          })}
-                        </>
-                      )}
-                    />
+                              </FieldGroup>
+                            )}
+                        </Fragment>
+                      );
+                    })}
                   </FieldGroup>
 
                   {values.agreementTypes.includes(
@@ -560,7 +497,7 @@ const TargetsAndOptions = () => {
                   ) && (
                     <>
                       <FieldGroup
-                        scrollElement="multiplePatricipationAgreementsNeeded"
+                        scrollElement="plan-characteristics-multiple-participation-needed"
                         error={
                           !!flatErrors.multiplePatricipationAgreementsNeeded
                         }
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap
index ca1592d7e6..c0ac095302 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap
@@ -99,13 +99,13 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = `
     >
       <div
         class="usa-form-group"
-        data-scroll="evaluationApproaches"
+        data-scroll="ops-eval-and-learning-evaluation-approach"
       >
         <label
           class="usa-label maxw-none"
           data-testid="label"
-          for="ops-eval-and-learning-evaluation-approac"
-          id="ops-eval-and-learning-evaluation-approac"
+          for="ops-eval-and-learning-evaluation-approach"
+          id="ops-eval-and-learning-evaluation-approach"
         >
           What type of evaluation approach are you considering? Select all that apply.
         </label>
@@ -235,127 +235,132 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = `
           </button>
         </div>
       </div>
-      <label
-        class="usa-label maxw-none"
-        data-testid="label"
-        for="ops-eval-and-learning-cmmi-involvement"
-        id="ops-eval-and-learning-cmmi-involvement"
-      >
-        Is Chronic Conditions Warehouse (CCW) involved in the model?
-      </label>
-      <p
-        class="text-base margin-y-1"
-      >
-        If you select either yes option, there will be additional questions to answer.
-      </p>
       <div
-        class="mint-checkbox usa-checkbox"
+        class="usa-form-group"
+        data-scroll="ops-eval-and-learning-cmmi-involvement"
       >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-cmmi-involvement-YES_EVALUATION"
-          name="ccmInvolvment"
-          type="checkbox"
-          value="YES_EVALUATION"
-        />
         <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-cmmi-involvement-YES_EVALUATION"
+          class="usa-label maxw-none"
+          data-testid="label"
+          for="ops-eval-and-learning-cmmi-involvement"
+          id="ops-eval-and-learning-cmmi-involvement"
         >
-          Yes, for evaluation
+          Is Chronic Conditions Warehouse (CCW) involved in the model?
         </label>
         <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-cmmi-involvement-YES__IMPLEMENTATION"
-          name="ccmInvolvment"
-          type="checkbox"
-          value="YES__IMPLEMENTATION"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-cmmi-involvement-YES__IMPLEMENTATION"
+          class="text-base margin-y-1"
         >
-          Yes, for implementation
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-cmmi-involvement-NO"
-          name="ccmInvolvment"
-          type="checkbox"
-          value="NO"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-cmmi-involvement-NO"
+          If you select either yes option, there will be additional questions to answer.
+        </p>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          No
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-cmmi-involvement-OTHER"
-          name="ccmInvolvment"
-          type="checkbox"
-          value="OTHER"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-cmmi-involvement-OTHER"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-cmmi-involvement-YES_EVALUATION"
+            name="ccmInvolvment"
+            type="checkbox"
+            value="YES_EVALUATION"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-cmmi-involvement-YES_EVALUATION"
+          >
+            Yes, for evaluation
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Other
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="margin-top-4 margin-bottom-8"
-      >
-        <button
-          class="usa-button usa-button usa-button--unstyled"
-          data-testid="add-note-toggle"
-          type="button"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-cmmi-involvement-YES__IMPLEMENTATION"
+            name="ccmInvolvment"
+            type="checkbox"
+            value="YES__IMPLEMENTATION"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-cmmi-involvement-YES__IMPLEMENTATION"
+          >
+            Yes, for implementation
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          <svg
-            aria-hidden="true"
-            class="usa-icon margin-right-1"
-            focusable="false"
-            height="1em"
-            role="img"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-cmmi-involvement-NO"
+            name="ccmInvolvment"
+            type="checkbox"
+            value="NO"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-cmmi-involvement-NO"
           >
-            <path
-              d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-            />
-          </svg>
-          Add an additional note
-        </button>
+            No
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
+        >
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-cmmi-involvement-OTHER"
+            name="ccmInvolvment"
+            type="checkbox"
+            value="OTHER"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-cmmi-involvement-OTHER"
+          >
+            Other
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="margin-top-4 margin-bottom-8"
+        >
+          <button
+            class="usa-button usa-button usa-button--unstyled"
+            data-testid="add-note-toggle"
+            type="button"
+          >
+            <svg
+              aria-hidden="true"
+              class="usa-icon margin-right-1"
+              focusable="false"
+              height="1em"
+              role="img"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
+              />
+            </svg>
+            Add an additional note
+          </button>
+        </div>
       </div>
       <div
         class="usa-form-group margin-top-4"
-        data-scroll="dataNeededForMonitoring"
+        data-scroll="ops-eval-and-learning-data-needed"
       >
         <label
           class="usa-label maxw-none"
@@ -482,7 +487,7 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-4"
-        data-scroll="dataToSendParticicipants"
+        data-scroll="label-ops-eval-and-learning-data-to-send"
       >
         <label
           class="usa-label maxw-none"
@@ -604,7 +609,7 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-6"
-        data-scroll="shareCclfData"
+        data-scroll="ops-eval-and-learning-share-cclf-data"
       >
         <label
           class="usa-label maxw-none"
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx
index f2032984ab..3161e37dd6 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx
@@ -11,7 +11,7 @@ import {
   Label,
   TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   CcmInvolvmentType,
   DataForMonitoringType,
@@ -34,7 +34,6 @@ import { ErrorAlert, ErrorAlertMessage } from 'components/shared/ErrorAlert';
 import FieldErrorMsg from 'components/shared/FieldErrorMsg';
 import FieldGroup from 'components/shared/FieldGroup';
 import MultiSelect from 'components/shared/MultiSelect';
-import TextAreaField from 'components/shared/TextAreaField';
 import usePlanTranslation from 'hooks/usePlanTranslation';
 import useScrollElement from 'hooks/useScrollElement';
 import { getKeys } from 'types/translation';
@@ -257,189 +256,144 @@ const Evaluation = () => {
               >
                 <Fieldset disabled={!!error || loading}>
                   <FieldGroup
-                    scrollElement="evaluationApproaches"
+                    scrollElement="ops-eval-and-learning-evaluation-approach"
                     error={!!flatErrors.evaluationApproaches}
                   >
-                    <FieldArray
-                      name="evaluationApproaches"
-                      render={arrayHelpers => (
-                        <>
-                          <Label
-                            htmlFor="ops-eval-and-learning-evaluation-approac"
-                            id="ops-eval-and-learning-evaluation-approac"
-                            className="maxw-none"
-                          >
-                            {opsEvalAndLearningT('evaluationApproaches.label')}
-                          </Label>
-
-                          {itSolutionsStarted && (
-                            <ITSolutionsWarning
-                              id="ops-eval-and-learning-evaluation-approach-warning"
-                              onClick={() =>
-                                handleFormSubmit(
-                                  `/models/${modelID}/task-list/it-solutions`
-                                )
-                              }
-                            />
-                          )}
+                    <Label
+                      htmlFor="ops-eval-and-learning-evaluation-approach"
+                      id="ops-eval-and-learning-evaluation-approach"
+                      className="maxw-none"
+                    >
+                      {opsEvalAndLearningT('evaluationApproaches.label')}
+                    </Label>
 
-                          <FieldErrorMsg>
-                            {flatErrors.evaluationApproaches}
-                          </FieldErrorMsg>
-
-                          {getKeys(evaluationApproachesConfig.options).map(
-                            type => {
-                              return (
-                                <Fragment key={type}>
-                                  <Field
-                                    as={CheckboxField}
-                                    id={`ops-eval-and-learning-evaluation-approach-${type}`}
-                                    data-testid={`ops-eval-and-learning-evaluation-approach-${type}`}
-                                    name="evaluationApproaches"
-                                    label={
-                                      evaluationApproachesConfig.options[type]
-                                    }
-                                    value={type}
-                                    checked={values?.evaluationApproaches.includes(
-                                      type
-                                    )}
-                                    onChange={(
-                                      e: React.ChangeEvent<HTMLInputElement>
-                                    ) => {
-                                      if (e.target.checked) {
-                                        arrayHelpers.push(e.target.value);
-                                      } else {
-                                        const idx = values.evaluationApproaches.indexOf(
-                                          e.target
-                                            .value as EvaluationApproachType
-                                        );
-                                        arrayHelpers.remove(idx);
-                                      }
-                                    }}
-                                  />
-
-                                  {type === EvaluationApproachType.OTHER &&
-                                    values.evaluationApproaches.includes(
-                                      type
-                                    ) && (
-                                      <div className="margin-left-4">
-                                        <Label
-                                          htmlFor="ops-eval-and-learning-evaluation-approach-other"
-                                          className="text-normal maxw-none"
-                                        >
-                                          {opsEvalAndLearningT(
-                                            'evaluationApproachOther.label'
-                                          )}
-                                        </Label>
-
-                                        <FieldErrorMsg>
-                                          {flatErrors.evaluationApproachOther}
-                                        </FieldErrorMsg>
-
-                                        <Field
-                                          as={TextInput}
-                                          className="maxw-none"
-                                          id="ops-eval-and-learning-evaluation-approach-other"
-                                          maxLength={50}
-                                          name="evaluationApproachOther"
-                                        />
-                                      </div>
-                                    )}
-                                </Fragment>
-                              );
-                            }
-                          )}
-                          <AddNote
-                            id="ops-eval-and-learning-evaluation-approach-note"
-                            field="evalutaionApproachNote"
+                    {itSolutionsStarted && (
+                      <ITSolutionsWarning
+                        id="ops-eval-and-learning-evaluation-approach-warning"
+                        onClick={() =>
+                          handleFormSubmit(
+                            `/models/${modelID}/task-list/it-solutions`
+                          )
+                        }
+                      />
+                    )}
+
+                    <FieldErrorMsg>
+                      {flatErrors.evaluationApproaches}
+                    </FieldErrorMsg>
+
+                    {getKeys(evaluationApproachesConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`ops-eval-and-learning-evaluation-approach-${type}`}
+                            data-testid={`ops-eval-and-learning-evaluation-approach-${type}`}
+                            name="evaluationApproaches"
+                            label={evaluationApproachesConfig.options[type]}
+                            value={type}
+                            checked={values?.evaluationApproaches.includes(
+                              type
+                            )}
                           />
-                        </>
-                      )}
+
+                          {type === EvaluationApproachType.OTHER &&
+                            values.evaluationApproaches.includes(
+                              EvaluationApproachType.OTHER
+                            ) && (
+                              <div className="margin-left-4">
+                                <Label
+                                  htmlFor="ops-eval-and-learning-evaluation-approach-other"
+                                  className="text-normal maxw-none"
+                                >
+                                  {opsEvalAndLearningT(
+                                    'evaluationApproachOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.evaluationApproachOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="ops-eval-and-learning-evaluation-approach-other"
+                                  name="evaluationApproachOther"
+                                />
+                              </div>
+                            )}
+                        </Fragment>
+                      );
+                    })}
+                    <AddNote
+                      id="ops-eval-and-learning-evaluation-approach-note"
+                      field="evalutaionApproachNote"
                     />
                   </FieldGroup>
 
-                  <FieldArray
-                    name="ccmInvolvment"
-                    render={arrayHelpers => (
-                      <>
-                        <Label
-                          htmlFor="ops-eval-and-learning-cmmi-involvement"
-                          id="ops-eval-and-learning-cmmi-involvement"
-                          className="maxw-none"
-                        >
-                          {opsEvalAndLearningT('ccmInvolvment.label')}
-                        </Label>
+                  <FieldGroup scrollElement="ops-eval-and-learning-cmmi-involvement">
+                    <Label
+                      htmlFor="ops-eval-and-learning-cmmi-involvement"
+                      id="ops-eval-and-learning-cmmi-involvement"
+                      className="maxw-none"
+                    >
+                      {opsEvalAndLearningT('ccmInvolvment.label')}
+                    </Label>
 
-                        <p className="text-base margin-y-1">
-                          {opsEvalAndLearningT('ccmInvolvment.sublabel')}
-                        </p>
+                    <p className="text-base margin-y-1">
+                      {opsEvalAndLearningT('ccmInvolvment.sublabel')}
+                    </p>
 
-                        <FieldErrorMsg>
-                          {flatErrors.ccmInvolvment}
-                        </FieldErrorMsg>
+                    <FieldErrorMsg>{flatErrors.ccmInvolvment}</FieldErrorMsg>
+
+                    {getKeys(ccmInvolvmentConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`ops-eval-and-learning-cmmi-involvement-${type}`}
+                            name="ccmInvolvment"
+                            label={ccmInvolvmentConfig.options[type]}
+                            value={type}
+                            checked={values?.ccmInvolvment.includes(type)}
+                          />
+                          {type === CcmInvolvmentType.OTHER &&
+                            values.ccmInvolvment.includes(
+                              CcmInvolvmentType.OTHER
+                            ) && (
+                              <div className="margin-left-4 margin-top-neg-2">
+                                <Label
+                                  htmlFor="ops-eval-and-learning-cmmi-involvement-other"
+                                  className="text-normal"
+                                >
+                                  {opsEvalAndLearningT(
+                                    'ccmInvolvmentOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.ccmInvolvmentOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="ops-eval-and-learning-cmmi-involvement-other"
+                                  name="ccmInvolvmentOther"
+                                />
+                              </div>
+                            )}
+                        </Fragment>
+                      );
+                    })}
 
-                        {getKeys(ccmInvolvmentConfig.options).map(type => {
-                          return (
-                            <Fragment key={type}>
-                              <Field
-                                as={CheckboxField}
-                                id={`ops-eval-and-learning-cmmi-involvement-${type}`}
-                                name="ccmInvolvment"
-                                label={ccmInvolvmentConfig.options[type]}
-                                value={type}
-                                checked={values?.ccmInvolvment.includes(type)}
-                                onChange={(
-                                  e: React.ChangeEvent<HTMLInputElement>
-                                ) => {
-                                  if (e.target.checked) {
-                                    arrayHelpers.push(e.target.value);
-                                  } else {
-                                    const idx = values.ccmInvolvment.indexOf(
-                                      e.target.value as CcmInvolvmentType
-                                    );
-                                    arrayHelpers.remove(idx);
-                                  }
-                                }}
-                              />
-                              {type === CcmInvolvmentType.OTHER &&
-                                values.ccmInvolvment.includes(type) && (
-                                  <div className="margin-left-4 margin-top-neg-2">
-                                    <Label
-                                      htmlFor="ops-eval-and-learning-cmmi-involvement-other"
-                                      className="text-normal"
-                                    >
-                                      {opsEvalAndLearningT(
-                                        'ccmInvolvmentOther.label'
-                                      )}
-                                    </Label>
-
-                                    <FieldErrorMsg>
-                                      {flatErrors.ccmInvolvmentOther}
-                                    </FieldErrorMsg>
-
-                                    <Field
-                                      as={TextAreaField}
-                                      className="maxw-none mint-textarea"
-                                      id="ops-eval-and-learning-cmmi-involvement-other"
-                                      maxLength={5000}
-                                      name="ccmInvolvmentOther"
-                                    />
-                                  </div>
-                                )}
-                            </Fragment>
-                          );
-                        })}
-
-                        <AddNote
-                          id="ops-eval-and-learning-cmmi-involvement-note"
-                          field="ccmInvolvmentNote"
-                        />
-                      </>
-                    )}
-                  />
+                    <AddNote
+                      id="ops-eval-and-learning-cmmi-involvement-note"
+                      field="ccmInvolvmentNote"
+                    />
+                  </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="dataNeededForMonitoring"
+                    scrollElement="ops-eval-and-learning-data-needed"
                     error={!!flatErrors.dataNeededForMonitoring}
                     className="margin-top-4"
                   >
@@ -521,7 +475,7 @@ const Evaluation = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="dataToSendParticicipants"
+                    scrollElement="label-ops-eval-and-learning-data-to-send"
                     error={!!flatErrors.dataToSendParticicipants}
                     className="margin-top-4"
                   >
@@ -599,7 +553,7 @@ const Evaluation = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="shareCclfData"
+                    scrollElement="ops-eval-and-learning-share-cclf-data"
                     error={!!flatErrors.shareCclfData}
                     className="margin-top-6"
                   >
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap
index 68fca9d183..aa4d244c36 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap
@@ -122,7 +122,7 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-6"
-        data-scroll="uatNeeds"
+        data-scroll="ops-eval-and-learning-uat-needs"
       >
         <label
           class="usa-label"
@@ -140,7 +140,7 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-6"
-        data-scroll="stcNeeds"
+        data-scroll="ops-eval-and-learning-stc-needs"
       >
         <label
           class="usa-label"
@@ -161,7 +161,7 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-6"
-        data-scroll="testingTimelines"
+        data-scroll="ops-eval-and-learning-testing-timelines"
       >
         <label
           class="usa-label"
@@ -205,114 +205,121 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = `
       <h3>
         Data monitoring questions
       </h3>
-      <legend
-        class="usa-label maxw-none"
-      >
-        What types of files? Select all that apply.
-      </legend>
       <div
-        class="mint-checkbox usa-checkbox"
+        class="usa-form-group"
+        data-scroll="ops-eval-and-learning-data-monitoring-file"
       >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-data-monitoring-file-BENEFICIARY"
-          name="dataMonitoringFileTypes"
-          type="checkbox"
-          value="BENEFICIARY"
-        />
         <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-data-monitoring-file-BENEFICIARY"
+          class="usa-label"
+          data-testid="label"
+          for="ops-eval-and-learning-data-monitoring-file"
         >
-          Beneficiary
+          What types of files? Select all that apply.
         </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-data-monitoring-file-PROVIDER"
-          name="dataMonitoringFileTypes"
-          type="checkbox"
-          value="PROVIDER"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-data-monitoring-file-PROVIDER"
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Provider
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-data-monitoring-file-PART_A"
-          name="dataMonitoringFileTypes"
-          type="checkbox"
-          value="PART_A"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-data-monitoring-file-PART_A"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-data-monitoring-file-BENEFICIARY"
+            name="dataMonitoringFileTypes"
+            type="checkbox"
+            value="BENEFICIARY"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-data-monitoring-file-BENEFICIARY"
+          >
+            Beneficiary
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Part A
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-data-monitoring-file-PART_B"
-          name="dataMonitoringFileTypes"
-          type="checkbox"
-          value="PART_B"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-data-monitoring-file-PART_B"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-data-monitoring-file-PROVIDER"
+            name="dataMonitoringFileTypes"
+            type="checkbox"
+            value="PROVIDER"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-data-monitoring-file-PROVIDER"
+          >
+            Provider
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Part B
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-data-monitoring-file-OTHER"
-          name="dataMonitoringFileTypes"
-          type="checkbox"
-          value="OTHER"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-data-monitoring-file-OTHER"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-data-monitoring-file-PART_A"
+            name="dataMonitoringFileTypes"
+            type="checkbox"
+            value="PART_A"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-data-monitoring-file-PART_A"
+          >
+            Part A
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Other
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-data-monitoring-file-PART_B"
+            name="dataMonitoringFileTypes"
+            type="checkbox"
+            value="PART_B"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-data-monitoring-file-PART_B"
+          >
+            Part B
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
+        >
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-data-monitoring-file-OTHER"
+            name="dataMonitoringFileTypes"
+            type="checkbox"
+            value="OTHER"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-data-monitoring-file-OTHER"
+          >
+            Other
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
       </div>
       <div
         class="usa-form-group margin-top-6"
-        data-scroll="dataResponseType"
+        data-scroll="ops-eval-and-learning-data-response-type"
       >
         <label
           class="usa-label"
@@ -332,7 +339,7 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-6"
-        data-scroll="dataResponseFileFrequency"
+        data-scroll="ops-eval-and-learning-data-file-frequency"
       >
         <label
           class="usa-label"
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx
index 4687d6cd7a..644dc9c2bb 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx
@@ -11,7 +11,7 @@ import {
   Label,
   TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   GetIddocTestingQuery,
   MonitoringFileType,
@@ -224,7 +224,7 @@ const IDDOCTesting = () => {
                   </Alert>
 
                   <FieldGroup
-                    scrollElement="uatNeeds"
+                    scrollElement="ops-eval-and-learning-uat-needs"
                     className="margin-top-6"
                     error={!!flatErrors.uatNeeds}
                   >
@@ -243,7 +243,7 @@ const IDDOCTesting = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="stcNeeds"
+                    scrollElement="ops-eval-and-learning-stc-needs"
                     className="margin-top-6"
                     error={!!flatErrors.stcNeeds}
                   >
@@ -263,7 +263,7 @@ const IDDOCTesting = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="testingTimelines"
+                    scrollElement="ops-eval-and-learning-testing-timelines"
                     className="margin-top-6"
                     error={!!flatErrors.testingTimelines}
                   >
@@ -288,84 +288,65 @@ const IDDOCTesting = () => {
 
                   <h3>{opsEvalAndLearningMiscT('dataMonitoring')}</h3>
 
-                  <FieldArray
-                    name="dataMonitoringFileTypes"
-                    render={arrayHelpers => (
-                      <>
-                        <legend className="usa-label maxw-none">
-                          {opsEvalAndLearningT('dataMonitoringFileTypes.label')}
-                        </legend>
-
-                        <FieldErrorMsg>
-                          {flatErrors.dataMonitoringFileTypes}
-                        </FieldErrorMsg>
-
-                        {getKeys(dataMonitoringFileTypesConfig.options).map(
-                          type => {
-                            return (
-                              <Fragment key={type}>
-                                <Field
-                                  as={CheckboxField}
-                                  id={`ops-eval-and-learning-data-monitoring-file-${type}`}
-                                  name="dataMonitoringFileTypes"
-                                  label={
-                                    dataMonitoringFileTypesConfig.options[type]
-                                  }
-                                  value={type}
-                                  checked={values?.dataMonitoringFileTypes.includes(
-                                    type
-                                  )}
-                                  onChange={(
-                                    e: React.ChangeEvent<HTMLInputElement>
-                                  ) => {
-                                    if (e.target.checked) {
-                                      arrayHelpers.push(e.target.value);
-                                    } else {
-                                      const idx = values.dataMonitoringFileTypes.indexOf(
-                                        e.target.value as MonitoringFileType
-                                      );
-                                      arrayHelpers.remove(idx);
-                                    }
-                                  }}
-                                />
-
-                                {type === MonitoringFileType.OTHER &&
-                                  values.dataMonitoringFileTypes.includes(
-                                    MonitoringFileType.OTHER
-                                  ) && (
-                                    <div className="margin-left-4 margin-top-neg-3">
-                                      <Label
-                                        htmlFor="ops-eval-and-learning-data-monitoring-file-other"
-                                        className="text-normal"
-                                      >
-                                        {opsEvalAndLearningT(
-                                          'dataMonitoringFileOther.label'
-                                        )}
-                                      </Label>
-
-                                      <FieldErrorMsg>
-                                        {flatErrors.dataMonitoringFileOther}
-                                      </FieldErrorMsg>
-
-                                      <Field
-                                        as={TextAreaField}
-                                        className="maxw-none mint-textarea"
-                                        id="ops-eval-and-learning-data-monitoring-file-other"
-                                        maxLength={5000}
-                                        name="dataMonitoringFileOther"
-                                      />
-                                    </div>
-                                  )}
-                              </Fragment>
-                            );
-                          }
-                        )}
-                      </>
+                  <FieldGroup scrollElement="ops-eval-and-learning-data-monitoring-file">
+                    <Label htmlFor="ops-eval-and-learning-data-monitoring-file">
+                      {opsEvalAndLearningT('dataMonitoringFileTypes.label')}
+                    </Label>
+
+                    <FieldErrorMsg>
+                      {flatErrors.dataMonitoringFileTypes}
+                    </FieldErrorMsg>
+
+                    {getKeys(dataMonitoringFileTypesConfig.options).map(
+                      type => {
+                        return (
+                          <Fragment key={type}>
+                            <Field
+                              as={CheckboxField}
+                              id={`ops-eval-and-learning-data-monitoring-file-${type}`}
+                              name="dataMonitoringFileTypes"
+                              label={
+                                dataMonitoringFileTypesConfig.options[type]
+                              }
+                              value={type}
+                              checked={values?.dataMonitoringFileTypes.includes(
+                                type
+                              )}
+                            />
+
+                            {type === MonitoringFileType.OTHER &&
+                              values.dataMonitoringFileTypes.includes(
+                                MonitoringFileType.OTHER
+                              ) && (
+                                <div className="margin-left-4">
+                                  <Label
+                                    htmlFor="ops-eval-and-learning-data-monitoring-file-other"
+                                    className="text-normal"
+                                  >
+                                    {opsEvalAndLearningT(
+                                      'dataMonitoringFileOther.label'
+                                    )}
+                                  </Label>
+
+                                  <FieldErrorMsg>
+                                    {flatErrors.dataMonitoringFileOther}
+                                  </FieldErrorMsg>
+
+                                  <Field
+                                    as={TextInput}
+                                    id="ops-eval-and-learning-data-monitoring-file-other"
+                                    name="dataMonitoringFileOther"
+                                  />
+                                </div>
+                              )}
+                          </Fragment>
+                        );
+                      }
                     )}
-                  />
+                  </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="dataResponseType"
+                    scrollElement="ops-eval-and-learning-data-response-type"
                     className="margin-top-6"
                     error={!!flatErrors.dataResponseType}
                   >
@@ -384,7 +365,7 @@ const IDDOCTesting = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="dataResponseFileFrequency"
+                    scrollElement="ops-eval-and-learning-data-file-frequency"
                     className="margin-top-6"
                     error={!!flatErrors.dataResponseFileFrequency}
                   >
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap
index dd28ca7c38..8d70f56a03 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap
@@ -99,13 +99,15 @@ exports[`Model Plan Ops Eval and Learning - Learning > matches snapshot 1`] = `
     >
       <div
         class="usa-form-group"
-        data-scroll="modelLearningSystems"
+        data-scroll="ops-eval-and-learning-learning-systems"
       >
-        <legend
+        <label
           class="usa-label"
+          data-testid="label"
+          for="ops-eval-and-learning-learning-systems"
         >
           Will the model have a learning strategy?
-        </legend>
+        </label>
         <div
           class="usa-alert usa-alert--warning flex it-solutions-warning"
           data-testid="alert"
@@ -278,7 +280,7 @@ exports[`Model Plan Ops Eval and Learning - Learning > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group"
-        data-scroll="anticipatedChallenges"
+        data-scroll="ops-eval-and-learning-learning-anticipated-challenges"
       >
         <label
           class="usa-label"
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx
index a3991c1a63..4df01eaeb0 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx
@@ -8,9 +8,10 @@ import {
   Button,
   Fieldset,
   Icon,
-  Label
+  Label,
+  TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   GetLearningQuery,
   ModelLearningSystemType,
@@ -236,105 +237,79 @@ const Learning = () => {
               >
                 <Fieldset disabled={!!error || loading}>
                   <FieldGroup
-                    scrollElement="modelLearningSystems"
+                    scrollElement="ops-eval-and-learning-learning-systems"
                     error={!!flatErrors.modelLearningSystems}
                   >
-                    <FieldArray
-                      name="modelLearningSystems"
-                      render={arrayHelpers => (
-                        <>
-                          <legend className="usa-label">
-                            {opsEvalAndLearningT('modelLearningSystems.label')}
-                          </legend>
-
-                          {itSolutionsStarted && (
-                            <ITSolutionsWarning
-                              id="ops-eval-and-learning-learning-systems-warning"
-                              onClick={() =>
-                                handleFormSubmit(
-                                  `/models/${modelID}/task-list/it-solutions`
-                                )
-                              }
-                            />
-                          )}
-
-                          <FieldErrorMsg>
-                            {flatErrors.modelLearningSystems}
-                          </FieldErrorMsg>
-
-                          {getKeys(modelLearningSystemsConfig.options).map(
-                            type => {
-                              return (
-                                <Fragment key={type}>
-                                  <Field
-                                    as={CheckboxField}
-                                    id={`ops-eval-and-learning-learning-systems-${type}`}
-                                    name="modelLearningSystems"
-                                    label={
-                                      modelLearningSystemsConfig.options[type]
-                                    }
-                                    value={type}
-                                    checked={values?.modelLearningSystems.includes(
-                                      type
-                                    )}
-                                    onChange={(
-                                      e: React.ChangeEvent<HTMLInputElement>
-                                    ) => {
-                                      if (e.target.checked) {
-                                        arrayHelpers.push(e.target.value);
-                                      } else {
-                                        const idx = values.modelLearningSystems.indexOf(
-                                          e.target
-                                            .value as ModelLearningSystemType
-                                        );
-                                        arrayHelpers.remove(idx);
-                                      }
-                                    }}
-                                  />
-
-                                  {type === ModelLearningSystemType.OTHER &&
-                                    values.modelLearningSystems.includes(
-                                      type
-                                    ) && (
-                                      <div className="margin-left-4">
-                                        <Label
-                                          htmlFor="ops-eval-and-learning-learning-systems-other"
-                                          className="text-normal maxw-none"
-                                        >
-                                          {opsEvalAndLearningT(
-                                            'modelLearningSystemsOther.label'
-                                          )}
-                                        </Label>
-
-                                        <FieldErrorMsg>
-                                          {flatErrors.modelLearningSystemsOther}
-                                        </FieldErrorMsg>
-
-                                        <Field
-                                          as={TextAreaField}
-                                          className="maxw-none mint-textarea"
-                                          id="ops-eval-and-learning-learning-systems-other"
-                                          maxLength={5000}
-                                          name="modelLearningSystemsOther"
-                                        />
-                                      </div>
-                                    )}
-                                </Fragment>
-                              );
-                            }
-                          )}
-
-                          <AddNote
-                            id="ops-eval-and-learning-learning-systems-note"
-                            field="modelLearningSystemsNote"
+                    <Label htmlFor="ops-eval-and-learning-learning-systems">
+                      {opsEvalAndLearningT('modelLearningSystems.label')}
+                    </Label>
+
+                    {itSolutionsStarted && (
+                      <ITSolutionsWarning
+                        id="ops-eval-and-learning-learning-systems-warning"
+                        onClick={() =>
+                          handleFormSubmit(
+                            `/models/${modelID}/task-list/it-solutions`
+                          )
+                        }
+                      />
+                    )}
+
+                    <FieldErrorMsg>
+                      {flatErrors.modelLearningSystems}
+                    </FieldErrorMsg>
+
+                    {getKeys(modelLearningSystemsConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`ops-eval-and-learning-learning-systems-${type}`}
+                            name="modelLearningSystems"
+                            label={modelLearningSystemsConfig.options[type]}
+                            value={type}
+                            checked={values?.modelLearningSystems.includes(
+                              type
+                            )}
                           />
-                        </>
-                      )}
+
+                          {type === ModelLearningSystemType.OTHER &&
+                            values.modelLearningSystems.includes(
+                              ModelLearningSystemType.OTHER
+                            ) && (
+                              <div className="margin-left-4">
+                                <Label
+                                  htmlFor="ops-eval-and-learning-learning-systems-other"
+                                  className="text-normal maxw-none"
+                                >
+                                  {opsEvalAndLearningT(
+                                    'modelLearningSystemsOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.modelLearningSystemsOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="ops-eval-and-learning-learning-systems-other"
+                                  name="modelLearningSystemsOther"
+                                />
+                              </div>
+                            )}
+                        </Fragment>
+                      );
+                    })}
+
+                    <AddNote
+                      id="ops-eval-and-learning-learning-systems-note"
+                      field="modelLearningSystemsNote"
                     />
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="anticipatedChallenges"
+                    scrollElement="ops-eval-and-learning-learning-anticipated-challenges"
                     error={!!flatErrors.anticipatedChallenges}
                   >
                     <Label htmlFor="ops-eval-and-learning-learning-anticipated-challenges">
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap
index 93fbeb11a0..555ef669c2 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap
@@ -97,139 +97,146 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = `
       class="usa-fieldset"
       data-testid="fieldset"
     >
-      <legend
-        class="usa-label maxw-none"
-      >
-        Will another Agency or State help design/operate the model? Select all that apply.
-      </legend>
       <div
-        class="mint-checkbox usa-checkbox"
+        class="usa-form-group margin-top-4"
+        data-scroll="ops-eval-and-learning-agency-or-state-help"
       >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-agency-or-state-help-YES_STATE"
-          name="agencyOrStateHelp"
-          type="checkbox"
-          value="YES_STATE"
-        />
         <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-agency-or-state-help-YES_STATE"
+          class="usa-label"
+          data-testid="label"
+          for="ops-eval-and-learning-agency-or-state-help"
         >
-          Yes, we will partner with states
+          Will another Agency or State help design/operate the model? Select all that apply.
         </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IDEAS"
-          name="agencyOrStateHelp"
-          type="checkbox"
-          value="YES_AGENCY_IDEAS"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IDEAS"
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Yes, we will get ideas from another agency
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IAA"
-          name="agencyOrStateHelp"
-          type="checkbox"
-          value="YES_AGENCY_IAA"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IAA"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-agency-or-state-help-YES_STATE"
+            name="agencyOrStateHelp"
+            type="checkbox"
+            value="YES_STATE"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-agency-or-state-help-YES_STATE"
+          >
+            Yes, we will partner with states
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Yes, we will get support from another agency through Inter Agency Agreement (IAA)
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-agency-or-state-help-NO"
-          name="agencyOrStateHelp"
-          type="checkbox"
-          value="NO"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-agency-or-state-help-NO"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IDEAS"
+            name="agencyOrStateHelp"
+            type="checkbox"
+            value="YES_AGENCY_IDEAS"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IDEAS"
+          >
+            Yes, we will get ideas from another agency
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          No
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-agency-or-state-help-OTHER"
-          name="agencyOrStateHelp"
-          type="checkbox"
-          value="OTHER"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-agency-or-state-help-OTHER"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IAA"
+            name="agencyOrStateHelp"
+            type="checkbox"
+            value="YES_AGENCY_IAA"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-agency-or-state-help-YES_AGENCY_IAA"
+          >
+            Yes, we will get support from another agency through Inter Agency Agreement (IAA)
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Other
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="margin-top-4 margin-bottom-8"
-      >
-        <button
-          class="usa-button usa-button usa-button--unstyled"
-          data-testid="add-note-toggle"
-          type="button"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-agency-or-state-help-NO"
+            name="agencyOrStateHelp"
+            type="checkbox"
+            value="NO"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-agency-or-state-help-NO"
+          >
+            No
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          <svg
-            aria-hidden="true"
-            class="usa-icon margin-right-1"
-            focusable="false"
-            height="1em"
-            role="img"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-agency-or-state-help-OTHER"
+            name="agencyOrStateHelp"
+            type="checkbox"
+            value="OTHER"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-agency-or-state-help-OTHER"
           >
-            <path
-              d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-            />
-          </svg>
-          Add an additional note
-        </button>
+            Other
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="margin-top-4 margin-bottom-8"
+        >
+          <button
+            class="usa-button usa-button usa-button--unstyled"
+            data-testid="add-note-toggle"
+            type="button"
+          >
+            <svg
+              aria-hidden="true"
+              class="usa-icon margin-right-1"
+              focusable="false"
+              height="1em"
+              role="img"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
+              />
+            </svg>
+            Add an additional note
+          </button>
+        </div>
       </div>
       <div
         class="usa-form-group margin-top-4"
-        data-scroll="stakeholders"
+        data-scroll="ops-eval-and-learning-stakeholders"
       >
         <label
           class="usa-label"
@@ -351,7 +358,7 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-y-4 margin-bottom-8"
-        data-scroll="helpdeskUse"
+        data-scroll="ops-eval-and-learning-help-desk-use"
       >
         <label
           class="usa-label"
@@ -429,145 +436,152 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = `
           </button>
         </div>
       </div>
-      <legend
-        class="usa-label maxw-none"
-      >
-        What contractors will support your model?
-      </legend>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-contractor-support-ONE"
-          name="contractorSupport"
-          type="checkbox"
-          value="ONE"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-contractor-support-ONE"
-        >
-          One contractor to support implementation
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
       <div
-        class="mint-checkbox usa-checkbox"
+        class="usa-form-group"
+        data-scroll="ops-eval-and-learning-contractor-support"
       >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-contractor-support-MULTIPLE"
-          name="contractorSupport"
-          type="checkbox"
-          value="MULTIPLE"
-        />
         <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-contractor-support-MULTIPLE"
+          class="usa-label"
+          data-testid="label"
+          for="ops-eval-and-learning-contractor-support"
         >
-          May have separate contractors for different implementation functions
+          What contractors will support your model?
         </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-contractor-support-NONE"
-          name="contractorSupport"
-          type="checkbox"
-          value="NONE"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-contractor-support-NONE"
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Do not plan to use an implemenation contractor
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="mint-checkbox usa-checkbox"
-      >
-        <input
-          class="usa-checkbox__input"
-          id="ops-eval-and-learning-contractor-support-OTHER"
-          name="contractorSupport"
-          type="checkbox"
-          value="OTHER"
-        />
-        <label
-          class="usa-checkbox__label"
-          for="ops-eval-and-learning-contractor-support-OTHER"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-contractor-support-ONE"
+            name="contractorSupport"
+            type="checkbox"
+            value="ONE"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-contractor-support-ONE"
+          >
+            One contractor to support implementation
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          Other
-        </label>
-        <p
-          class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
-        />
-      </div>
-      <div
-        class="usa-form-group"
-        data-scroll="contractorSupportHow"
-      >
-        <label
-          class="usa-label text-normal margin-top-4"
-          data-testid="label"
-          for="ops-eval-and-learning-contractor-support-how"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-contractor-support-MULTIPLE"
+            name="contractorSupport"
+            type="checkbox"
+            value="MULTIPLE"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-contractor-support-MULTIPLE"
+          >
+            May have separate contractors for different implementation functions
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          In what capacity will they support your model?
-        </label>
-        <p
-          class="text-base margin-y-1"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-contractor-support-NONE"
+            name="contractorSupport"
+            type="checkbox"
+            value="NONE"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-contractor-support-NONE"
+          >
+            Do not plan to use an implemenation contractor
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="mint-checkbox usa-checkbox"
         >
-          (implementation, data analysis, quality, etc.)
-        </p>
-        <textarea
-          aria-labelledby="label-ops-eval-and-learning-contractor-support-how hint-ops-eval-and-learning-contractor-support-how"
-          class="height-card usa-textarea"
-          data-testid="ops-eval-and-learning-contractor-support-how"
-          id="ops-eval-and-learning-contractor-support-how"
-          name="contractorSupportHow"
+          <input
+            class="usa-checkbox__input"
+            id="ops-eval-and-learning-contractor-support-OTHER"
+            name="contractorSupport"
+            type="checkbox"
+            value="OTHER"
+          />
+          <label
+            class="usa-checkbox__label"
+            for="ops-eval-and-learning-contractor-support-OTHER"
+          >
+            Other
+          </label>
+          <p
+            class="margin-y-1 margin-left-4 line-height-body-3 font-body-2xs"
+          />
+        </div>
+        <div
+          class="usa-form-group"
+          data-scroll="ops-eval-and-learning-contractor-support-how"
         >
-          Differ text
-        </textarea>
-      </div>
-      <div
-        class="margin-top-4 margin-bottom-8"
-      >
-        <button
-          class="usa-button usa-button usa-button--unstyled"
-          data-testid="add-note-toggle"
-          type="button"
+          <label
+            class="usa-label text-normal margin-top-4"
+            data-testid="label"
+            for="ops-eval-and-learning-contractor-support-how"
+          >
+            In what capacity will they support your model?
+          </label>
+          <p
+            class="text-base margin-y-1"
+          >
+            (implementation, data analysis, quality, etc.)
+          </p>
+          <textarea
+            aria-labelledby="label-ops-eval-and-learning-contractor-support-how hint-ops-eval-and-learning-contractor-support-how"
+            class="height-card usa-textarea"
+            data-testid="ops-eval-and-learning-contractor-support-how"
+            id="ops-eval-and-learning-contractor-support-how"
+            name="contractorSupportHow"
+          >
+            Differ text
+          </textarea>
+        </div>
+        <div
+          class="margin-top-4 margin-bottom-8"
         >
-          <svg
-            aria-hidden="true"
-            class="usa-icon margin-right-1"
-            focusable="false"
-            height="1em"
-            role="img"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <button
+            class="usa-button usa-button usa-button--unstyled"
+            data-testid="add-note-toggle"
+            type="button"
           >
-            <path
-              d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-            />
-          </svg>
-          Add an additional note
-        </button>
+            <svg
+              aria-hidden="true"
+              class="usa-icon margin-right-1"
+              focusable="false"
+              height="1em"
+              role="img"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
+              />
+            </svg>
+            Add an additional note
+          </button>
+        </div>
       </div>
       <div
         class="usa-form-group margin-y-4 margin-bottom-8"
-        data-scroll="iddocSupport"
+        data-scroll="ops-eval-and-learning-iddoc-support"
       >
         <label
           class="usa-label"
diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx
index bede58149b..97eb9b4f80 100644
--- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx
+++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx
@@ -13,7 +13,7 @@ import {
   Label,
   TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   AgencyOrStateHelpType,
   CcmInvolvmentType,
@@ -301,85 +301,68 @@ export const OpsEvalAndLearningContent = () => {
                 }}
               >
                 <Fieldset disabled={!!error || loading}>
-                  <FieldArray
-                    name="agencyOrStateHelp"
-                    render={arrayHelpers => (
-                      <>
-                        <legend className="usa-label maxw-none">
-                          {opsEvalAndLearningT('agencyOrStateHelp.label')}
-                        </legend>
+                  <FieldGroup
+                    scrollElement="ops-eval-and-learning-agency-or-state-help"
+                    error={!!flatErrors.agencyOrStateHelp}
+                    className="margin-top-4"
+                  >
+                    <Label htmlFor="ops-eval-and-learning-agency-or-state-help">
+                      {opsEvalAndLearningT('agencyOrStateHelp.label')}
+                    </Label>
 
-                        <FieldErrorMsg>
-                          {flatErrors.agencyOrStateHelp}
-                        </FieldErrorMsg>
+                    <FieldErrorMsg>
+                      {flatErrors.agencyOrStateHelp}
+                    </FieldErrorMsg>
 
-                        {getKeys(agencyOrStateHelpConfig.options).map(type => {
-                          return (
-                            <Fragment key={type}>
-                              <Field
-                                as={CheckboxField}
-                                id={`ops-eval-and-learning-agency-or-state-help-${type}`}
-                                name="agencyOrStateHelp"
-                                label={agencyOrStateHelpConfig.options[type]}
-                                value={type}
-                                checked={values?.agencyOrStateHelp.includes(
-                                  type
-                                )}
-                                onChange={(
-                                  e: React.ChangeEvent<HTMLInputElement>
-                                ) => {
-                                  if (e.target.checked) {
-                                    arrayHelpers.push(e.target.value);
-                                  } else {
-                                    const idx = values.agencyOrStateHelp.indexOf(
-                                      e.target.value as AgencyOrStateHelpType
-                                    );
-                                    arrayHelpers.remove(idx);
-                                  }
-                                }}
-                              />
-
-                              {type === AgencyOrStateHelpType.OTHER &&
-                                values.agencyOrStateHelp.includes(
-                                  AgencyOrStateHelpType.OTHER
-                                ) && (
-                                  <div className="margin-left-4 margin-top-neg-3">
-                                    <Label
-                                      htmlFor="ops-eval-and-learning-agency-or-state-help-other"
-                                      className="text-normal"
-                                    >
-                                      {opsEvalAndLearningT(
-                                        'agencyOrStateHelpOther.label'
-                                      )}
-                                    </Label>
-
-                                    <FieldErrorMsg>
-                                      {flatErrors.agencyOrStateHelpOther}
-                                    </FieldErrorMsg>
-
-                                    <Field
-                                      as={TextAreaField}
-                                      className="maxw-none mint-textarea"
-                                      id="ops-eval-and-learning-agency-or-state-help-other"
-                                      maxLength={5000}
-                                      name="agencyOrStateHelpOther"
-                                    />
-                                  </div>
-                                )}
-                            </Fragment>
-                          );
-                        })}
-
-                        <AddNote
-                          id="ops-eval-and-learning-agency-or-state-help-note"
-                          field="agencyOrStateHelpNote"
-                        />
-                      </>
-                    )}
-                  />
+                    {getKeys(agencyOrStateHelpConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`ops-eval-and-learning-agency-or-state-help-${type}`}
+                            name="agencyOrStateHelp"
+                            label={agencyOrStateHelpConfig.options[type]}
+                            value={type}
+                            checked={values?.agencyOrStateHelp.includes(type)}
+                          />
+
+                          {type === AgencyOrStateHelpType.OTHER &&
+                            values.agencyOrStateHelp.includes(
+                              AgencyOrStateHelpType.OTHER
+                            ) && (
+                              <div className="margin-left-4">
+                                <Label
+                                  htmlFor="ops-eval-and-learning-agency-or-state-help-other"
+                                  className="text-normal"
+                                >
+                                  {opsEvalAndLearningT(
+                                    'agencyOrStateHelpOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.agencyOrStateHelpOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="ops-eval-and-learning-agency-or-state-help-other"
+                                  name="agencyOrStateHelpOther"
+                                />
+                              </div>
+                            )}
+                        </Fragment>
+                      );
+                    })}
+
+                    <AddNote
+                      id="ops-eval-and-learning-agency-or-state-help-note"
+                      field="agencyOrStateHelpNote"
+                    />
+                  </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="stakeholders"
+                    scrollElement="ops-eval-and-learning-stakeholders"
                     error={!!flatErrors.stakeholders}
                     className="margin-top-4"
                   >
@@ -412,9 +395,12 @@ export const OpsEvalAndLearningContent = () => {
 
                     {values.stakeholders.includes(StakeholdersType.OTHER) && (
                       <>
-                        <p className="margin-y-1 margin-top-3">
+                        <Label
+                          htmlFor="ops-eval-and-learning-stakeholders-other"
+                          className="margin-y-1 margin-top-3"
+                        >
                           {opsEvalAndLearningT('stakeholdersOther.label')}
-                        </p>
+                        </Label>
 
                         <FieldErrorMsg>
                           {flatErrors.stakeholdersOther}
@@ -438,7 +424,7 @@ export const OpsEvalAndLearningContent = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="helpdeskUse"
+                    scrollElement="ops-eval-and-learning-help-desk-use"
                     error={!!flatErrors.helpdeskUse}
                     className="margin-y-4 margin-bottom-8"
                   >
@@ -473,116 +459,93 @@ export const OpsEvalAndLearningContent = () => {
                     />
                   </FieldGroup>
 
-                  <FieldArray
-                    name="contractorSupport"
-                    render={arrayHelpers => (
-                      <>
-                        <legend className="usa-label maxw-none">
-                          {opsEvalAndLearningT('contractorSupport.label')}
-                        </legend>
-
-                        <FieldErrorMsg>
-                          {flatErrors.contractorSupport}
-                        </FieldErrorMsg>
-
-                        {getKeys(contractorSupportConfig.options).map(type => {
-                          return (
-                            <Fragment key={type}>
-                              <Field
-                                as={CheckboxField}
-                                id={`ops-eval-and-learning-contractor-support-${type}`}
-                                name="contractorSupport"
-                                label={contractorSupportConfig.options[type]}
-                                value={type}
-                                checked={values?.contractorSupport.includes(
-                                  type
-                                )}
-                                onChange={(
-                                  e: React.ChangeEvent<HTMLInputElement>
-                                ) => {
-                                  if (e.target.checked) {
-                                    arrayHelpers.push(e.target.value);
-                                  } else {
-                                    const idx = values.contractorSupport.indexOf(
-                                      e.target.value as ContractorSupportType
-                                    );
-                                    arrayHelpers.remove(idx);
-                                  }
-                                }}
-                              />
-
-                              {type === ContractorSupportType.OTHER &&
-                                values.contractorSupport.includes(
-                                  ContractorSupportType.OTHER
-                                ) && (
-                                  <div className="margin-left-4 margin-top-neg-3">
-                                    <Label
-                                      htmlFor="ops-eval-and-learning-contractor-support-other"
-                                      className="text-normal"
-                                    >
-                                      {opsEvalAndLearningT(
-                                        'contractorSupportOther.label'
-                                      )}
-                                    </Label>
-
-                                    <FieldErrorMsg>
-                                      {flatErrors.contractorSupportOther}
-                                    </FieldErrorMsg>
-
-                                    <Field
-                                      as={TextAreaField}
-                                      className="maxw-none mint-textarea"
-                                      id="ops-eval-and-learning-contractor-support-other"
-                                      maxLength={5000}
-                                      name="contractorSupportOther"
-                                    />
-                                  </div>
-                                )}
-                            </Fragment>
-                          );
-                        })}
-
-                        <FieldGroup
-                          scrollElement="contractorSupportHow"
-                          error={!!flatErrors.contractorSupportHow}
-                        >
-                          <Label
-                            htmlFor="ops-eval-and-learning-contractor-support-how"
-                            className="text-normal margin-top-4"
-                          >
-                            {opsEvalAndLearningT('contractorSupportHow.label')}
-                          </Label>
-
-                          <p className="text-base margin-y-1">
-                            {opsEvalAndLearningT(
-                              'contractorSupportHow.sublabel'
-                            )}
-                          </p>
+                  <FieldGroup scrollElement="ops-eval-and-learning-contractor-support">
+                    <Label htmlFor="ops-eval-and-learning-contractor-support">
+                      {opsEvalAndLearningT('contractorSupport.label')}
+                    </Label>
 
-                          <FieldErrorMsg>
-                            {flatErrors.contractorSupportHow}
-                          </FieldErrorMsg>
+                    <FieldErrorMsg>
+                      {flatErrors.contractorSupport}
+                    </FieldErrorMsg>
 
+                    {getKeys(contractorSupportConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
                           <Field
-                            as={TextAreaField}
-                            className="height-card"
-                            error={flatErrors.contractorSupportHow}
-                            id="ops-eval-and-learning-contractor-support-how"
-                            data-testid="ops-eval-and-learning-contractor-support-how"
-                            name="contractorSupportHow"
+                            as={CheckboxField}
+                            id={`ops-eval-and-learning-contractor-support-${type}`}
+                            name="contractorSupport"
+                            label={contractorSupportConfig.options[type]}
+                            value={type}
+                            checked={values?.contractorSupport.includes(type)}
                           />
-                        </FieldGroup>
 
-                        <AddNote
-                          id="ops-eval-and-learning-contractor-support-note"
-                          field="contractorSupportNote"
-                        />
-                      </>
-                    )}
-                  />
+                          {type === ContractorSupportType.OTHER &&
+                            values.contractorSupport.includes(
+                              ContractorSupportType.OTHER
+                            ) && (
+                              <div className="margin-left-4">
+                                <Label
+                                  htmlFor="ops-eval-and-learning-contractor-support-other"
+                                  className="text-normal"
+                                >
+                                  {opsEvalAndLearningT(
+                                    'contractorSupportOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.contractorSupportOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="ops-eval-and-learning-contractor-support-other"
+                                  name="contractorSupportOther"
+                                />
+                              </div>
+                            )}
+                        </Fragment>
+                      );
+                    })}
+
+                    <FieldGroup
+                      scrollElement="ops-eval-and-learning-contractor-support-how"
+                      error={!!flatErrors.contractorSupportHow}
+                    >
+                      <Label
+                        htmlFor="ops-eval-and-learning-contractor-support-how"
+                        className="text-normal margin-top-4"
+                      >
+                        {opsEvalAndLearningT('contractorSupportHow.label')}
+                      </Label>
+
+                      <p className="text-base margin-y-1">
+                        {opsEvalAndLearningT('contractorSupportHow.sublabel')}
+                      </p>
+
+                      <FieldErrorMsg>
+                        {flatErrors.contractorSupportHow}
+                      </FieldErrorMsg>
+
+                      <Field
+                        as={TextAreaField}
+                        className="height-card"
+                        error={flatErrors.contractorSupportHow}
+                        id="ops-eval-and-learning-contractor-support-how"
+                        data-testid="ops-eval-and-learning-contractor-support-how"
+                        name="contractorSupportHow"
+                      />
+                    </FieldGroup>
+
+                    <AddNote
+                      id="ops-eval-and-learning-contractor-support-note"
+                      field="contractorSupportNote"
+                    />
+                  </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="iddocSupport"
+                    scrollElement="ops-eval-and-learning-iddoc-support"
                     error={!!flatErrors.iddocSupport}
                     className="margin-y-4 margin-bottom-8"
                   >
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap
index 1d7aef10b3..a22706816f 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap
@@ -447,13 +447,15 @@ exports[`Model Plan Communication > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group"
-        data-scroll="communicationMethod"
+        data-scroll="participants-and-providers-communication-method"
       >
-        <legend
+        <label
           class="usa-label"
+          data-testid="label"
+          for="participants-and-providers-communication-method"
         >
           How will you communicate with participants?
-        </legend>
+        </label>
         <div
           class="mint-checkbox usa-checkbox"
         >
@@ -562,7 +564,7 @@ exports[`Model Plan Communication > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-y-4 margin-bottom-8"
-        data-scroll="riskType"
+        data-scroll="participants-and-providers-risk-type"
       >
         <label
           class="usa-label"
@@ -722,7 +724,7 @@ exports[`Model Plan Communication > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-y-4 margin-bottom-8"
-        data-scroll="willRiskChange"
+        data-scroll="participants-and-providers-risk-change"
       >
         <label
           class="usa-label"
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx
index ffeebd6d06..735c97ac43 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx
@@ -11,7 +11,7 @@ import {
   Label,
   TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   GetCommunicationQuery,
   ParticipantCommunicationType,
@@ -32,7 +32,6 @@ import CheckboxField from 'components/shared/CheckboxField';
 import { ErrorAlert, ErrorAlertMessage } from 'components/shared/ErrorAlert';
 import FieldErrorMsg from 'components/shared/FieldErrorMsg';
 import FieldGroup from 'components/shared/FieldGroup';
-import TextAreaField from 'components/shared/TextAreaField';
 import usePlanTranslation from 'hooks/usePlanTranslation';
 import useScrollElement from 'hooks/useScrollElement';
 import { getKeys } from 'types/translation';
@@ -268,107 +267,76 @@ export const Communication = () => {
                   />
 
                   <FieldGroup
-                    scrollElement="communicationMethod"
+                    scrollElement="participants-and-providers-communication-method"
                     error={!!flatErrors.communicationMethod}
                   >
-                    <FieldArray
-                      name="communicationMethod"
-                      render={arrayHelpers => (
-                        <>
-                          <legend className="usa-label">
-                            {participantsAndProvidersT(
-                              'communicationMethod.label'
-                            )}
-                          </legend>
-
-                          {itSolutionsStarted && (
-                            <ITSolutionsWarning
-                              id="participants-and-providers-communication-method-warning"
-                              onClick={() =>
-                                handleFormSubmit(
-                                  `/models/${modelID}/task-list/it-solutions`
-                                )
-                              }
-                            />
-                          )}
-
-                          <FieldErrorMsg>
-                            {flatErrors.communicationMethod}
-                          </FieldErrorMsg>
-
-                          {getKeys(communicationMethodConfig.options).map(
-                            type => {
-                              return (
-                                <Fragment key={type}>
-                                  <Field
-                                    as={CheckboxField}
-                                    id={`participants-and-providers-communication-method-${type}`}
-                                    name="communicationMethod"
-                                    label={
-                                      communicationMethodConfig.options[type]
-                                    }
-                                    value={type}
-                                    checked={values?.communicationMethod.includes(
-                                      type
-                                    )}
-                                    onChange={(
-                                      e: React.ChangeEvent<HTMLInputElement>
-                                    ) => {
-                                      if (e.target.checked) {
-                                        arrayHelpers.push(e.target.value);
-                                      } else {
-                                        const idx = values.communicationMethod.indexOf(
-                                          e.target
-                                            .value as ParticipantCommunicationType
-                                        );
-                                        arrayHelpers.remove(idx);
-                                      }
-                                    }}
-                                  />
-
-                                  {type ===
-                                    ParticipantCommunicationType.OTHER &&
-                                    values.communicationMethod.includes(
-                                      ParticipantCommunicationType.OTHER
-                                    ) && (
-                                      <div className="margin-left-4">
-                                        <Label
-                                          htmlFor="participants-and-providers-communication-method-other"
-                                          className="text-normal"
-                                        >
-                                          {participantsAndProvidersT(
-                                            'communicationMethodOther.label'
-                                          )}
-                                        </Label>
-
-                                        <FieldErrorMsg>
-                                          {flatErrors.communicationMethodOther}
-                                        </FieldErrorMsg>
-
-                                        <Field
-                                          as={TextAreaField}
-                                          className="maxw-none mint-textarea"
-                                          id="participants-and-providers-communication-method-other"
-                                          maxLength={5000}
-                                          name="communicationMethodOther"
-                                        />
-                                      </div>
-                                    )}
-                                </Fragment>
-                              );
-                            }
-                          )}
-                          <AddNote
-                            id="participants-and-providers-communication-method-note"
-                            field="communicationNote"
+                    <Label htmlFor="participants-and-providers-communication-method">
+                      {participantsAndProvidersT('communicationMethod.label')}
+                    </Label>
+
+                    {itSolutionsStarted && (
+                      <ITSolutionsWarning
+                        id="participants-and-providers-communication-method-warning"
+                        onClick={() =>
+                          handleFormSubmit(
+                            `/models/${modelID}/task-list/it-solutions`
+                          )
+                        }
+                      />
+                    )}
+
+                    <FieldErrorMsg>
+                      {flatErrors.communicationMethod}
+                    </FieldErrorMsg>
+
+                    {getKeys(communicationMethodConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`participants-and-providers-communication-method-${type}`}
+                            name="communicationMethod"
+                            label={communicationMethodConfig.options[type]}
+                            value={type}
+                            checked={values?.communicationMethod.includes(type)}
                           />
-                        </>
-                      )}
+
+                          {type === ParticipantCommunicationType.OTHER &&
+                            values.communicationMethod.includes(
+                              ParticipantCommunicationType.OTHER
+                            ) && (
+                              <div className="margin-left-4">
+                                <Label
+                                  htmlFor="participants-and-providers-communication-method-other"
+                                  className="text-normal"
+                                >
+                                  {participantsAndProvidersT(
+                                    'communicationMethodOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.communicationMethodOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="participants-and-providers-communication-method-other"
+                                  name="communicationMethodOther"
+                                />
+                              </div>
+                            )}
+                        </Fragment>
+                      );
+                    })}
+                    <AddNote
+                      id="participants-and-providers-communication-method-note"
+                      field="communicationNote"
                     />
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="riskType"
+                    scrollElement="participants-and-providers-risk-type"
                     error={!!flatErrors.riskType}
                     className="margin-y-4 margin-bottom-8"
                   >
@@ -419,7 +387,7 @@ export const Communication = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="willRiskChange"
+                    scrollElement="participants-and-providers-risk-change"
                     error={!!flatErrors.willRiskChange}
                     className="margin-y-4 margin-bottom-8"
                   >
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap
index 26f8b2a4d3..5b70ab0814 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap
@@ -99,7 +99,7 @@ exports[`Model Plan ParticipantsOptions > matches snapshot 1`] = `
     >
       <div
         class="usa-form-group"
-        data-scroll="expectedNumberOfParticipants"
+        data-scroll="participants-and-providers-expected-participants"
       >
         <label
           class="usa-label"
@@ -264,7 +264,7 @@ exports[`Model Plan ParticipantsOptions > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group"
-        data-scroll="recruitmentMethod"
+        data-scroll="participants-and-providers-recruitment-method"
       >
         <label
           class="usa-label"
@@ -401,7 +401,7 @@ exports[`Model Plan ParticipantsOptions > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-4"
-        data-scroll="selectionMethod"
+        data-scroll="participants-and-providers-selection-method"
       >
         <label
           class="usa-label"
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx
index a14ddc59d7..2648d07d93 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx
@@ -225,7 +225,7 @@ export const ParticipantOptions = () => {
               >
                 <Fieldset disabled={!!error || loading}>
                   <FieldGroup
-                    scrollElement="expectedNumberOfParticipants"
+                    scrollElement="participants-and-providers-expected-participants"
                     error={!!flatErrors.expectedNumberOfParticipants}
                   >
                     <Label htmlFor="participants-and-providers-expected-participants">
@@ -317,9 +317,6 @@ export const ParticipantOptions = () => {
                           label={estimateConfidenceConfig.options[key]}
                           value={key}
                           checked={values.estimateConfidence === key}
-                          onChange={() => {
-                            setFieldValue('estimateConfidence', key);
-                          }}
                         />
                       ))}
                     </Fieldset>
@@ -331,7 +328,7 @@ export const ParticipantOptions = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="recruitmentMethod"
+                    scrollElement="participants-and-providers-recruitment-method"
                     error={!!flatErrors.recruitmentMethod}
                   >
                     <Label htmlFor="participants-and-providers-recruitment-method">
@@ -363,9 +360,6 @@ export const ParticipantOptions = () => {
                             label={recruitmentMethodConfig.options[key]}
                             value={key}
                             checked={values.recruitmentMethod === key}
-                            onChange={() => {
-                              setFieldValue('recruitmentMethod', key);
-                            }}
                           />
 
                           {key === RecruitmentType.NOFO && (
@@ -408,7 +402,7 @@ export const ParticipantOptions = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="selectionMethod"
+                    scrollElement="participants-and-providers-selection-method"
                     error={!!flatErrors.selectionMethod}
                     className="margin-top-4"
                   >
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap
index 9eb3727963..dcf9cc802f 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap
@@ -274,7 +274,7 @@ exports[`Model Plan ProviderOptions > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-4"
-        data-scroll="providerAddMethod"
+        data-scroll="participants-and-providers-provider-add-method"
       >
         <label
           class="usa-label"
@@ -440,7 +440,7 @@ exports[`Model Plan ProviderOptions > matches snapshot 1`] = `
         </div>
         <div
           class="usa-form-group"
-          data-scroll="providerAddMethodOther"
+          data-scroll="participants-and-providers-provider-add-method-other"
         >
           <label
             class="usa-label text-normal"
@@ -487,13 +487,15 @@ exports[`Model Plan ProviderOptions > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-top-4"
-        data-scroll="providerLeaveMethod"
+        data-scroll="participants-and-providers-leave-method"
       >
-        <legend
+        <label
           class="usa-label"
+          data-testid="label"
+          for="participants-and-providers-leave-method"
         >
           Can providers leave the model? Select all that apply.
-        </legend>
+        </label>
         <p
           class="text-base margin-top-1 margin-bottom-0 line-height-body-3"
         >
@@ -821,7 +823,7 @@ exports[`Model Plan ProviderOptions > matches snapshot 1`] = `
       </div>
       <div
         class="usa-form-group margin-y-4 margin-bottom-8"
-        data-scroll="providerOverlap"
+        data-scroll="participants-and-providers-provider-overlap"
       >
         <label
           class="usa-label"
diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx
index cb223357ff..261ca4c74b 100644
--- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx
+++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx
@@ -9,9 +9,10 @@ import {
   Fieldset,
   Icon,
   Label,
-  Radio
+  Radio,
+  TextInput
 } from '@trussworks/react-uswds';
-import { Field, FieldArray, Form, Formik, FormikProps } from 'formik';
+import { Field, Form, Formik, FormikProps } from 'formik';
 import {
   GetProviderOptionsQuery,
   OverlapType,
@@ -274,7 +275,7 @@ export const ProviderOptions = () => {
                   />
 
                   <FieldGroup
-                    scrollElement="providerAddMethod"
+                    scrollElement="participants-and-providers-provider-add-method"
                     error={!!flatErrors.providerAddMethod}
                     className="margin-top-4"
                   >
@@ -314,7 +315,7 @@ export const ProviderOptions = () => {
                       ProviderAddType.OTHER
                     ) && (
                       <FieldGroup
-                        scrollElement="providerAddMethodOther"
+                        scrollElement="participants-and-providers-provider-add-method-other"
                         error={!!flatErrors.providerAddMethodOther}
                       >
                         <Label
@@ -348,96 +349,67 @@ export const ProviderOptions = () => {
                   </FieldGroup>
 
                   <FieldGroup
-                    scrollElement="providerLeaveMethod"
+                    scrollElement="participants-and-providers-leave-method"
                     error={!!flatErrors.providerLeaveMethod}
                     className="margin-top-4"
                   >
-                    <FieldArray
-                      name="providerLeaveMethod"
-                      render={arrayHelpers => (
-                        <>
-                          <legend className="usa-label">
-                            {participantsAndProvidersT(
-                              'providerLeaveMethod.label'
-                            )}
-                          </legend>
+                    <Label htmlFor="participants-and-providers-leave-method">
+                      {participantsAndProvidersT('providerLeaveMethod.label')}
+                    </Label>
 
-                          <p className="text-base margin-top-1 margin-bottom-0 line-height-body-3">
-                            {participantsAndProvidersT(
-                              'providerLeaveMethod.sublabel'
-                            )}
-                          </p>
-
-                          <FieldErrorMsg>
-                            {flatErrors.providerLeaveMethod}
-                          </FieldErrorMsg>
-
-                          {getKeys(providerLeaveMethodConfig.options).map(
-                            type => {
-                              return (
-                                <Fragment key={type}>
-                                  <Field
-                                    as={CheckboxField}
-                                    id={`participants-and-providers-leave-method-${type}`}
-                                    name="providerLeaveMethod"
-                                    label={
-                                      providerLeaveMethodConfig.options[type]
-                                    }
-                                    value={type}
-                                    checked={values?.providerLeaveMethod.includes(
-                                      type
-                                    )}
-                                    onChange={(
-                                      e: React.ChangeEvent<HTMLInputElement>
-                                    ) => {
-                                      if (e.target.checked) {
-                                        arrayHelpers.push(e.target.value);
-                                      } else {
-                                        const idx = values.providerLeaveMethod.indexOf(
-                                          e.target.value as ProviderLeaveType
-                                        );
-                                        arrayHelpers.remove(idx);
-                                      }
-                                    }}
-                                  />
-
-                                  {type === ProviderLeaveType.OTHER &&
-                                    values.providerLeaveMethod.includes(
-                                      type
-                                    ) && (
-                                      <div className="margin-left-4 margin-top-neg-3">
-                                        <Label
-                                          htmlFor="participants-and-providers-leave-method-other"
-                                          className="text-normal"
-                                        >
-                                          {participantsAndProvidersT(
-                                            'providerLeaveMethodOther.label'
-                                          )}
-                                        </Label>
-
-                                        <FieldErrorMsg>
-                                          {flatErrors.providerLeaveMethodOther}
-                                        </FieldErrorMsg>
-
-                                        <Field
-                                          as={TextAreaField}
-                                          className="maxw-none mint-textarea"
-                                          id="participants-and-providers-leave-method-other"
-                                          maxLength={5000}
-                                          name="providerLeaveMethodOther"
-                                        />
-                                      </div>
-                                    )}
-                                </Fragment>
-                              );
-                            }
-                          )}
-                          <AddNote
-                            id="participants-and-providers-leave-method-note"
-                            field="providerLeaveMethodNote"
-                          />
-                        </>
+                    <p className="text-base margin-top-1 margin-bottom-0 line-height-body-3">
+                      {participantsAndProvidersT(
+                        'providerLeaveMethod.sublabel'
                       )}
+                    </p>
+
+                    <FieldErrorMsg>
+                      {flatErrors.providerLeaveMethod}
+                    </FieldErrorMsg>
+
+                    {getKeys(providerLeaveMethodConfig.options).map(type => {
+                      return (
+                        <Fragment key={type}>
+                          <Field
+                            as={CheckboxField}
+                            id={`participants-and-providers-leave-method-${type}`}
+                            name="providerLeaveMethod"
+                            label={providerLeaveMethodConfig.options[type]}
+                            value={type}
+                            checked={values?.providerLeaveMethod.includes(type)}
+                          />
+
+                          {type === ProviderLeaveType.OTHER &&
+                            values.providerLeaveMethod.includes(
+                              ProviderLeaveType.OTHER
+                            ) && (
+                              <div className="margin-left-4">
+                                <Label
+                                  htmlFor="participants-and-providers-leave-method-other"
+                                  className="text-normal"
+                                >
+                                  {participantsAndProvidersT(
+                                    'providerLeaveMethodOther.label'
+                                  )}
+                                </Label>
+
+                                <FieldErrorMsg>
+                                  {flatErrors.providerLeaveMethodOther}
+                                </FieldErrorMsg>
+
+                                <Field
+                                  as={TextInput}
+                                  id="participants-and-providers-leave-method-other"
+                                  name="providerLeaveMethodOther"
+                                />
+                              </div>
+                            )}
+                        </Fragment>
+                      );
+                    })}
+                    <AddNote
+                      id="participants-and-providers-leave-method-note"
+                      field="providerLeaveMethodNote"
                     />
                   </FieldGroup>
 
@@ -454,7 +426,7 @@ export const ProviderOptions = () => {
                   />
 
                   <FieldGroup
-                    scrollElement="providerOverlap"
+                    scrollElement="participants-and-providers-provider-overlap"
                     error={!!flatErrors.providerOverlap}
                     className="margin-y-4 margin-bottom-8"
                   >
@@ -485,9 +457,6 @@ export const ProviderOptions = () => {
                             label={providerOverlapConfig.options[key]}
                             value={key}
                             checked={values.providerOverlap === key}
-                            onChange={() => {
-                              setFieldValue('providerOverlap', key);
-                            }}
                           />
                         </Fragment>
                       ))}
@@ -497,7 +466,7 @@ export const ProviderOptions = () => {
                       OverlapType.YES_NEED_POLICIES ||
                       values.providerOverlap === OverlapType.YES_NO_ISSUES) && (
                       <FieldGroup
-                        scrollElement="providerOverlapHierarchy"
+                        scrollElement="participants-and-providers-provider-overlap-hierarchy"
                         error={!!flatErrors.providerOverlapHierarchy}
                       >
                         <Label
diff --git a/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap
index 838a8e830a..7ab15038bd 100644
--- a/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap
+++ b/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap
@@ -111,12 +111,12 @@ exports[`Model Plan -- Complexity > matches snapshot 1`] = `
           >
             <div
               class="usa-form-group margin-top-4"
-              data-scroll="expectedCalculationComplexityLevel"
+              data-scroll="payment-complexity"
             >
               <label
                 class="usa-label maxw-none"
                 data-testid="label"
-                for="expectedCalculationComplexityLevel"
+                for="payment-complexity"
               >
                 What level of complexity do you expect calculations to be?
               </label>
@@ -210,7 +210,7 @@ exports[`Model Plan -- Complexity > matches snapshot 1`] = `
             </div>
             <div
               class="usa-form-group margin-y-4 margin-bottom-8"
-              data-scroll="claimsProcessingPrecedence"
+              data-scroll="payment-claims-processing-precendece"
             >
               <label
                 class="usa-label"
@@ -312,12 +312,12 @@ exports[`Model Plan -- Complexity > matches snapshot 1`] = `
             </div>
             <div
               class="usa-form-group margin-top-4"
-              data-scroll="canParticipantsSelectBetweenPaymentMechanisms"
+              data-scroll="payment-multiple-payments"
             >
               <label
                 class="usa-label maxw-none"
                 data-testid="label"
-                for="canParticipantsSelectBetweenPaymentMechanisms"
+                for="payment-multiple-payments"
               >
                 Will participants be allowed to select between multiple payment mechanisms?
               </label>
diff --git a/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx b/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx
index a933856cea..9180ae4d73 100644
--- a/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx
+++ b/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx
@@ -256,14 +256,14 @@ const Complexity = () => {
                     >
                       <Fieldset disabled={!!error || loading}>
                         <FieldGroup
-                          scrollElement="expectedCalculationComplexityLevel"
+                          scrollElement="payment-complexity"
                           error={
                             !!flatErrors.expectedCalculationComplexityLevel
                           }
                           className="margin-top-4"
                         >
                           <Label
-                            htmlFor="expectedCalculationComplexityLevel"
+                            htmlFor="payment-complexity"
                             className="maxw-none"
                           >
                             {paymentsT(
@@ -294,12 +294,6 @@ const Complexity = () => {
                                   values.expectedCalculationComplexityLevel ===
                                   key
                                 }
-                                onChange={() => {
-                                  setFieldValue(
-                                    'expectedCalculationComplexityLevel',
-                                    key
-                                  );
-                                }}
                               />
                             ))}
                           </Fieldset>
@@ -311,7 +305,7 @@ const Complexity = () => {
                         </FieldGroup>
 
                         <FieldGroup
-                          scrollElement="claimsProcessingPrecedence"
+                          scrollElement="payment-claims-processing-precendece"
                           className="margin-y-4 margin-bottom-8"
                         >
                           <Label htmlFor="payment-claims-processing-precendece">
@@ -361,14 +355,14 @@ const Complexity = () => {
                         </FieldGroup>
 
                         <FieldGroup
-                          scrollElement="canParticipantsSelectBetweenPaymentMechanisms"
+                          scrollElement="payment-multiple-payments"
                           error={
                             !!flatErrors.canParticipantsSelectBetweenPaymentMechanisms
                           }
                           className="margin-top-4"
                         >
                           <Label
-                            htmlFor="canParticipantsSelectBetweenPaymentMechanisms"
+                            htmlFor="payment-multiple-payments"
                             className="maxw-none"
                           >
                             {paymentsT(