diff --git a/docker/templates/non_proxy_headers.conf.template b/docker/templates/non_proxy_headers.conf.template
index 6989c94f4..473a3e0b5 100644
--- a/docker/templates/non_proxy_headers.conf.template
+++ b/docker/templates/non_proxy_headers.conf.template
@@ -7,5 +7,5 @@ add_header Strict-Transport-Security "max-age=63072000; includeSubdomains;" alwa
 add_header X-Frame-Options "SAMEORIGIN" always;
 add_header X-XSS-Protection "1; mode=block" always;
 add_header X-Content-Type-Options "nosniff" always;
-add_header Feature-Policy "geolocation 'self'; midi 'none'; notifications 'none'; push 'none'; sync-xhr 'none'; microphone 'none'; camera 'none'; magnetometer 'none'; gyroscope 'none'; speaker 'none'; vibrate 'none'; fullscreen 'none'; payment 'none'; usb 'none';";
+add_header Feature-Policy "geolocation 'self'; midi 'none'; sync-xhr 'none'; microphone 'none'; camera 'none'; magnetometer 'none'; gyroscope 'none'; fullscreen 'none'; payment 'none'; usb 'none';";
 add_header Permissions-Policy "geolocation=(self)";
diff --git a/src/components/elements/ButtonTooltipContainer.tsx b/src/components/elements/ButtonTooltipContainer.tsx
index 338858985..c4d727648 100644
--- a/src/components/elements/ButtonTooltipContainer.tsx
+++ b/src/components/elements/ButtonTooltipContainer.tsx
@@ -8,7 +8,16 @@ const ButtonTooltipContainer = ({
   if (!title) return children;
 
   return (
-    <Tooltip title={title} placement='top' arrow {...props}>
+    <Tooltip
+      title={title}
+      placement='top'
+      // describeChild makes the tooltip text become the `title` of the direct child,
+      // which is a span in this case. Otherwise it would become the `aria-label` of
+      // the direct child, which is not valid for spans.
+      describeChild
+      arrow
+      {...props}
+    >
       <span>{children}</span>
     </Tooltip>
   );
diff --git a/src/components/elements/SkipToContentButton.tsx b/src/components/elements/SkipToContentButton.tsx
new file mode 100644
index 000000000..61f43e18d
--- /dev/null
+++ b/src/components/elements/SkipToContentButton.tsx
@@ -0,0 +1,55 @@
+import { Button } from '@mui/material';
+import { ReactNode } from 'react';
+
+type SkipToContentProps = {
+  focusTargetId: string;
+  children?: ReactNode;
+};
+
+const SkipToContent: React.FC<SkipToContentProps> = ({
+  focusTargetId,
+  children,
+}) => {
+  const handleClick = () => {
+    const container = document.getElementById(focusTargetId);
+    if (container) {
+      // First ensure the container is focusable
+      if (!container.hasAttribute('tabindex')) {
+        container.setAttribute('tabindex', '-1');
+      }
+      container.focus({ preventScroll: true });
+    }
+  };
+
+  return (
+    <Button
+      variant='contained'
+      onClick={handleClick}
+      sx={{
+        // Use `clip` to hide the button when it isn't focused, without preventing focus entirely (which display:none and visibility:hidden would do)
+        // `clip` is considered deprecated, but more widely supported than the more modern `clipPath`
+        clip: 'rect(0 0 0 0)',
+        clipPath: 'inset(50%)',
+
+        // Remove padding, border, and margin
+        padding: 0,
+        margin: 0,
+        border: 'none',
+        position: 'absolute', // Ensure it doesn't take up any space
+
+        '&:focus': {
+          // On focus, restore clip and other styles so the button is visible and styled normally
+          clip: 'auto',
+          clipPath: 'none',
+          position: 'relative',
+          padding: '8px 16px',
+          border: '1px solid',
+        },
+      }}
+    >
+      {children || 'Skip to Content'}
+    </Button>
+  );
+};
+
+export default SkipToContent;
diff --git a/src/components/layout/BasicBreadcrumbPageLayout.tsx b/src/components/layout/BasicBreadcrumbPageLayout.tsx
index fd3bd2396..90388cf1d 100644
--- a/src/components/layout/BasicBreadcrumbPageLayout.tsx
+++ b/src/components/layout/BasicBreadcrumbPageLayout.tsx
@@ -4,6 +4,7 @@ import { ReactNode } from 'react';
 
 import { ContextHeaderAppBar } from './dashboard/contextHeader/ContextHeader';
 import Breadcrumbs, { Breadcrumb } from '@/components/elements/Breadcrumbs';
+import { FOCUSABLE_MAIN_TARGET_ID } from '@/components/layout/MainLayout';
 
 const BasicBreadcrumbPageLayout = ({
   crumbs,
@@ -21,7 +22,12 @@ const BasicBreadcrumbPageLayout = ({
           <Breadcrumbs crumbs={crumbs} />
         </Container>
       </ContextHeaderAppBar>
-      <Container component='main' maxWidth={maxWidth} sx={{ pt: 2, pb: 6 }}>
+      <Container
+        component='main'
+        maxWidth={maxWidth}
+        sx={{ pt: 2, pb: 6 }}
+        id={FOCUSABLE_MAIN_TARGET_ID}
+      >
         {children}
       </Container>
     </>
diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx
index d1573fb6b..7960e68b0 100644
--- a/src/components/layout/MainLayout.tsx
+++ b/src/components/layout/MainLayout.tsx
@@ -14,6 +14,7 @@ import PrintViewButton from './PrintViewButton';
 import WarehouseLinkBar from './WarehouseLinkBar';
 
 import Loading from '@/components/elements/Loading';
+import SkipToContentButton from '@/components/elements/SkipToContentButton';
 import MobileMenu from '@/components/layout/nav/MobileMenu';
 import ToolbarMenu from '@/components/layout/nav/ToolbarMenu';
 import { useIsDashboard } from '@/components/layout/nav/useIsDashboard';
@@ -29,6 +30,8 @@ interface Props {
   children: React.ReactNode;
 }
 
+export const FOCUSABLE_MAIN_TARGET_ID = 'focusable-main';
+
 const MainLayout: React.FC<Props> = ({ mobileMenuContext, children }) => {
   const { appName } = useHmisAppSettings();
   const isPrint = useIsPrintView();
@@ -99,6 +102,7 @@ const MainLayout: React.FC<Props> = ({ mobileMenuContext, children }) => {
           sx={{ px: isMobile ? 1 : 3, minHeight: APP_BAR_HEIGHT }}
           disableGutters={isMobile}
         >
+          <SkipToContentButton focusTargetId={FOCUSABLE_MAIN_TARGET_ID} />
           <RouterLink
             variant='h1'
             noWrap
diff --git a/src/components/layout/PageContainer.tsx b/src/components/layout/PageContainer.tsx
index 13cd21427..1492aa1af 100644
--- a/src/components/layout/PageContainer.tsx
+++ b/src/components/layout/PageContainer.tsx
@@ -1,6 +1,7 @@
 import { Typography } from '@mui/material';
 import { Box, Container, Stack } from '@mui/system';
 import { ReactNode } from 'react';
+import { FOCUSABLE_MAIN_TARGET_ID } from '@/components/layout/MainLayout';
 import { useIsMobile } from '@/hooks/useIsMobile';
 
 const PageContainer = ({
@@ -15,6 +16,7 @@ const PageContainer = ({
   const isTiny = useIsMobile('sm');
   return (
     <Container
+      id={FOCUSABLE_MAIN_TARGET_ID}
       component='main'
       maxWidth='lg'
       sx={{ px: { xs: 1, sm: 3, lg: 4 }, pt: 4, pb: 6 }}
diff --git a/src/components/layout/dashboard/DashboardContentContainer.tsx b/src/components/layout/dashboard/DashboardContentContainer.tsx
index f460a758a..9676d00a9 100644
--- a/src/components/layout/dashboard/DashboardContentContainer.tsx
+++ b/src/components/layout/dashboard/DashboardContentContainer.tsx
@@ -8,6 +8,7 @@ import { DESKTOP_NAV_SIDEBAR_WIDTH } from '../layoutConstants';
 import ContextHeader from './contextHeader/ContextHeader';
 import DashboardContentNav from './DashboardContentNav';
 
+import { FOCUSABLE_MAIN_TARGET_ID } from '@/components/layout/MainLayout';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import useMaxPageWidth from '@/hooks/useMaxPageWidth';
 import SentryErrorBoundary from '@/modules/errors/components/SentryErrorBoundary';
@@ -85,6 +86,7 @@ const DashboardContentContainer: React.FC<Props> = ({
             handleCloseMobileMenu={handleCloseMobileMenu}
             handleCloseDesktopMenu={handleCloseDesktopMenu}
             label={navLabel}
+            skipNavFocusTargetId={FOCUSABLE_MAIN_TARGET_ID}
           >
             {sidebar}
           </DashboardContentNav>
@@ -121,6 +123,7 @@ const DashboardContentContainer: React.FC<Props> = ({
           <Box
             key='content'
             component='main'
+            id={FOCUSABLE_MAIN_TARGET_ID}
             sx={{
               pt: 2,
               pb: 8,
diff --git a/src/components/layout/dashboard/DashboardContentNav.tsx b/src/components/layout/dashboard/DashboardContentNav.tsx
index 03109eb89..5cc2bfbd0 100644
--- a/src/components/layout/dashboard/DashboardContentNav.tsx
+++ b/src/components/layout/dashboard/DashboardContentNav.tsx
@@ -7,6 +7,7 @@ import {
   DESKTOP_NAV_SIDEBAR_WIDTH,
   STICKY_BAR_HEIGHT,
 } from '../layoutConstants';
+import SkipToContentButton from '@/components/elements/SkipToContentButton';
 import MobileMenu from '@/components/layout/nav/MobileMenu';
 
 interface Props {
@@ -17,13 +18,16 @@ interface Props {
   handleCloseMobileMenu: VoidFunction;
   handleCloseDesktopMenu: VoidFunction;
   label?: string;
+  skipNavFocusTargetId: string;
 }
 
 const CloseMenuRow = ({
   onClose,
   label,
+  skipNavFocusTargetId,
 }: {
   onClose: VoidFunction;
+  skipNavFocusTargetId: string;
   label?: string;
 }) => (
   <Stack
@@ -46,6 +50,7 @@ const CloseMenuRow = ({
     ) : (
       <Box />
     )}
+    <SkipToContentButton focusTargetId={skipNavFocusTargetId} />
     <Button
       variant='text'
       color='grayscale'
@@ -65,6 +70,7 @@ const DashboardContentNav: React.FC<Props> = ({
   handleCloseMobileMenu,
   handleCloseDesktopMenu,
   label,
+  skipNavFocusTargetId,
 }) => {
   const headerHeight = `${STICKY_BAR_HEIGHT}px`;
   const height = `calc(100vh - ${headerHeight})`;
@@ -110,7 +116,11 @@ const DashboardContentNav: React.FC<Props> = ({
         })}
       >
         <Box component='nav' aria-label='sidebar-nav'>
-          <CloseMenuRow onClose={handleCloseDesktopMenu} label={label} />
+          <CloseMenuRow
+            onClose={handleCloseDesktopMenu}
+            label={label}
+            skipNavFocusTargetId={skipNavFocusTargetId}
+          />
           <Box
             sx={{
               pl: 3,
diff --git a/src/modules/admin/components/forms/FormPreview.tsx b/src/modules/admin/components/forms/FormPreview.tsx
index f0b4bbe0d..71dfaf787 100644
--- a/src/modules/admin/components/forms/FormPreview.tsx
+++ b/src/modules/admin/components/forms/FormPreview.tsx
@@ -1,4 +1,4 @@
-import { Button, Grid } from '@mui/material';
+import { Button } from '@mui/material';
 import { Stack } from '@mui/system';
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { generatePath } from 'react-router-dom';
@@ -19,16 +19,16 @@ import SentryErrorBoundary from '@/modules/errors/components/SentryErrorBoundary
 import DynamicForm, {
   DynamicFormRef,
 } from '@/modules/form/components/DynamicForm';
-import FormNavigation from '@/modules/form/components/FormNavigation';
+import FormNavigationContainer from '@/modules/form/components/FormNavigationContainer';
 import DynamicView from '@/modules/form/components/viewable/DynamicView';
 import { FormValues } from '@/modules/form/types';
 import {
   AlwaysPresentLocalConstants,
   createInitialValuesFromSavedValues,
+  createValuesForSubmit,
   getFormStepperItems,
   getInitialValues,
   getItemMap,
-  createValuesForSubmit,
 } from '@/modules/form/util/formUtil';
 import { RootPermissionsFilter } from '@/modules/permissions/PermissionsFilters';
 import { AdminDashboardRoutes } from '@/routes/routes';
@@ -207,13 +207,9 @@ const FormPreview = () => {
       </Stack>
 
       <SentryErrorBoundary>
-        {formStepperItems ? (
-          <Grid container spacing={2} sx={{ pb: 20, mt: 0 }}>
-            <FormNavigation items={formStepperItems}>{form}</FormNavigation>
-          </Grid>
-        ) : (
-          form
-        )}
+        <FormNavigationContainer navItems={formStepperItems}>
+          {form}
+        </FormNavigationContainer>
       </SentryErrorBoundary>
     </>
   );
diff --git a/src/modules/admin/components/projectConfig/ProjectConfigTable.tsx b/src/modules/admin/components/projectConfig/ProjectConfigTable.tsx
index c8a1aebce..ff442f6a7 100644
--- a/src/modules/admin/components/projectConfig/ProjectConfigTable.tsx
+++ b/src/modules/admin/components/projectConfig/ProjectConfigTable.tsx
@@ -89,9 +89,7 @@ const ProjectConfigTable = ({
                   recordName='Project Config'
                   onSuccess={() => evictProjectConfigs()}
                   onlyIcon
-                >
-                  Delete
-                </DeleteMutationButton>
+                />
               </Box>
             ),
           },
diff --git a/src/modules/assessments/components/AssessmentForm.tsx b/src/modules/assessments/components/AssessmentForm.tsx
index 501637277..a35a42e86 100644
--- a/src/modules/assessments/components/AssessmentForm.tsx
+++ b/src/modules/assessments/components/AssessmentForm.tsx
@@ -1,5 +1,5 @@
 import UnlockIcon from '@mui/icons-material/Lock';
-import { Grid, Stack, Typography } from '@mui/material';
+import { Stack, Typography } from '@mui/material';
 import { assign } from 'lodash-es';
 import {
   ReactNode,
@@ -24,7 +24,7 @@ import useIsPrintView from '@/hooks/useIsPrintView';
 import usePrintTrigger from '@/hooks/usePrintTrigger';
 import { useScrollToHash } from '@/hooks/useScrollToHash';
 import AssessmentAutofillButton from '@/modules/assessments/components/AssessmentAutofillButton';
-import AssessmentFormSideBar from '@/modules/assessments/components/AssessmentFormSideBar';
+import AssessmentFormActions from '@/modules/assessments/components/AssessmentFormActions';
 import AssessmentHistoryInfo from '@/modules/assessments/components/AssessmentHistory';
 import { HouseholdAssessmentFormAction } from '@/modules/assessments/components/household/formState';
 
@@ -35,6 +35,7 @@ import DynamicForm, {
   DynamicFormRef,
 } from '@/modules/form/components/DynamicForm';
 import FormActions from '@/modules/form/components/FormActions';
+import FormNavigationContainer from '@/modules/form/components/FormNavigationContainer';
 import DynamicView from '@/modules/form/components/viewable/DynamicView';
 import usePreloadPicklists from '@/modules/form/hooks/usePreloadPicklists';
 import { AssessmentForPopulation, FormActionTypes } from '@/modules/form/types';
@@ -305,40 +306,53 @@ const AssessmentForm: React.FC<Props> = ({
   const isCustomAssessment = definition.role === FormRole.CustomAssessment;
   const showAutofill = !isCustomAssessment && !assessment && canEdit;
 
-  const titleNode = (
-    <AssessmentTitle
-      assessmentTitle={definition.title}
-      clientName={clientBriefName(client)}
-      clientId={client.id}
-      projectName={enrollment.project.projectName}
-      enrollmentId={enrollment.id}
-      entryDate={enrollment.entryDate}
-      exitDate={enrollment.exitDate}
-    />
+  const titleNode = useMemo(
+    () => (
+      <AssessmentTitle
+        assessmentTitle={definition.title}
+        clientName={clientBriefName(client)}
+        clientId={client.id}
+        projectName={enrollment.project.projectName}
+        enrollmentId={enrollment.id}
+        entryDate={enrollment.entryDate}
+        exitDate={enrollment.exitDate}
+      />
+    ),
+    [
+      client,
+      definition.title,
+      enrollment.entryDate,
+      enrollment.exitDate,
+      enrollment.id,
+      enrollment.project.projectName,
+    ]
   );
 
-  const navigation = (
-    <Grid item xs={2.5} sx={{ pr: 2, pt: '0 !important' }}>
-      <AssessmentFormSideBar
+  const formActionsNode = useMemo(
+    () => (
+      <AssessmentFormActions
         enrollment={enrollment}
-        definition={definition}
         assessment={assessment}
         isPrintView={isPrintView}
         locked={locked}
-        embeddedInWorkflow={embeddedInWorkflow}
         showAutofill={showAutofill}
         onAutofill={() => setDialogOpen(true)}
-        top={top}
       />
-    </Grid>
+    ),
+    [assessment, enrollment, isPrintView, locked, showAutofill]
   );
 
   const showNavigation = !isPrintView && !isMobile;
 
   return (
-    <Grid container spacing={2} sx={{ pb: 20, mt: 0 }}>
-      {showNavigation && navigation}
-      <Grid item xs={showNavigation ? 9.5 : 12} sx={{ pt: '0 !important' }}>
+    <>
+      <FormNavigationContainer
+        navTitle={'Assessment Sections'}
+        navItems={showNavigation ? definition.definition.item : undefined}
+        navScrollOffset={top}
+        useUrlHash={!embeddedInWorkflow}
+        contentsBelowNavigation={formActionsNode}
+      >
         <Stack sx={{ mb: 1 }} gap={1}>
           {titleNode}
           {locked && (
@@ -422,26 +436,24 @@ const AssessmentForm: React.FC<Props> = ({
             warnIfEmpty={!!assessment || hasAnyValue(errors)}
           />
         )}
-      </Grid>
+      </FormNavigationContainer>
 
       {/* Dialog for selecting autofill record */}
-      {definition && (
-        <RecordPickerDialog
-          id='assessmentPickerDialog'
-          clientId={client.id}
-          open={dialogOpen}
-          role={definition.role}
-          onSelected={onSelectAutofillRecord}
-          onCancel={() => setDialogOpen(false)}
-          description={
-            <Typography variant='body2' sx={{ my: 2 }}>
-              Select a previous assessment to populate the current assessment.
-              Any changes you have made will be overwritten.
-            </Typography>
-          }
-        />
-      )}
-    </Grid>
+      <RecordPickerDialog
+        id='assessmentPickerDialog'
+        clientId={client.id}
+        open={dialogOpen}
+        role={definition.role}
+        onSelected={onSelectAutofillRecord}
+        onCancel={() => setDialogOpen(false)}
+        description={
+          <Typography variant='body2' sx={{ my: 2 }}>
+            Select a previous assessment to populate the current assessment. Any
+            changes you have made will be overwritten.
+          </Typography>
+        }
+      />
+    </>
   );
 };
 
diff --git a/src/modules/assessments/components/AssessmentFormActions.tsx b/src/modules/assessments/components/AssessmentFormActions.tsx
new file mode 100644
index 000000000..94bead649
--- /dev/null
+++ b/src/modules/assessments/components/AssessmentFormActions.tsx
@@ -0,0 +1,103 @@
+import { Stack } from '@mui/material';
+import { useMemo } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import DeleteAssessmentButton from './DeleteAssessmentButton';
+import PrintViewButton from '@/components/layout/PrintViewButton';
+import AssessmentAutofillButton from '@/modules/assessments/components/AssessmentAutofillButton';
+
+import { EnrollmentDashboardRoutes } from '@/routes/routes';
+import {
+  AssessmentRole,
+  EnrollmentFieldsFragment,
+  FullAssessmentFragment,
+} from '@/types/gqlTypes';
+import { generateSafePath } from '@/utils/pathEncoding';
+
+interface Props {
+  enrollment: EnrollmentFieldsFragment;
+  assessment?: FullAssessmentFragment;
+  onAutofill: VoidFunction;
+  isPrintView: boolean;
+  locked: boolean;
+  showAutofill?: boolean;
+}
+
+const AssessmentFormActions: React.FC<Props> = ({
+  enrollment,
+  assessment,
+  onAutofill,
+  isPrintView,
+  locked,
+  showAutofill = true,
+}) => {
+  const navigate = useNavigate();
+  const navigateToEnrollment = useMemo(
+    () => () =>
+      navigate(
+        generateSafePath(EnrollmentDashboardRoutes.ASSESSMENTS, {
+          clientId: enrollment.client.id,
+          enrollmentId: enrollment.id,
+        })
+      ),
+    [enrollment, navigate]
+  );
+
+  const showDeleteAssessmentButton = useMemo(() => {
+    if (!assessment) return false;
+
+    const { canDeleteAssessments, canEditEnrollments, canDeleteEnrollments } =
+      assessment.access;
+
+    // canEditEnrollments is required for deleting WIP or Submitted assessments
+    if (!canEditEnrollments) return false;
+
+    const isSubmitted = !assessment.inProgress;
+    const deletesEnrollment = assessment.role === AssessmentRole.Intake;
+    if (isSubmitted) {
+      // canDeleteAssessments is required for deleting submitted assessments
+      if (!canDeleteAssessments) return false;
+
+      // canDeleteEnrollments is required for deleting submitted INTAKE assessments
+      if (!canDeleteEnrollments && deletesEnrollment) return false;
+    }
+
+    return true;
+  }, [assessment]);
+
+  const showPrintViewButton = !isPrintView && locked && assessment;
+
+  if (showAutofill || showPrintViewButton || showDeleteAssessmentButton) {
+    return (
+      <>
+        <Stack gap={2}>
+          {showAutofill && <AssessmentAutofillButton onClick={onAutofill} />}
+          {showPrintViewButton && (
+            <PrintViewButton
+              openInNew
+              to={generateSafePath(EnrollmentDashboardRoutes.VIEW_ASSESSMENT, {
+                clientId: assessment.enrollment.client.id,
+                enrollmentId: assessment.enrollment.id,
+                assessmentId: assessment.id,
+              })}
+            >
+              Print
+            </PrintViewButton>
+          )}
+          {showDeleteAssessmentButton && assessment && (
+            <DeleteAssessmentButton
+              assessment={assessment}
+              clientId={enrollment.client.id}
+              enrollmentId={enrollment.id}
+              onSuccess={navigateToEnrollment}
+            />
+          )}
+        </Stack>
+      </>
+    );
+  }
+
+  return null;
+};
+
+export default AssessmentFormActions;
diff --git a/src/modules/assessments/components/AssessmentFormSideBar.tsx b/src/modules/assessments/components/AssessmentFormSideBar.tsx
deleted file mode 100644
index 486a1eaeb..000000000
--- a/src/modules/assessments/components/AssessmentFormSideBar.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { Box, Divider, Paper, Stack, Typography } from '@mui/material';
-import { useMemo } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-import DeleteAssessmentButton from './DeleteAssessmentButton';
-
-import {
-  CONTEXT_HEADER_HEIGHT,
-  STICKY_BAR_HEIGHT,
-} from '@/components/layout/layoutConstants';
-import PrintViewButton from '@/components/layout/PrintViewButton';
-import AssessmentAutofillButton from '@/modules/assessments/components/AssessmentAutofillButton';
-import FormStepper from '@/modules/form/components/FormStepper';
-
-import { EnrollmentDashboardRoutes } from '@/routes/routes';
-import {
-  AssessmentRole,
-  EnrollmentFieldsFragment,
-  FormDefinitionFieldsFragment,
-  FullAssessmentFragment,
-} from '@/types/gqlTypes';
-import { generateSafePath } from '@/utils/pathEncoding';
-
-interface Props {
-  enrollment: EnrollmentFieldsFragment;
-  definition: FormDefinitionFieldsFragment;
-  assessment?: FullAssessmentFragment;
-  embeddedInWorkflow?: boolean;
-  onAutofill: VoidFunction;
-  printPath?: string;
-  isPrintView: boolean;
-  locked: boolean;
-  top?: number;
-  showAutofill?: boolean;
-}
-
-const AssessmentFormSideBar: React.FC<Props> = ({
-  enrollment,
-  definition,
-  assessment,
-  embeddedInWorkflow,
-  onAutofill,
-  isPrintView,
-  locked,
-  top = STICKY_BAR_HEIGHT + CONTEXT_HEADER_HEIGHT,
-  showAutofill = true,
-}) => {
-  const navigate = useNavigate();
-  const navigateToEnrollment = useMemo(
-    () => () =>
-      navigate(
-        generateSafePath(EnrollmentDashboardRoutes.ASSESSMENTS, {
-          clientId: enrollment.client.id,
-          enrollmentId: enrollment.id,
-        })
-      ),
-    [enrollment, navigate]
-  );
-
-  const showDeleteAssessmentButton = useMemo(() => {
-    if (!assessment) return false;
-
-    const { canDeleteAssessments, canEditEnrollments, canDeleteEnrollments } =
-      assessment.access;
-
-    // canEditEnrollments is required for deleting WIP or Submitted assessments
-    if (!canEditEnrollments) return false;
-
-    const isSubmitted = !assessment.inProgress;
-    const deletesEnrollment = assessment.role === AssessmentRole.Intake;
-    if (isSubmitted) {
-      // canDeleteAssessments is required for deleting submitted assessments
-      if (!canDeleteAssessments) return false;
-
-      // canDeleteEnrollments is required for deleting submitted INTAKE assessments
-      if (!canDeleteEnrollments && deletesEnrollment) return false;
-    }
-
-    return true;
-  }, [assessment]);
-
-  const showPrintViewButton = !isPrintView && locked && assessment;
-
-  return (
-    <Paper
-      sx={{
-        p: 2,
-        position: 'sticky',
-        top: top + 16,
-        maxHeight: `calc(100vh - ${top + 16 * 2}px)`,
-        overflowY: 'auto',
-      }}
-    >
-      <Box>
-        <Typography variant='body2' component='div'>
-          Assessment Sections
-        </Typography>
-        <Divider sx={{ my: 2, mx: -2 }} />
-      </Box>
-      <FormStepper
-        items={definition.definition.item}
-        scrollOffset={top}
-        useUrlHash={!embeddedInWorkflow}
-      />
-      {(showAutofill || showPrintViewButton || showDeleteAssessmentButton) && (
-        <>
-          <Divider sx={{ my: 2, mx: -2 }} />
-          <Stack gap={2} sx={{ mt: 2 }}>
-            {showAutofill && <AssessmentAutofillButton onClick={onAutofill} />}
-            {showPrintViewButton && (
-              <PrintViewButton
-                openInNew
-                to={generateSafePath(
-                  EnrollmentDashboardRoutes.VIEW_ASSESSMENT,
-                  {
-                    clientId: assessment.enrollment.client.id,
-                    enrollmentId: assessment.enrollment.id,
-                    assessmentId: assessment.id,
-                  }
-                )}
-              >
-                Print
-              </PrintViewButton>
-            )}
-            {showDeleteAssessmentButton && assessment && (
-              <DeleteAssessmentButton
-                assessment={assessment}
-                clientId={enrollment.client.id}
-                enrollmentId={enrollment.id}
-                onSuccess={navigateToEnrollment}
-              />
-            )}
-          </Stack>
-        </>
-      )}
-    </Paper>
-  );
-};
-
-export default AssessmentFormSideBar;
diff --git a/src/modules/client/components/pages/CreateClientPage.tsx b/src/modules/client/components/pages/CreateClientPage.tsx
index 02c335ac8..8e483698b 100644
--- a/src/modules/client/components/pages/CreateClientPage.tsx
+++ b/src/modules/client/components/pages/CreateClientPage.tsx
@@ -3,7 +3,6 @@ import { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import BasicBreadcrumbPageLayout from '@/components/layout/BasicBreadcrumbPageLayout';
-import { STICKY_BAR_HEIGHT } from '@/components/layout/layoutConstants';
 
 import { localConstantsForClientForm } from '@/modules/client/hooks/useClientFormDialog';
 import EditRecord from '@/modules/form/components/EditRecord';
@@ -39,7 +38,6 @@ const CreateClientPage: React.FC = () => {
         formRole={RecordFormRole.Client}
         onCompleted={onCompleted}
         FormActionProps={{ submitButtonText: 'Create Client' }}
-        top={STICKY_BAR_HEIGHT}
         localConstants={localConstants}
         title={
           <>
diff --git a/src/modules/client/components/pages/EditClientPage.tsx b/src/modules/client/components/pages/EditClientPage.tsx
index 9e6900715..248b303e9 100644
--- a/src/modules/client/components/pages/EditClientPage.tsx
+++ b/src/modules/client/components/pages/EditClientPage.tsx
@@ -1,11 +1,6 @@
-import { Box, Stack, Typography } from '@mui/material';
+import { Stack, Typography } from '@mui/material';
 import { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
-
-import {
-  CONTEXT_HEADER_HEIGHT,
-  STICKY_BAR_HEIGHT,
-} from '@/components/layout/layoutConstants';
 import DeleteClientButton from '@/modules/client/components/DeleteClientButton';
 import useClientDashboardContext from '@/modules/client/hooks/useClientDashboardContext';
 
@@ -42,7 +37,6 @@ const EditClientPage = () => {
       record={client}
       localConstants={localConstants}
       onCompleted={onCompleted}
-      top={STICKY_BAR_HEIGHT + CONTEXT_HEADER_HEIGHT}
       title={
         <Stack direction='row' justifyContent='space-between'>
           <Typography
@@ -57,17 +51,13 @@ const EditClientPage = () => {
       }
       FormNavigationProps={{
         contentsBelowNavigation: (
-          <Box sx={{ mt: 3 }}>
-            <RootPermissionsFilter permissions='canDeleteClients'>
-              <DeleteClientButton
-                clientId={client.id}
-                clientLockVersion={client.lockVersion}
-                onSuccess={() =>
-                  navigate(generateSafePath(Routes.CLIENT_SEARCH))
-                }
-              />
-            </RootPermissionsFilter>
-          </Box>
+          <RootPermissionsFilter permissions='canDeleteClients'>
+            <DeleteClientButton
+              clientId={client.id}
+              clientLockVersion={client.lockVersion}
+              onSuccess={() => navigate(generateSafePath(Routes.CLIENT_SEARCH))}
+            />
+          </RootPermissionsFilter>
         ),
       }}
     />
diff --git a/src/modules/clientAlerts/components/ClientAlert.tsx b/src/modules/clientAlerts/components/ClientAlert.tsx
index d293aa9d3..f9c836c9e 100644
--- a/src/modules/clientAlerts/components/ClientAlert.tsx
+++ b/src/modules/clientAlerts/components/ClientAlert.tsx
@@ -52,9 +52,7 @@ const ClientAlert: React.FC<ClientAlertProps> = ({ clientAlert }) => {
               });
             }}
             onlyIcon
-          >
-            Delete
-          </DeleteMutationButton>
+          />
         )}
       </AlertTitle>
       <Box className='MuiAlert-body'>
diff --git a/src/modules/dataFetching/components/DeleteMutationButton.tsx b/src/modules/dataFetching/components/DeleteMutationButton.tsx
index d1e9c32e8..21b70b182 100644
--- a/src/modules/dataFetching/components/DeleteMutationButton.tsx
+++ b/src/modules/dataFetching/components/DeleteMutationButton.tsx
@@ -90,6 +90,7 @@ const DeleteMutationButton = <Mutation, MutationVariables>({
           onClick={onClick}
           size='small'
           className={className}
+          aria-label={`Delete ${recordName}`}
           {...ButtonProps}
         >
           <DeleteIcon fontSize='small' />
diff --git a/src/modules/enrollment/components/EntryExitDatesWithAssessmentLinks.tsx b/src/modules/enrollment/components/EntryExitDatesWithAssessmentLinks.tsx
index 145ceeca4..95adf15aa 100644
--- a/src/modules/enrollment/components/EntryExitDatesWithAssessmentLinks.tsx
+++ b/src/modules/enrollment/components/EntryExitDatesWithAssessmentLinks.tsx
@@ -59,6 +59,7 @@ const EntryExitDatesWithAssessmentLinks: React.FC<Props> = ({ enrollment }) => {
               <ButtonLink
                 to={intakePath}
                 variant='text'
+                aria-label='Go to Intake Assessment'
                 sx={{ minWidth: '30px', color: theme.palette.links }}
               >
                 <AssessmentIcon fontSize='small' />
@@ -77,6 +78,7 @@ const EntryExitDatesWithAssessmentLinks: React.FC<Props> = ({ enrollment }) => {
             <ButtonLink
               to={exitPath}
               variant='text'
+              aria-label='Go to Exit Assessment'
               sx={{ minWidth: '30px', color: theme.palette.links }}
             >
               <AssessmentIcon fontSize='small' />
diff --git a/src/modules/form/components/EditRecord.tsx b/src/modules/form/components/EditRecord.tsx
index 62282fc54..ea99b94de 100644
--- a/src/modules/form/components/EditRecord.tsx
+++ b/src/modules/form/components/EditRecord.tsx
@@ -9,8 +9,6 @@ import {
   getFormStepperItems,
 } from '../util/formUtil';
 
-import FormNavigation, { FormNavigationProps } from './FormNavigation';
-
 import Loading from '@/components/elements/Loading';
 import {
   CONTEXT_HEADER_HEIGHT,
@@ -21,6 +19,9 @@ import DynamicForm, {
   DynamicFormProps,
   DynamicFormRef,
 } from '@/modules/form/components/DynamicForm';
+import FormNavigationContainer, {
+  FormNavigationProps,
+} from '@/modules/form/components/FormNavigationContainer';
 import { FormInput, RecordFormRole } from '@/types/gqlTypes';
 
 export interface Props<RecordType>
@@ -42,7 +43,7 @@ export interface Props<RecordType>
   localConstants?: LocalConstants;
   onCompleted: (data: RecordType) => void;
   title: ReactNode;
-  FormNavigationProps?: Omit<FormNavigationProps, 'items' | 'children'>;
+  FormNavigationProps?: Omit<FormNavigationProps, 'navItems' | 'children'>;
   top?: number;
   minGroupsForLeftNav?: number;
   formRef?: Ref<DynamicFormRef>;
@@ -143,15 +144,13 @@ const EditRecord = <RecordType extends SubmitFormAllowedTypes>({
         >
           {title}
         </Box>
-        <Grid container spacing={2} sx={{ pb: 20, mt: 0 }}>
-          <FormNavigation
-            items={leftNavItems}
-            top={top}
-            {...FormNavigationProps}
-          >
-            {form}
-          </FormNavigation>
-        </Grid>
+        <FormNavigationContainer
+          navItems={leftNavItems}
+          navScrollOffset={top}
+          {...FormNavigationProps}
+        >
+          {form}
+        </FormNavigationContainer>
       </>
     );
   }
diff --git a/src/modules/form/components/FormNavigation.tsx b/src/modules/form/components/FormNavigation.tsx
deleted file mode 100644
index 43e759550..000000000
--- a/src/modules/form/components/FormNavigation.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Box, Grid, Paper, Typography } from '@mui/material';
-import { ReactNode } from 'react';
-
-import { STICKY_BAR_HEIGHT } from '@/components/layout/layoutConstants';
-import FormStepper from '@/modules/form/components/FormStepper';
-import { FormItem } from '@/types/gqlTypes';
-
-export interface FormNavigationProps {
-  items: FormItem[];
-  children: ReactNode;
-  top?: number;
-  contentsBelowNavigation?: ReactNode;
-  title?: string | null;
-}
-const FormNavigation = ({
-  items,
-  children,
-  title = 'Form Navigation',
-  top = STICKY_BAR_HEIGHT,
-  contentsBelowNavigation,
-}: FormNavigationProps) => (
-  <>
-    <Grid item xs={2.5} sx={{ pr: 2, pt: '0 !important' }}>
-      <Box
-        sx={{
-          position: 'sticky',
-          top: top + 16,
-        }}
-      >
-        <Paper sx={{ p: 2 }}>
-          {title && (
-            <Typography variant='h6' sx={{ mb: 2 }}>
-              {title}
-            </Typography>
-          )}
-          <FormStepper items={items} />
-        </Paper>
-        {contentsBelowNavigation}
-      </Box>
-    </Grid>
-    <Grid item xs={9} sx={{ pt: '0 !important' }}>
-      {children}
-    </Grid>
-  </>
-);
-export default FormNavigation;
diff --git a/src/modules/form/components/FormNavigationContainer.tsx b/src/modules/form/components/FormNavigationContainer.tsx
new file mode 100644
index 000000000..9cafae0cd
--- /dev/null
+++ b/src/modules/form/components/FormNavigationContainer.tsx
@@ -0,0 +1,91 @@
+import { Divider, Grid, Paper, Stack, Typography } from '@mui/material';
+import { ReactNode } from 'react';
+import SkipToContentButton from '@/components/elements/SkipToContentButton';
+import {
+  CONTEXT_HEADER_HEIGHT,
+  STICKY_BAR_HEIGHT,
+} from '@/components/layout/layoutConstants';
+import { useIsMobile } from '@/hooks/useIsMobile';
+import FormStepper from '@/modules/form/components/FormStepper';
+import { FormItem } from '@/types/gqlTypes';
+
+export interface FormNavigationProps {
+  navTitle?: string | null;
+  navItems?: FormItem[];
+  navScrollOffset?: number;
+  contentsBelowNavigation?: ReactNode;
+  useUrlHash?: boolean;
+  children: ReactNode;
+}
+const FormNavigationContainer = ({
+  navItems,
+  navTitle = 'Form Navigation',
+  navScrollOffset = STICKY_BAR_HEIGHT + CONTEXT_HEADER_HEIGHT,
+  contentsBelowNavigation,
+  useUrlHash = true,
+  children,
+}: FormNavigationProps) => {
+  const isTiny = useIsMobile('sm');
+  const focusTargetId = 'focusable-form';
+
+  return (
+    <Grid container spacing={4} sx={{ pb: 20, mt: 0 }}>
+      {navItems && navItems.length > 0 && (
+        <Grid
+          item
+          xs={12}
+          sm={4}
+          lg={2.5}
+          sx={{
+            pt: '0 !important',
+            pb: 2,
+          }}
+        >
+          <Paper
+            sx={{
+              p: 2,
+              position: 'sticky',
+              top: navScrollOffset + 16,
+              maxHeight: isTiny
+                ? undefined
+                : `calc(100vh - ${navScrollOffset + 16 * 2}px)`,
+              overflowY: 'auto',
+            }}
+          >
+            <Stack gap={2}>
+              <Typography variant='body2'>{navTitle}</Typography>
+              <Divider sx={{ mx: -2 }} />
+              <SkipToContentButton focusTargetId={focusTargetId} />
+              <FormStepper
+                items={navItems}
+                scrollOffset={navScrollOffset}
+                useUrlHash={useUrlHash}
+              />
+              {contentsBelowNavigation && (
+                <>
+                  <Divider sx={{ mx: -2 }} />
+                  {contentsBelowNavigation}
+                </>
+              )}
+            </Stack>
+          </Paper>
+        </Grid>
+      )}
+
+      <Grid
+        id={focusTargetId}
+        item
+        xs={12}
+        sm={!!navItems ? 8 : 12}
+        lg={!!navItems ? 9.5 : 12}
+        sx={{
+          pt: '0 !important',
+        }}
+      >
+        {children}
+      </Grid>
+    </Grid>
+  );
+};
+
+export default FormNavigationContainer;
diff --git a/src/modules/form/components/FormStepper.tsx b/src/modules/form/components/FormStepper.tsx
index bdbd48a03..5216f3cb7 100644
--- a/src/modules/form/components/FormStepper.tsx
+++ b/src/modules/form/components/FormStepper.tsx
@@ -9,10 +9,10 @@ import { FormItem } from '@/types/gqlTypes';
 
 export interface Props {
   items: FormItem[];
-  useUrlHash?: boolean;
+  useUrlHash: boolean;
   scrollOffset?: number;
 }
-const FormStepper = ({ items, useUrlHash = true, scrollOffset }: Props) => {
+const FormStepper = ({ items, useUrlHash, scrollOffset }: Props) => {
   const { pathname } = useLocation();
   const steps = useMemo(
     () =>
diff --git a/src/modules/form/util/formUtil.applyDataCollectedAbout.test.ts b/src/modules/form/util/formUtil.applyDataCollectedAbout.test.ts
index c369e7dd3..addee2517 100644
--- a/src/modules/form/util/formUtil.applyDataCollectedAbout.test.ts
+++ b/src/modules/form/util/formUtil.applyDataCollectedAbout.test.ts
@@ -21,7 +21,7 @@ describe('applyDataCollectedAbout', () => {
       applyDataCollectedAbout(
         items as FormDefinitionFieldsFragment['definition']['item'],
         client,
-        RelationshipToHoH.DataNotCollected
+        RelationshipToHoH.UnrelatedHouseholdMember
       )
     ).toMatchObject(items);
   });
@@ -34,7 +34,7 @@ describe('applyDataCollectedAbout', () => {
       applyDataCollectedAbout(
         items as FormDefinitionFieldsFragment['definition']['item'],
         { ...client, dob: '1960-01-01' },
-        RelationshipToHoH.DataNotCollected
+        RelationshipToHoH.UnrelatedHouseholdMember
       )
     ).toMatchObject(items);
   });
@@ -61,7 +61,7 @@ describe('applyDataCollectedAbout', () => {
       applyDataCollectedAbout(
         items as FormDefinitionFieldsFragment['definition']['item'],
         client,
-        RelationshipToHoH.DataNotCollected
+        RelationshipToHoH.UnrelatedHouseholdMember
       )
     ).toMatchObject(items);
   });
@@ -76,7 +76,7 @@ describe('applyDataCollectedAbout', () => {
           ...client,
           dob: '2022-01-01',
         },
-        RelationshipToHoH.DataNotCollected
+        RelationshipToHoH.UnrelatedHouseholdMember
       )
     ).toHaveLength(0);
   });
diff --git a/src/modules/form/util/formUtil.ts b/src/modules/form/util/formUtil.ts
index 630747cd1..e19757241 100644
--- a/src/modules/form/util/formUtil.ts
+++ b/src/modules/form/util/formUtil.ts
@@ -115,13 +115,31 @@ export const hasMeaningfulValue = (value: any): boolean => {
   return true;
 };
 
+/**
+ * Resolves a GQL Enum name into an array of PickListOptions
+ * that can be used for selection components (dropdowns, radio buttons, etc).
+ *
+ * Optionally specify whether to include "Data Not Collected" (99) equivalent in the list,
+ * if the enum contains it.
+ *
+ * There is a special case to always exclude 99 for the RelationshipToHoH picklist,
+ * because 99 is not a valid value for collection, but we keep it in the GQL Enum
+ * because we need to treat it as a valid value for display. This is because there may
+ * be unfixable migrated-in data with 99s or nulls, and we want to display those as
+ * 'Data not collected' rather than 'Invalid'.
+ *
+ * @param pickListReference - The name of the GraphQL Enum to resolve as a pick list
+ * @param excludeDataNotCollected - Whether to exlude Data Not Collected from the pick list
+ * @returns The resolved array of PickListOptions, or null if pick list reference was not found.
+ */
 export const localResolvePickList = (
   pickListReference: string,
   excludeDataNotCollected = false
 ): PickListOption[] | null => {
   if (isHmisEnum(pickListReference)) {
     let values = Object.entries(HmisEnums[pickListReference]);
-    if (excludeDataNotCollected) {
+
+    if (excludeDataNotCollected || pickListReference === 'RelationshipToHoH') {
       values = values.filter(([code]) => !isDataNotCollected(code));
     }
     return values
@@ -1546,7 +1564,7 @@ export const getFormStepperItems = (
   localConstants: LocalConstants,
   minGroupsToDisplay: number = 3
 ) => {
-  if (!formDefinition || !itemMap) return false;
+  if (!formDefinition || !itemMap) return undefined;
 
   let items = formDefinition.definition.item.filter(
     (i) => i.type === ItemType.Group && !i.hidden
@@ -1561,7 +1579,7 @@ export const getFormStepperItems = (
       localConstants: localConstants || {},
     })
   );
-  if (items.length < minGroupsToDisplay) return false;
+  if (items.length < minGroupsToDisplay) return undefined;
 
   return items;
 };
diff --git a/src/modules/formBuilder/components/FormBuilderHeader.tsx b/src/modules/formBuilder/components/FormBuilderHeader.tsx
index 10383c715..62e87a0ea 100644
--- a/src/modules/formBuilder/components/FormBuilderHeader.tsx
+++ b/src/modules/formBuilder/components/FormBuilderHeader.tsx
@@ -134,7 +134,7 @@ const FormBuilderHeader: React.FC<FormEditorHeaderProps> = ({
               </Stack>
             }
             onlyIcon
-          ></DeleteMutationButton>
+          />
         </Stack>
       </Stack>
     </>
diff --git a/src/modules/hmis/components/AssessmentDateWithStatusIndicator.tsx b/src/modules/hmis/components/AssessmentDateWithStatusIndicator.tsx
index 85ca1631e..df8f28a7a 100644
--- a/src/modules/hmis/components/AssessmentDateWithStatusIndicator.tsx
+++ b/src/modules/hmis/components/AssessmentDateWithStatusIndicator.tsx
@@ -18,8 +18,8 @@ const AssessmentDateWithStatusIndicator = ({
       <Typography variant='inherit' color='error'>
         {parseAndFormatDate(assessment.assessmentDate)}
       </Typography>
-      <Tooltip title='Assessment has not been submitted.' arrow describeChild>
-        <ErrorOutlineIcon color='error' fontSize='small' />
+      <Tooltip title='Assessment has not been submitted.' arrow>
+        <ErrorOutlineIcon aria-hidden={false} color='error' fontSize='small' />
       </Tooltip>
     </Stack>
   );
diff --git a/src/modules/household/components/EditHouseholdMemberTable.tsx b/src/modules/household/components/EditHouseholdMemberTable.tsx
index b9908b57e..71d16627b 100644
--- a/src/modules/household/components/EditHouseholdMemberTable.tsx
+++ b/src/modules/household/components/EditHouseholdMemberTable.tsx
@@ -12,7 +12,6 @@ import RemoveFromHouseholdButton from './elements/RemoveFromHouseholdButton';
 import { HOUSEHOLD_MEMBER_COLUMNS } from './HouseholdMemberTable';
 
 import GenericTable from '@/components/elements/table/GenericTable';
-import usePrevious from '@/hooks/usePrevious';
 import { SsnDobShowContextProvider } from '@/modules/client/providers/ClientSsnDobVisibility';
 import { useValidationDialog } from '@/modules/errors/hooks/useValidationDialog';
 import {
@@ -20,7 +19,7 @@ import {
   ErrorState,
   partitionValidations,
 } from '@/modules/errors/util';
-import { sortHouseholdMembers, clientBriefName } from '@/modules/hmis/hmisUtil';
+import { clientBriefName, sortHouseholdMembers } from '@/modules/hmis/hmisUtil';
 import {
   HouseholdClientFieldsFragment,
   HouseholdFieldsFragment,
@@ -60,8 +59,6 @@ const EditHouseholdMemberTable = ({
       (hc) => hc.relationshipToHoH === RelationshipToHoH.SelfHeadOfHousehold
     ) || null
   );
-  const previousMembers =
-    usePrevious<HouseholdClientFieldsFragment[]>(currentMembers);
 
   // client to highlight for relationship input
   const [highlight, setHighlight] = useState<string[]>([]);
@@ -109,21 +106,6 @@ const EditHouseholdMemberTable = ({
     });
   }, [currentMembers]);
 
-  // If new members have beed added highlight their relationship field if it's DNC
-  useEffect(() => {
-    if (!previousMembers || !currentMembers) return;
-    if (previousMembers.length < currentMembers.length) {
-      const old = new Set(previousMembers.map((m) => m.client.id));
-      const newMembers = currentMembers
-        .filter(
-          (hc) => hc.relationshipToHoH === RelationshipToHoH.DataNotCollected
-        )
-        .map((m) => m.client.id)
-        .filter((id) => !old.has(id));
-      setHighlight((old) => [...old, ...newMembers]);
-    }
-  }, [previousMembers, currentMembers]);
-
   const onChangeHoH = useCallback(
     (hc: HouseholdClientFieldsFragment, confirmed = false) => {
       setProposedHoH(hc);
diff --git a/src/modules/household/components/elements/RelationshipToHoHInput.tsx b/src/modules/household/components/elements/RelationshipToHoHInput.tsx
index 755f889dc..bf172bf10 100644
--- a/src/modules/household/components/elements/RelationshipToHoHInput.tsx
+++ b/src/modules/household/components/elements/RelationshipToHoHInput.tsx
@@ -41,16 +41,15 @@ const RelationshipToHoHInput = ({
 
   const onChange = useMemo(
     () => (_: any, selected: Option | null) => {
+      if (!selected) return; // this should never happen because `disableClearable` is passed
       setCompleted(false);
-      setRelationship(selected ? selected.value : null);
+      setRelationship(selected.value);
       void updateRelationship({
         variables: {
           input: {
             enrollmentId,
             enrollmentLockVersion,
-            relationshipToHoH: selected
-              ? selected.value
-              : RelationshipToHoH.DataNotCollected,
+            relationshipToHoH: selected.value,
             confirmed: true, // we don't support displaying warnings in this view, so ignore them
           },
         },
@@ -68,8 +67,8 @@ const RelationshipToHoHInput = ({
       <RelationshipToHohSelect
         value={relationship || null}
         onChange={onChange}
-        showDataNotCollected
         disabled={loading}
+        disableClearable
         {...props}
       />
     </InputIndicatorContainer>
diff --git a/src/modules/household/components/elements/RelationshipToHohSelect.tsx b/src/modules/household/components/elements/RelationshipToHohSelect.tsx
index e9d00a977..db749397d 100644
--- a/src/modules/household/components/elements/RelationshipToHohSelect.tsx
+++ b/src/modules/household/components/elements/RelationshipToHohSelect.tsx
@@ -1,10 +1,9 @@
 import { Typography } from '@mui/material';
-import { omit } from 'lodash-es';
-import { useMemo } from 'react';
 
 import GenericSelect, {
   GenericSelectProps,
 } from '@/components/elements/input/GenericSelect';
+import { localResolvePickList } from '@/modules/form/util/formUtil';
 import { HmisEnums } from '@/types/gqlEnums';
 import { RelationshipToHoH } from '@/types/gqlTypes';
 
@@ -13,34 +12,22 @@ export type Option = { value: RelationshipToHoH; label: string };
 export interface Props
   extends Omit<GenericSelectProps<Option, false, false>, 'options' | 'value'> {
   value: RelationshipToHoH | null;
-  showDataNotCollected?: boolean;
 }
+const relationshipToHohOptions: Option[] = (
+  localResolvePickList('RelationshipToHoH') || []
+)
+  .filter(({ code }) => code !== RelationshipToHoH.SelfHeadOfHousehold) // Exclude HoH from option list
+  .map(({ code, label }) => ({
+    value: code as RelationshipToHoH,
+    label: label as string,
+  }));
 
 const RelationshipToHohSelect = ({
   disabled,
   value,
-  showDataNotCollected = false,
+  textInputProps,
   ...props
 }: Props) => {
-  const relationshipToHohOptions = useMemo(() => {
-    const excluded = [
-      RelationshipToHoH.SelfHeadOfHousehold,
-      RelationshipToHoH.Invalid,
-    ];
-    if (!showDataNotCollected)
-      excluded.push(RelationshipToHoH.DataNotCollected);
-
-    const filtered = omit(HmisEnums.RelationshipToHoH, excluded);
-    const options = Object.entries(filtered).map(
-      ([value, label]) =>
-        ({
-          value,
-          label,
-        }) as Option
-    );
-    return options;
-  }, [showDataNotCollected]);
-
   // disabled if HoH is selected
   const isHoH = value === RelationshipToHoH.SelfHeadOfHousehold;
   const isDisabled = disabled || isHoH;
@@ -52,15 +39,12 @@ const RelationshipToHohSelect = ({
       </Typography>
     );
   }
+
   return (
     <GenericSelect<Option, false, false>
       options={relationshipToHohOptions}
       disabled={isDisabled}
-      textInputProps={{
-        placeholder: isHoH
-          ? HmisEnums.RelationshipToHoH[value]
-          : 'Select relationship',
-      }}
+      textInputProps={{ placeholder: 'Select Relationship', ...textInputProps }}
       value={
         value && !isHoH
           ? relationshipToHohOptions.find((el) => el.value === value) || null
diff --git a/src/modules/projectAdministration/components/EditProjectPage.tsx b/src/modules/projectAdministration/components/EditProjectPage.tsx
index 266d2f60d..b13ae5f07 100644
--- a/src/modules/projectAdministration/components/EditProjectPage.tsx
+++ b/src/modules/projectAdministration/components/EditProjectPage.tsx
@@ -70,26 +70,24 @@ const EditProjectPage = () => {
       }
       FormNavigationProps={{
         contentsBelowNavigation: (
-          <Box sx={{ mt: 3 }}>
-            <ProjectPermissionsFilter
-              id={project.id}
-              permissions={'canDeleteProject'}
+          <ProjectPermissionsFilter
+            id={project.id}
+            permissions={'canDeleteProject'}
+          >
+            <DeleteMutationButton<
+              DeleteProjectMutation,
+              DeleteProjectMutationVariables
             >
-              <DeleteMutationButton<
-                DeleteProjectMutation,
-                DeleteProjectMutationVariables
-              >
-                queryDocument={DeleteProjectDocument}
-                variables={{ input: { id: project.id } }}
-                idPath='deleteProject.project.id'
-                recordName='Project'
-                onSuccess={onSuccessfulDelete}
-                ButtonProps={{ fullWidth: true }}
-              >
-                Delete Project
-              </DeleteMutationButton>
-            </ProjectPermissionsFilter>
-          </Box>
+              queryDocument={DeleteProjectDocument}
+              variables={{ input: { id: project.id } }}
+              idPath='deleteProject.project.id'
+              recordName='Project'
+              onSuccess={onSuccessfulDelete}
+              ButtonProps={{ fullWidth: true }}
+            >
+              Delete Project
+            </DeleteMutationButton>
+          </ProjectPermissionsFilter>
         ),
       }}
     />