diff --git a/src/apps/customer-portal/src/lib/services/statistics.service.ts b/src/apps/customer-portal/src/lib/services/statistics.service.ts
index 3dbabc006..e15a59c15 100644
--- a/src/apps/customer-portal/src/lib/services/statistics.service.ts
+++ b/src/apps/customer-portal/src/lib/services/statistics.service.ts
@@ -157,11 +157,6 @@ function normalizeCountryRows(
             return
         }
 
-        if (row['country.country_name'] === 'Taiwan') {
-            console.log('here', row)
-
-        }
-
         const code = toAlpha2CountryCode(lookup.countryCode)
         const current = countries.get(code)
         const topWinners = (row.topWinners || [])
diff --git a/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.module.scss b/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.module.scss
index 9c9b47fea..087ba9099 100644
--- a/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.module.scss
+++ b/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.module.scss
@@ -296,6 +296,12 @@
         }
     }
 
+    :global(.highcharts-tooltip) {
+        position: fixed !important;
+        transform: none !important;
+        z-index: 20;
+    }
+
     &:fullscreen {
         height: 100vh;
         min-height: 100vh;
@@ -306,6 +312,12 @@
             height: 100vh !important;
         }
     }
+
+    @include ltesm {
+        :global(.highcharts-legend-item text) {
+            font-size: 10px !important;
+        }
+    }
 }
 
 .mapFullscreenButton {
@@ -367,6 +379,9 @@
         top: 100%;
         transform: translateX(-50%);
         width: 0;
+        @include ltemd {
+            display: none;
+        }
     }
 }
 
diff --git a/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.tsx b/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.tsx
index 8e9b901e8..e02db6ffe 100644
--- a/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.tsx
+++ b/src/apps/customer-portal/src/pages/statistics/StatisticsPage/StatisticsPage.tsx
@@ -237,7 +237,7 @@ const StatisticsPage: FC = () => {
                                                         </span>
                                                     </td>
                                                     <td>
-                                                        <div>
+                                                        <div title={country.name}>
                                                             {country.code && (
                                                                 <span
                                                                     aria-hidden='true'
diff --git a/src/apps/customer-portal/src/pages/statistics/StatisticsPage/WorldMap.tsx b/src/apps/customer-portal/src/pages/statistics/StatisticsPage/WorldMap.tsx
index fa54531bb..7ce5e8092 100644
--- a/src/apps/customer-portal/src/pages/statistics/StatisticsPage/WorldMap.tsx
+++ b/src/apps/customer-portal/src/pages/statistics/StatisticsPage/WorldMap.tsx
@@ -311,6 +311,30 @@ function renderCountryTooltip(point: StatisticsMapPoint): string {
     `
 }
 
+function getFixedTooltipPosition(
+    labelWidth: number,
+    labelHeight: number,
+    point: Highcharts.Point,
+    chart: Highcharts.Chart,
+): Highcharts.PositionObject {
+    const chartRenderTo = (chart as unknown as { renderTo: HTMLElement }).renderTo
+    const chartRect = chartRenderTo.getBoundingClientRect()
+    const plotX = (point.plotX ?? 0) + chart.plotLeft
+    const plotY = (point.plotY ?? 0) + chart.plotTop
+    const pointX = chartRect.left + plotX
+    const pointY = chartRect.top + plotY
+    const minOffset = 12
+    const offsetAbove = 14
+
+    return {
+        x: Math.min(
+            Math.max(pointX - Math.round(labelWidth / 2), minOffset),
+            window.innerWidth - labelWidth - minOffset,
+        ),
+        y: Math.max(pointY - labelHeight - offsetAbove, minOffset),
+    }
+}
+
 function createTooltipFormatter(
     props: Pick<WorldMapProps, 'showWinnerDetails'>,
 ): Highcharts.TooltipFormatterCallbackFunction {
@@ -481,14 +505,14 @@ const WorldMap: FC<WorldMapProps> = props => {
                                 margin: [0, 0, 80, 0],
                             },
                             legend: {
-                                itemDistance: 24,
+                                itemDistance: 16,
                                 itemMarginBottom: 4,
                                 itemStyle: {
-                                    fontSize: '12px',
+                                    fontSize: '9px',
                                 },
                                 symbolHeight: 12,
                                 symbolWidth: 12,
-                                width: 340,
+                                width: 360,
                             },
                         },
                         condition: {
@@ -515,7 +539,28 @@ const WorldMap: FC<WorldMapProps> = props => {
                     showWinnerDetails: props.showWinnerDetails,
                 }),
                 padding: 0,
+                positioner: (
+                    labelWidth: number,
+                    labelHeight: number,
+                    point: Highcharts.Point,
+                ): Highcharts.PositionObject => {
+                    const chart = chartRef.current?.chart as Highcharts.Chart | undefined
+
+                    if (!chart) {
+                        return { x: 0, y: 0 }
+                    }
+
+                    return getFixedTooltipPosition(
+                        labelWidth,
+                        labelHeight,
+                        point,
+                        chart,
+                    )
+                },
                 shadow: false,
+                style: {
+                    position: 'fixed',
+                },
                 useHTML: true,
             },
         }),
diff --git a/src/apps/profiles/src/components/MemberNotFound/MemberNotFound.module.scss b/src/apps/profiles/src/components/MemberNotFound/MemberNotFound.module.scss
new file mode 100644
index 000000000..6fab0c29a
--- /dev/null
+++ b/src/apps/profiles/src/components/MemberNotFound/MemberNotFound.module.scss
@@ -0,0 +1,31 @@
+@import "@libs/ui/styles/includes";
+
+.container {
+    min-height: 60vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    gap: $sp-6;
+    padding: $sp-15 $sp-8;
+    color: $black-100;
+
+    svg {
+        color: $black-60;
+    }
+}
+
+.title {
+    @include font-barlow;
+    font-weight: 600;
+    font-size: 28px;
+    line-height: 34px;
+    margin: 0;
+}
diff --git a/src/apps/profiles/src/components/MemberNotFound/MemberNotFound.tsx b/src/apps/profiles/src/components/MemberNotFound/MemberNotFound.tsx
new file mode 100644
index 000000000..24130076f
--- /dev/null
+++ b/src/apps/profiles/src/components/MemberNotFound/MemberNotFound.tsx
@@ -0,0 +1,48 @@
+import { FC, useCallback } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+import { Button, ContentLayout, IconOutline, IconSolid, PageTitle } from '~/libs/ui'
+
+import styles from './MemberNotFound.module.scss'
+
+interface MemberNotFoundProps {
+    memberHandle?: string
+}
+
+const MemberNotFound: FC<MemberNotFoundProps> = (props: MemberNotFoundProps) => {
+    const navigate = useNavigate()
+
+    const handleBack = useCallback(() => {
+        navigate(-1)
+    }, [navigate])
+
+    return (
+        <ContentLayout outerClass={styles.container}>
+            <PageTitle>Profile Not Found | Topcoder</PageTitle>
+
+            <div className={styles.content} role='alert'>
+                <IconOutline.ExclamationCircleIcon className='icon-xxxl' />
+                <h2 className={styles.title}>We were unable to locate that profile</h2>
+                {props.memberHandle && (
+                    <p className='body-main'>
+                        No member was found with the handle
+                        {' '}
+                        <strong>{props.memberHandle}</strong>
+                        .
+                    </p>
+                )}
+                <Button
+                    link
+                    size='lg'
+                    iconToLeft
+                    icon={IconSolid.ArrowLeftIcon}
+                    onClick={handleBack}
+                >
+                    Go back
+                </Button>
+            </div>
+        </ContentLayout>
+    )
+}
+
+export default MemberNotFound
diff --git a/src/apps/profiles/src/components/MemberNotFound/index.ts b/src/apps/profiles/src/components/MemberNotFound/index.ts
new file mode 100644
index 000000000..e48b4584b
--- /dev/null
+++ b/src/apps/profiles/src/components/MemberNotFound/index.ts
@@ -0,0 +1 @@
+export { default as MemberNotFound } from './MemberNotFound'
diff --git a/src/apps/profiles/src/components/index.ts b/src/apps/profiles/src/components/index.ts
index 8bb7e5e34..bed93b6c6 100644
--- a/src/apps/profiles/src/components/index.ts
+++ b/src/apps/profiles/src/components/index.ts
@@ -4,3 +4,4 @@ export * from './tc-achievements/SRMView/ChallengesGrid'
 export * from './EditMemberPropertyBtn'
 export * from './AddButton'
 export * from './EmptySection'
+export * from './MemberNotFound'
diff --git a/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx b/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx
index ae271f591..d55e3bac3 100644
--- a/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx
+++ b/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx
@@ -1,11 +1,12 @@
 import { Dispatch, FC, SetStateAction, useCallback, useEffect, useState } from 'react'
 import { Params, useNavigate, useParams } from 'react-router-dom'
+import { AxiosError } from 'axios'
 import { bind } from 'lodash'
 
 import { profileGetPublicAsync, useMemberBadges, UserBadge, UserBadgesResponse, UserProfile } from '~/libs/core'
 import { Button, ContentLayout, IconSolid, LoadingSpinner } from '~/libs/ui'
 
-import { MemberBadgeModal } from '../components'
+import { MemberBadgeModal, MemberNotFound } from '../components'
 
 import styles from './MemberBadgesPage.module.scss'
 
@@ -19,6 +20,7 @@ const MemberBadgesPage: FC<{}> = () => {
     ] = useState()
 
     const [profileReady, setProfileReady]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
+    const [notFound, setNotFound]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
 
     const memberBadges: UserBadgesResponse | undefined = useMemberBadges(profile?.userId as number, { limit: 100 })
 
@@ -39,12 +41,21 @@ const MemberBadgesPage: FC<{}> = () => {
 
     useEffect(() => {
         if (routeParams.memberHandle) {
+            setProfileReady(false)
+            setNotFound(false)
+            setProfile(undefined)
+
             profileGetPublicAsync(routeParams.memberHandle)
                 .then(userProfile => {
                     setProfile(userProfile)
                     setProfileReady(true)
                 })
-            // TODO: NOT FOUND PAGE redirect/dispaly via catch
+                .catch((e: AxiosError) => {
+                    if (e.code === AxiosError.ERR_BAD_REQUEST && e.response?.status === 404) {
+                        setNotFound(true)
+                        setProfileReady(true)
+                    }
+                })
         }
     }, [routeParams.memberHandle])
 
@@ -54,9 +65,13 @@ const MemberBadgesPage: FC<{}> = () => {
 
     return (
         <>
-            <LoadingSpinner hide={profileReady && !!memberBadges} />
+            <LoadingSpinner hide={profileReady && (notFound || !!memberBadges)} />
+
+            {profileReady && notFound && (
+                <MemberNotFound memberHandle={routeParams.memberHandle} />
+            )}
 
-            {profileReady && profile && !!memberBadges && (
+            {profileReady && profile && !notFound && !!memberBadges && (
                 <ContentLayout
                     outerClass={styles.container}
                 >
diff --git a/src/apps/profiles/src/member-profile/MemberProfilePage.tsx b/src/apps/profiles/src/member-profile/MemberProfilePage.tsx
index d5a85cf72..7bdead5cb 100644
--- a/src/apps/profiles/src/member-profile/MemberProfilePage.tsx
+++ b/src/apps/profiles/src/member-profile/MemberProfilePage.tsx
@@ -5,7 +5,7 @@ import { AxiosError } from 'axios'
 import { profileContext, ProfileContextData, profileGetPublicAsync, UserProfile } from '~/libs/core'
 import { LoadingSpinner } from '~/libs/ui'
 
-import { rootRoute } from '../profiles.routes'
+import { MemberNotFound } from '../components'
 import { notifyUniNavi } from '../lib'
 
 import { ProfilePageLayout } from './page-layout'
@@ -21,6 +21,7 @@ const MemberProfilePage: FC<{}> = () => {
     ] = useState()
 
     const [profileReady, setProfileReady]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
+    const [notFound, setNotFound]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
     const { isTalentSearch }: MemberProfileContextValue = useMemberProfileContext()
 
     const { profile: authProfile }: ProfileContextData = useContext(profileContext)
@@ -31,6 +32,10 @@ const MemberProfilePage: FC<{}> = () => {
 
     useEffect(() => {
         if (routeParams.memberHandle) {
+            setProfileReady(false)
+            setNotFound(false)
+            setProfile(undefined)
+
             profileGetPublicAsync(routeParams.memberHandle)
                 .then(userProfile => {
                     setProfile({ ...userProfile } as UserProfile)
@@ -38,7 +43,8 @@ const MemberProfilePage: FC<{}> = () => {
                 })
                 .catch((e: AxiosError) => {
                     if (e.code === AxiosError.ERR_BAD_REQUEST && e.response?.status === 404) {
-                        navigate(rootRoute)
+                        setNotFound(true)
+                        setProfileReady(true)
                     }
                 })
         }
@@ -58,7 +64,11 @@ const MemberProfilePage: FC<{}> = () => {
         <>
             <LoadingSpinner hide={profileReady} />
 
-            {profileReady && profile && (
+            {profileReady && notFound && (
+                <MemberNotFound memberHandle={routeParams.memberHandle} />
+            )}
+
+            {profileReady && profile && !notFound && (
                 <ProfilePageLayout
                     handleBackBtn={handleBackBtn}
                     isTalentSearch={isTalentSearch}
diff --git a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.module.scss b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.module.scss
index 21f29f516..91910c421 100644
--- a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.module.scss
+++ b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.module.scss
@@ -119,6 +119,12 @@
     width: 100%;
 }
 
+.preferredRolesAddButton {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+}
+
 .preferredRolesList {
     display: flex;
     align-items: center;
@@ -150,25 +156,6 @@
     }
 }
 
-.preferredRolesPlaceholder {
-    appearance: none;
-    background: transparent;
-    border: 0;
-    color: $black-60;
-    cursor: pointer;
-    font-family: "Nunito Sans", sans-serif;
-    font-size: 14px;
-    font-weight: $font-weight-medium;
-    line-height: 20px;
-    padding: 0;
-    text-align: center;
-
-    &:hover {
-        color: $black-100;
-        text-decoration: underline;
-    }
-}
-
 .preferredRolesEditButton {
     color: $black-100;
     padding-left: $sp-2 !important;
diff --git a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.spec.tsx b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.spec.tsx
index 2cf20ad51..49e81a107 100644
--- a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.spec.tsx
+++ b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.spec.tsx
@@ -33,6 +33,9 @@ jest.mock('~/libs/ui', () => ({
 })
 
 jest.mock('../../../components', () => ({
+    AddButton: (props: { label: string, onClick: () => void }): JSX.Element => (
+        <button type='button' onClick={props.onClick}>{props.label}</button>
+    ),
     EditMemberPropertyBtn: () => <button type='button'>Edit</button>,
 }))
 
@@ -116,7 +119,7 @@ describe('MemberRatingCard', () => {
             .toBeInTheDocument()
     })
 
-    it('shows the preferred roles edit action for the profile owner when rating data is unavailable', () => {
+    it('shows the preferred roles add action for the profile owner when rating data is unavailable', () => {
         mockedUseMemberStats.mockReturnValue(undefined)
 
         render(<MemberRatingCard {...defaultProps} authProfile={profile} />)
@@ -126,7 +129,8 @@ describe('MemberRatingCard', () => {
             .toBeInTheDocument()
         expect(screen.getByRole('button', { name: 'Add preferred roles' }))
             .toBeInTheDocument()
-        expect(screen.getByRole('button', { name: 'Edit' }))
+        expect(screen.queryByRole('button', { name: 'Edit' }))
+            .not
             .toBeInTheDocument()
     })
 
diff --git a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.tsx b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.tsx
index 773b35a28..eae4d58fb 100644
--- a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.tsx
+++ b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingCard.tsx
@@ -14,7 +14,7 @@ import {
 } from '~/libs/core'
 import { Tooltip } from '~/libs/ui'
 
-import { EditMemberPropertyBtn } from '../../../components'
+import { AddButton, EditMemberPropertyBtn } from '../../../components'
 import { getPreferredRolesText } from '../../../lib'
 
 import {
@@ -118,35 +118,38 @@ const MemberRatingCard: FC<MemberRatingCardProps> = (props: MemberRatingCardProp
             return <></>
         }
 
+        if (preferredRoles.length === 0) {
+            return (
+                <div className={styles.preferredRolesWrap}>
+                    <AddButton
+                        className={styles.preferredRolesAddButton}
+                        label='Add preferred roles'
+                        onClick={handlePreferredRolesModalOpen}
+                        variant='mt0'
+                    />
+                </div>
+            )
+        }
+
         return (
             <div className={styles.preferredRolesWrap}>
-                {preferredRoles.length > 0 ? (
-                    <div className={styles.preferredRolesList}>
-                        {preferredRolesDisplay.visibleRoles.map((role: string) => (
-                            <span className={styles.preferredRole} key={role}>
-                                {role}
-                            </span>
-                        ))}
-
-                        {preferredRolesDisplay.toggleLabel && (
-                            <button
-                                className={styles.preferredRolesToggle}
-                                onClick={handlePreferredRolesToggle}
-                                type='button'
-                            >
-                                {preferredRolesDisplay.toggleLabel}
-                            </button>
-                        )}
-                    </div>
-                ) : (
-                    <button
-                        className={styles.preferredRolesPlaceholder}
-                        onClick={handlePreferredRolesModalOpen}
-                        type='button'
-                    >
-                        Add preferred roles
-                    </button>
-                )}
+                <div className={styles.preferredRolesList}>
+                    {preferredRolesDisplay.visibleRoles.map((role: string) => (
+                        <span className={styles.preferredRole} key={role}>
+                            {role}
+                        </span>
+                    ))}
+
+                    {preferredRolesDisplay.toggleLabel && (
+                        <button
+                            className={styles.preferredRolesToggle}
+                            onClick={handlePreferredRolesToggle}
+                            type='button'
+                        >
+                            {preferredRolesDisplay.toggleLabel}
+                        </button>
+                    )}
+                </div>
 
                 {canEditPreferredRoles && (
                     <EditMemberPropertyBtn
diff --git a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.module.scss b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.module.scss
index 4635899c4..ad540a6fb 100644
--- a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.module.scss
+++ b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.module.scss
@@ -204,6 +204,7 @@
     transform: translateX(-50%);
     width: 0;
     z-index: 2;
+    left: 50%;
 
     &::after {
         background: currentColor;
@@ -217,11 +218,9 @@
 }
 
 .markerBadge {
-    align-items: center;
-    display: flex;
-    gap: $sp-2;
+    flex-shrink: 0;
     position: relative;
-    transform: translateX(34px);
+    width: 32px;
     z-index: 1;
 }
 
@@ -230,10 +229,10 @@
         top: $sp-14;
     }
 
-    .markerBadge {
-        flex-direction: column;
-        gap: $sp-1;
-        transform: translateX(0);
+    .markerRating {
+        left: 50%;
+        top: calc(100% + #{$sp-1});
+        transform: translateX(-50%);
     }
 }
 
@@ -274,7 +273,12 @@
     font-family: $font-roboto;
     font-size: 13px;
     font-weight: $font-weight-bold;
+    left: calc(100% + #{$sp-2});
     line-height: 18px;
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    white-space: nowrap;
 }
 
 .axisLabels {
diff --git a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.spec.tsx b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.spec.tsx
index b703659fa..bdb7fee56 100644
--- a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.spec.tsx
+++ b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.spec.tsx
@@ -53,6 +53,18 @@ const expandedTailRatingDistribution = {
     },
 }
 
+const cappedRatingDistribution = {
+    ...ratingDistribution,
+    distribution: {
+        ratingRange0To899: 10,
+        ratingRange900To1199: 20,
+        ratingRange1200To1499: 30,
+        ratingRange1500To2199: 40,
+        ratingRange2200To2999: 5,
+        ratingRange3000To3999: 2,
+    },
+}
+
 jest.mock('~/libs/core', () => ({
     getRatingColor: jest.fn(),
 }), {
@@ -154,8 +166,69 @@ describe('MemberRatingInfoModal', () => {
         expect(marker)
             .toHaveStyle('color: #616BD5')
         expect(parseFloat(marker.style.left))
-            .toBeLessThan(80)
+            .toBeCloseTo((5.5 / 6) * 100)
+        expect(marker)
+            .toHaveClass('memberMarkerStacked')
+    })
+
+    it('centers the marker on the final module bar when the rating exceeds the distribution', () => {
+        render(
+            <MemberRatingInfoModal
+                audienceLabel='developers'
+                onClose={jest.fn()}
+                percentile={0.1}
+                profile={baseProfile}
+                rating={4051}
+                ratingDistribution={cappedRatingDistribution}
+            />,
+        )
+
+        const marker = screen.getByTestId('rating-member-marker')
+
+        expect(parseFloat(marker.style.left))
+            .toBeCloseTo((5.5 / 6) * 100)
         expect(marker)
             .toHaveClass('memberMarkerStacked')
     })
+
+    it('removes trailing empty buckets so the histogram spans the chart', () => {
+        render(
+            <MemberRatingInfoModal
+                audienceLabel='developers'
+                onClose={jest.fn()}
+                percentile={15}
+                profile={baseProfile}
+                rating={1646}
+                ratingDistribution={expandedTailRatingDistribution}
+            />,
+        )
+
+        const marker = screen.getByTestId('rating-member-marker')
+        const bars = document.querySelector('[class*="bars"]') as HTMLElement
+
+        expect(bars)
+            .not
+            .toHaveAttribute('style')
+        expect(parseFloat(marker.style.left))
+            .toBeCloseTo((3.5 / 6) * 100)
+    })
+
+    it('hides the 2200+ axis label when the distribution has no elite buckets', () => {
+        render(
+            <MemberRatingInfoModal
+                audienceLabel='developers'
+                onClose={jest.fn()}
+                percentile={15}
+                profile={baseProfile}
+                rating={1646}
+                ratingDistribution={ratingDistribution}
+            />,
+        )
+
+        expect(screen.getByText('1500'))
+            .toBeInTheDocument()
+        expect(screen.queryByText('2200+'))
+            .not
+            .toBeInTheDocument()
+    })
 })
diff --git a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.tsx b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.tsx
index 7e06eb160..d3a4ca25e 100644
--- a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.tsx
+++ b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/MemberRatingInfoModal/MemberRatingInfoModal.tsx
@@ -180,58 +180,161 @@ const getDistributionRanges = (
 )
 
 /**
- * Returns the chart end rating used for marker and axis positioning.
- *
- * Used by MemberRatingInfoModal to align labels with the rendered distribution range.
+ * Trims trailing empty rating buckets so the histogram can span the chart width.
  *
  * @param {RatingDistributionRange[]} ranges - Parsed rating distribution ranges.
- * @returns {number} The maximum rating represented by the chart.
+ * @returns {RatingDistributionRange[]} Ranges through the last populated bucket.
  */
-const getChartEndRating = (ranges: RatingDistributionRange[]): number => {
+const getVisibleDistributionRanges = (
+    ranges: RatingDistributionRange[],
+): RatingDistributionRange[] => {
     if (ranges.length === 0) {
-        return 3999
+        return ranges
+    }
+
+    let lastPopulatedIndex = -1
+    for (let index = ranges.length - 1; index >= 0; index -= 1) {
+        if (ranges[index].value > 0) {
+            lastPopulatedIndex = index
+            break
+        }
     }
 
-    return ranges[ranges.length - 1].end
+    if (lastPopulatedIndex < 0) {
+        return ranges
+    }
+
+    return ranges.slice(0, lastPopulatedIndex + 1)
 }
 
 /**
- * Calculates a horizontal chart position for a rating value.
+ * Returns the histogram bar index for a rating value.
  *
- * Used by MemberRatingInfoModal for the member marker and static x-axis labels.
+ * @param {number} rating - The rating value to locate.
+ * @param {RatingDistributionRange[]} ranges - Visible rating distribution ranges.
+ * @returns {number} Zero-based bar index, clamped to the visible range.
+ */
+const getBarIndexForRating = (
+    rating: number,
+    ranges: RatingDistributionRange[],
+): number => {
+    if (ranges.length === 0) {
+        return 0
+    }
+
+    const matchingIndex = ranges.findIndex((range: RatingDistributionRange) => (
+        rating >= range.start && rating <= range.end
+    ))
+
+    if (matchingIndex >= 0) {
+        return matchingIndex
+    }
+
+    if (rating < ranges[0].start) {
+        return 0
+    }
+
+    return ranges.length - 1
+}
+
+/**
+ * Returns the horizontal center position of the histogram bar for a rating.
+ *
+ * Used by MemberRatingInfoModal so the marker sits on the module bar itself
+ * instead of interpolating across a separate rating-percentage scale.
  *
  * @param {number} rating - The rating value to position.
- * @param {RatingDistributionRange[]} ranges - Parsed rating distribution ranges.
- * @returns {number} A clamped percentage from 0 to 100.
+ * @param {RatingDistributionRange[]} ranges - Visible rating distribution ranges.
+ * @returns {number} Center position of the matching bar as a percentage from 0 to 100.
  */
-const getChartPosition = (rating: number, ranges: RatingDistributionRange[]): number => {
-    const chartStart = ranges[0]?.start ?? 0
-    const chartEnd = getChartEndRating(ranges)
-    const chartSpan = chartEnd - chartStart
+const getMarkerPosition = (
+    rating: number,
+    ranges: RatingDistributionRange[],
+): number => {
+    if (ranges.length === 0) {
+        return 0
+    }
+
+    const barIndex = getBarIndexForRating(rating, ranges)
 
-    if (chartSpan <= 0) {
+    return ((barIndex + 0.5) / ranges.length) * 100
+}
+
+/**
+ * Returns the horizontal start position of the histogram bar for an axis label.
+ *
+ * @param {number} rating - The axis label rating value.
+ * @param {RatingDistributionRange[]} ranges - Visible rating distribution ranges.
+ * @returns {number} Start position of the matching bar as a percentage from 0 to 100.
+ */
+const getAxisLabelPosition = (
+    rating: number,
+    ranges: RatingDistributionRange[],
+): number => {
+    if (ranges.length === 0) {
         return 0
     }
 
-    const clampedRating = Math.max(chartStart, Math.min(rating, chartEnd))
+    const matchingIndex = ranges.findIndex((range: RatingDistributionRange) => (
+        rating >= range.start && rating <= range.end
+    ))
 
-    return ((clampedRating - chartStart) / chartSpan) * 100
+    if (matchingIndex >= 0) {
+        return (matchingIndex / ranges.length) * 100
+    }
+
+    const nextIndex = ranges.findIndex((range: RatingDistributionRange) => range.start >= rating)
+
+    if (nextIndex >= 0) {
+        return (nextIndex / ranges.length) * 100
+    }
+
+    return 100
+}
+
+/**
+ * Returns axis labels that fall within the visible distribution ranges.
+ *
+ * Hides labels such as `2200+` when the trimmed histogram has no elite buckets,
+ * which otherwise stack on top of the final label (e.g. `1500`).
+ *
+ * @param {RatingDistributionRange[]} ranges - Visible rating distribution ranges.
+ * @returns {Array<{ label: string, value: number }>} Axis labels to render.
+ */
+const getVisibleAxisLabels = (
+    ranges: RatingDistributionRange[],
+): Array<{ label: string, value: number }> => {
+    if (ranges.length === 0) {
+        return chartAxisLabels
+    }
+
+    const chartEnd = ranges[ranges.length - 1].end
+
+    return chartAxisLabels.filter((axisLabel: { label: string, value: number }) => (
+        axisLabel.value <= chartEnd
+    ))
 }
 
 /**
  * Calculates a bar height for a histogram count.
  *
- * Used by MemberRatingInfoModal to preserve visible bars for low non-zero ranges.
+ * Empty buckets still get a short stub so the chart baseline stays visible,
+ * especially at the low end of the distribution (0 to the first populated range).
+ * Populated buckets use a slightly taller minimum so small counts remain readable.
  *
  * @param {number} value - Number of members in the rating range.
  * @param {number} maxValue - Highest count in the distribution.
  * @returns {number} A percentage height for CSS rendering.
  */
 const getBarHeight = (value: number, maxValue: number): number => {
-    if (value <= 0 || maxValue <= 0) {
+    if (maxValue <= 0) {
         return 0
     }
 
+    if (value <= 0) {
+        return 1
+    }
+
     return Math.max(4, Math.round((value / maxValue) * 100))
 }
 
@@ -268,15 +371,20 @@ const MemberRatingInfoModal: FC<MemberRatingInfoModalProps> = (props: MemberRati
     const ratingColor: string = getRatingColor(props.rating)
     const selectedRatingTier: RatingTier = getRatingTier(props.rating)
     const distributionRanges: RatingDistributionRange[] = useMemo(() => (
-        getDistributionRanges(props.ratingDistribution?.distribution)
+        getVisibleDistributionRanges(
+            getDistributionRanges(props.ratingDistribution?.distribution),
+        )
     ), [props.ratingDistribution])
     const maxDistributionValue: number = Math.max(
         1,
         ...distributionRanges.map((range: RatingDistributionRange) => range.value),
     )
     const markerPosition: number = props.rating !== undefined
-        ? getChartPosition(props.rating, distributionRanges)
+        ? getMarkerPosition(props.rating, distributionRanges)
         : 0
+    const visibleAxisLabels: Array<{ label: string, value: number }> = useMemo(() => (
+        getVisibleAxisLabels(distributionRanges)
+    ), [distributionRanges])
     const shouldStackMarkerRating: boolean = props.rating !== undefined && (
         markerPosition >= stackedMarkerPositionThreshold
         || props.rating >= stackedMarkerRatingThreshold
@@ -394,10 +502,15 @@ const MemberRatingInfoModal: FC<MemberRatingInfoModalProps> = (props: MemberRati
                             )}
 
                             <div className={styles.axisLabels}>
-                                {chartAxisLabels.map((axisLabel: { label: string, value: number }) => (
+                                {visibleAxisLabels.map((axisLabel: { label: string, value: number }) => (
                                     <span
                                         key={axisLabel.label}
-                                        style={{ left: `${getChartPosition(axisLabel.value, distributionRanges)}%` }}
+                                        style={{
+                                            left: `${getAxisLabelPosition(
+                                                axisLabel.value,
+                                                distributionRanges,
+                                            )}%`,
+                                        }}
                                     >
                                         {axisLabel.label}
                                     </span>
diff --git a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/ModifyPreferredRolesModal/ModifyPreferredRolesModal.tsx b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/ModifyPreferredRolesModal/ModifyPreferredRolesModal.tsx
index edbefeffb..8f0c85e81 100644
--- a/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/ModifyPreferredRolesModal/ModifyPreferredRolesModal.tsx
+++ b/src/apps/profiles/src/member-profile/about-me/MemberRatingCard/ModifyPreferredRolesModal/ModifyPreferredRolesModal.tsx
@@ -134,6 +134,7 @@ const ModifyPreferredRolesModal: FC<ModifyPreferredRolesModalProps> = (props: Mo
                     label='Preferred Roles'
                     name='preferredRoles'
                     onFetchOptions={fetchPreferredRoles}
+                    openMenuOnClick
                     options={preferredRoleOptions}
                     onChange={handlePreferredRolesChange}
                     placeholder='Select preferred roles'
diff --git a/src/apps/reports/src/pages/dashboards/DashboardChart.spec.tsx b/src/apps/reports/src/pages/dashboards/DashboardChart.spec.tsx
index bc9eb3227..5d26cade2 100644
--- a/src/apps/reports/src/pages/dashboards/DashboardChart.spec.tsx
+++ b/src/apps/reports/src/pages/dashboards/DashboardChart.spec.tsx
@@ -8,21 +8,23 @@ import {
 import Highcharts from 'highcharts'
 
 import {
+    ChallengeParticipationDashboard,
     MemberPaymentByCustomerDashboard,
     NewSignupsDashboard,
 } from '../../lib/services'
 
 import { DashboardChart } from './DashboardChart'
 
+let chartOptions: Highcharts.Options
+
 jest.mock('highcharts-react-official', () => ({
     __esModule: true,
-    default: (props: {
-        options: {
-            series?: Array<{ data?: number[]; name?: string }>
-            tooltip?: { pointFormat?: string }
-        }
-    }): JSX.Element => {
-        const series = props.options.series || []
+    default: (props: { options: Highcharts.Options }): JSX.Element => {
+        chartOptions = props.options
+        const series = props.options.series as Array<{
+            data?: number[]
+            name?: string
+        }> || []
 
         return (
             <div
@@ -30,7 +32,6 @@ jest.mock('highcharts-react-official', () => ({
                 data-series-names={series.map(item => item.name)
                     .join('|')}
                 data-testid='dashboard-chart'
-                data-tooltip={props.options.tooltip?.pointFormat}
             />
         )
     },
@@ -96,10 +97,61 @@ const signupResponse: NewSignupsDashboard = {
     },
 }
 
+const challengeParticipationResponse: ChallengeParticipationDashboard = {
+    dashboard: 'challenge-participation',
+    endDate: '2026-02-01T00:00:00.000Z',
+    months: [{
+        month: '2026-01-01',
+        registrants: 120,
+        submitters: 75,
+    }],
+    startDate: '2026-01-01T00:00:00.000Z',
+    summary: {
+        peakMonth: '2026-01-01',
+        peakMonthRegistrants: 120,
+        submissionRate: 62.5,
+        totalUniqueRegistrants: 120,
+        totalUniqueSubmitters: 75,
+    },
+}
 const pointValueToken = '{point.y:,.0f}'
 const countTooltipValue = `<b>${pointValueToken}</b>`
 const currencyTooltipValue = `<b>$${pointValueToken}</b>`
 
+/**
+ * Invokes the tooltip formatter captured from the rendered chart.
+ *
+ * Tests use this helper to verify totals independently of Highcharts' DOM renderer.
+ *
+ * @param values Hovered series values for one month.
+ * @returns The formatter's tooltip HTML as one string.
+ * @throws Error when the chart has no formatter or it returns no HTML.
+ */
+function formatTooltip(values: number[]): string {
+    const formatter = chartOptions.tooltip?.formatter
+    if (!formatter) {
+        throw new Error('Tooltip formatter is missing')
+    }
+
+    const context = {
+        points: values.map(y => ({ y })),
+    } as unknown as Highcharts.TooltipFormatterContextObject
+    const tooltip = {
+        defaultFormatter: () => ['<strong>Jan ’26</strong><br/>', 'series rows'],
+    } as unknown as Highcharts.Tooltip
+    const result = formatter.call(context, tooltip)
+
+    if (typeof result === 'string') {
+        return result
+    }
+
+    if (Array.isArray(result)) {
+        return result.join('')
+    }
+
+    throw new Error('Tooltip formatter did not return HTML')
+}
+
 describe('DashboardChart', () => {
     it('formats tooltip thousands with commas', () => {
         expect(Highcharts.getOptions().lang?.thousandsSep)
@@ -126,8 +178,10 @@ describe('DashboardChart', () => {
                 'data-series-data',
                 '[[125000,140000],[80000,0],[20000,25000]]',
             )
-        expect(chart.getAttribute('data-tooltip'))
+        expect(chartOptions.tooltip?.pointFormat)
             .toContain(currencyTooltipValue)
+        expect(formatTooltip([125_000, 80_000, 20_000]))
+            .toContain('Total: <b>$225,000</b>')
         expect(within(table)
             .getByRole('columnheader', { name: 'Customer A' }))
             .toBeInTheDocument()
@@ -142,20 +196,30 @@ describe('DashboardChart', () => {
             .toBeInTheDocument()
     })
 
-    it('keeps existing count dashboards unit-free', () => {
+    it('keeps count dashboard tooltips unit-free and adds their total', () => {
         render(<DashboardChart response={signupResponse} />)
 
-        const chart = screen.getByTestId('dashboard-chart')
         const table = screen.getByRole('table', {
             name: 'New Signups by Month monthly data',
         })
 
-        expect(chart.getAttribute('data-tooltip'))
+        expect(chartOptions.tooltip?.pointFormat)
             .toContain(countTooltipValue)
-        expect(chart.getAttribute('data-tooltip'))
+        expect(chartOptions.tooltip?.pointFormat)
             .not.toContain(currencyTooltipValue)
+        expect(formatTooltip([90, 10]))
+            .toContain('Total: <b>100</b>')
+        expect(formatTooltip([90, 10]))
+            .not.toContain('$100')
         expect(within(table)
             .getByRole('cell', { name: '90' }))
             .toBeInTheDocument()
     })
+
+    it('adds a total to grouped report tooltips', () => {
+        render(<DashboardChart response={challengeParticipationResponse} />)
+
+        expect(formatTooltip([120, 75]))
+            .toContain('Total: <b>195</b>')
+    })
 })
diff --git a/src/apps/reports/src/pages/dashboards/DashboardChart.tsx b/src/apps/reports/src/pages/dashboards/DashboardChart.tsx
index 54182e43a..eeeab09db 100644
--- a/src/apps/reports/src/pages/dashboards/DashboardChart.tsx
+++ b/src/apps/reports/src/pages/dashboards/DashboardChart.tsx
@@ -50,7 +50,7 @@ function getSeriesValue(month: DashboardMonth, key: string): number {
  *
  * @param props Dashboard response and compact-card presentation flag.
  * @returns A stacked or grouped column chart with month categories along the
- * bottom axis and an accessible monthly data table.
+ * bottom axis, monthly tooltip totals, and an accessible monthly data table.
  * @throws Does not throw. Invalid or absent point values are rendered as zero.
  */
 export const DashboardChart: FC<DashboardChartProps> = props => {
@@ -119,6 +119,29 @@ export const DashboardChart: FC<DashboardChartProps> = props => {
             text: undefined,
         },
         tooltip: {
+            /**
+             * Appends the hovered month's total to Highcharts' shared tooltip.
+             *
+             * Highcharts invokes this callback for card and detail charts.
+             *
+             * @param tooltip Highcharts tooltip used to render the existing rows.
+             * @returns The default tooltip content followed by the formatted total.
+             * @throws Does not throw for the normalized chart-series values.
+             */
+            formatter(tooltip: Highcharts.Tooltip) {
+                // Highcharts supplies the shared tooltip context through `this`.
+                // eslint-disable-next-line react/no-this-in-sfc
+                const points = this.points || [this]
+                const total = points.reduce((sum, point) => sum + (point.y ?? 0), 0)
+                // eslint-disable-next-line react/no-this-in-sfc
+                const content = tooltip.defaultFormatter.call(this, tooltip)
+                const totalRow = `Total: <b>${isCurrency ? '$' : ''}`
+                    + `${Highcharts.numberFormat(total, 0)}</b>`
+
+                return Array.isArray(content)
+                    ? [...content, totalRow]
+                    : `${content}${totalRow}`
+            },
             headerFormat: '<strong>{point.key}</strong><br/>',
             pointFormat: '<span style="color:{series.color}">●</span> '
                 + `{series.name}: <b>${isCurrency ? '$' : ''}{point.y:,.0f}</b><br/>`,
diff --git a/src/apps/reports/src/pages/reports/ReportsPage.spec.tsx b/src/apps/reports/src/pages/reports/ReportsPage.spec.tsx
index 05dbbfec6..d2f9fd5c7 100644
--- a/src/apps/reports/src/pages/reports/ReportsPage.spec.tsx
+++ b/src/apps/reports/src/pages/reports/ReportsPage.spec.tsx
@@ -17,9 +17,13 @@ import {
     useLocation,
 } from 'react-router-dom'
 
-import { fetchReportsIndex } from '../../lib/services'
+import {
+    fetchReportJson,
+    fetchReportsIndex,
+    SfdcBillingAccountPaymentRow,
+} from '../../lib/services'
 
-import { ReportsPage } from './ReportsPage'
+import { BillingAccountsPage, ReportsPage } from './ReportsPage'
 
 type MockSelectProps = {
     disabled?: boolean
@@ -86,6 +90,8 @@ jest.mock('../../lib/utils', () => ({
 }))
 
 const mockedFetchReportsIndex = fetchReportsIndex as jest.Mock
+const mockedFetchReportJson = fetchReportJson as jest.Mock
+const originalTimezone = process.env.TZ
 
 const LocationProbe = (): JSX.Element => {
     const { pathname }: { pathname: string } = useLocation()
@@ -109,6 +115,15 @@ describe('Reports page navigation', () => {
         })
     })
 
+    afterEach(() => {
+        if (originalTimezone) {
+            process.env.TZ = originalTimezone
+            return
+        }
+
+        delete process.env.TZ
+    })
+
     it('opens Bulk Member Lookup from the Reports app root', async () => {
         render(
             <MemoryRouter initialEntries={['/reports/reports']}>
@@ -137,4 +152,64 @@ describe('Reports page navigation', () => {
         expect(screen.getByTestId('location'))
             .toHaveTextContent('/reports/bulk-member-lookup')
     })
+
+    it('renders SFDC payment dates in America/New_York', async () => {
+        process.env.TZ = 'Asia/Colombo'
+        const paymentDate = '2026-07-31T18:53:33.383-04:00'
+        const payment: SfdcBillingAccountPaymentRow = {
+            billingAccountId: '80000001',
+            category: 'CHALLENGE_PAYMENT',
+            challengeFee: '0.00',
+            challengeId: 'challenge-id',
+            challengeName: 'July payment',
+            challengeStatus: 'Completed',
+            isTask: false,
+            paymentAmount: '100.00',
+            paymentDate,
+            paymentId: 'payment-id',
+            paymentStatus: 'PAID',
+            winnerFirstName: 'Ada',
+            winnerHandle: 'ada',
+            winnerId: '123',
+            winnerLastName: 'Lovelace',
+        }
+        mockedFetchReportJson.mockResolvedValue([payment])
+
+        render(
+            <MemoryRouter initialEntries={['/reports/sfdc-payments']}>
+                <BillingAccountsPage />
+            </MemoryRouter>,
+        )
+
+        expect(await screen.findByText('July payment'))
+            .toBeInTheDocument()
+        const parsedPaymentDate = new Date(paymentDate)
+        const displayedDate = parsedPaymentDate
+            .toLocaleString(undefined, { timeZone: 'America/New_York' })
+        const browserDisplayedDate = parsedPaymentDate
+            .toLocaleString()
+
+        expect(screen.getByText(displayedDate))
+            .toBeInTheDocument()
+        expect(parsedPaymentDate.getUTCDate())
+            .toBe(31)
+        expect(parsedPaymentDate.getDate())
+            .toBe(1)
+        expect(displayedDate)
+            .not.toBe(browserDisplayedDate)
+
+        mockedFetchReportJson.mockResolvedValueOnce({
+            billingAccount: {
+                budget: '1000.00',
+                markup: '0.00',
+                name: 'Boundary account',
+                startDate: paymentDate,
+                status: 'Active',
+            },
+        })
+        fireEvent.click(screen.getByRole('button', { name: '80000001' }))
+
+        expect(await screen.findByText(browserDisplayedDate))
+            .toBeInTheDocument()
+    })
 })
diff --git a/src/apps/reports/src/pages/reports/ReportsPage.tsx b/src/apps/reports/src/pages/reports/ReportsPage.tsx
index eeeecefea..8322afbde 100644
--- a/src/apps/reports/src/pages/reports/ReportsPage.tsx
+++ b/src/apps/reports/src/pages/reports/ReportsPage.tsx
@@ -178,6 +178,22 @@ const formatPaymentDate = (iso: string): string => {
         .toLocaleString()
 }
 
+/**
+ * Formats an SFDC payment timestamp in the report's America/New_York timezone.
+ * The input is an ISO date-time string and the returned value is used in payment table cells.
+ * Invalid inputs are returned unchanged, so this function does not throw parsing errors.
+ */
+const formatSfdcPaymentDate = (iso: string): string => {
+    const parsed = Date.parse(iso)
+
+    if (Number.isNaN(parsed)) {
+        return iso
+    }
+
+    return new Date(parsed)
+        .toLocaleString(undefined, { timeZone: 'America/New_York' })
+}
+
 const PAYMENT_TABLE_COLUMNS: { key: keyof SfdcBillingAccountPaymentRow; label: string }[] = [
     { key: 'paymentId', label: 'Payment ID' },
     { key: 'paymentDate', label: 'Payment date' },
@@ -431,7 +447,7 @@ const BillingAccountReportResults = (
         const value = row[colKey]
 
         if (colKey === 'paymentDate') {
-            return formatPaymentDate(String(value))
+            return formatSfdcPaymentDate(String(value))
         }
 
         if (colKey === 'billingAccountId') {
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.spec.tsx b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.spec.tsx
index 665c3ec19..f9e4385db 100644
--- a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.spec.tsx
+++ b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.spec.tsx
@@ -15,6 +15,7 @@ import { TabContentReview } from './TabContentReview'
 const mockUseRole = jest.fn()
 const mockTableAppealsForSubmitter = jest.fn()
 const mockTableAppealsResponse = jest.fn()
+const mockTableReview = jest.fn()
 const mockTableReviewForSubmitter = jest.fn()
 
 jest.mock('~/config', () => ({
@@ -78,7 +79,15 @@ jest.mock('../TableNoRecord', () => ({
 }))
 
 jest.mock('../TableReview', () => ({
-    TableReview: () => <div>Reviewer reviews</div>,
+    TableReview: (props: { datas: SubmissionInfo[] }) => {
+        mockTableReview(props)
+        return (
+            <div>
+                {props.datas.map(submission => submission.id)
+                    .join(',')}
+            </div>
+        )
+    },
 }))
 
 jest.mock('../TableReviewForSubmitter', () => ({
@@ -208,4 +217,63 @@ describe('TabContentReview submitter Appeals ownership', () => {
                 ],
             }))
     })
+
+    it('passes both finite-limit Design reviews for one member to the reviewer table', () => {
+        const olderSubmission = {
+            id: 'member-submission-older',
+            isLatest: false,
+            memberId: 'member-shared',
+            review: {
+                phaseName: 'Review',
+                reviewType: 'Review',
+            },
+            submittedDate: '2026-08-12T10:00:00Z',
+            type: 'CONTEST_SUBMISSION',
+        } as SubmissionInfo
+        const latestSubmission = {
+            ...olderSubmission,
+            id: 'member-submission-latest',
+            isLatest: true,
+            submittedDate: '2026-08-12T11:00:00Z',
+        }
+        const reviewerChallengeInfo = {
+            ...challengeInfo,
+            metadata: [{
+                name: 'submissionLimit',
+                value: JSON.stringify({ count: '2', limit: 'true', unlimited: 'false' }),
+            }],
+            submissions: [olderSubmission, latestSubmission],
+            track: {
+                id: 'design-track',
+                name: 'Design',
+            },
+        } as ChallengeInfo
+        const reviewerContext = {
+            ...challengeContext,
+            challengeInfo: reviewerChallengeInfo,
+            myResources: [],
+            myRoles: ['Reviewer'],
+        } as unknown as ChallengeDetailContextModel
+        mockUseRole.mockReturnValue({
+            actionChallengeRole: 'Reviewer',
+            hasApproverRole: false,
+            isPrivilegedRole: true,
+        })
+
+        render(
+            <ChallengeDetailContext.Provider value={reviewerContext}>
+                <TabContentReview
+                    {...commonProps}
+                    isActiveChallenge
+                    reviews={[olderSubmission, latestSubmission]}
+                    selectedTab='Review'
+                />
+            </ChallengeDetailContext.Provider>,
+        )
+
+        expect(mockTableReview)
+            .toHaveBeenLastCalledWith(expect.objectContaining({
+                datas: [olderSubmission, latestSubmission],
+            }))
+    })
 })
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.tsx b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.tsx
index 41e5ae051..46bbebb96 100644
--- a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.tsx
+++ b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.tsx
@@ -770,23 +770,23 @@ export const TabContentReview: FC<Props> = (props: Props) => {
     )
     const reviewerRowsForReviewTab = useMemo(
         () => (shouldSortReviewTabByScore
-            ? sortSubmissionsByReviewScoreDesc(filteredReviews, useAggregateReviewScore)
-            : filteredReviews),
-        [filteredReviews, shouldSortReviewTabByScore, useAggregateReviewScore],
+            ? sortSubmissionsByReviewScoreDesc(resolvedReviewsWithSubmitter, useAggregateReviewScore)
+            : resolvedReviewsWithSubmitter),
+        [resolvedReviewsWithSubmitter, shouldSortReviewTabByScore, useAggregateReviewScore],
     )
     const submitterRowsForReviewTab = useMemo(
         () => (shouldSortReviewTabByScore
-            ? sortSubmissionsByReviewScoreDesc(filteredSubmitterReviews, useAggregateReviewScore)
-            : filteredSubmitterReviews),
-        [filteredSubmitterReviews, shouldSortReviewTabByScore, useAggregateReviewScore],
+            ? sortSubmissionsByReviewScoreDesc(resolvedSubmitterReviews, useAggregateReviewScore)
+            : resolvedSubmitterReviews),
+        [resolvedSubmitterReviews, shouldSortReviewTabByScore, useAggregateReviewScore],
     )
     const hideHandleColumn = props.isActiveChallenge
         && actionChallengeRole === REVIEWER
 
     // show loading ui when fetching data
     const reviewRows = isSubmitterView
-        ? (shouldSortReviewTabByScore ? submitterRowsForReviewTab : filteredSubmitterReviews)
-        : (shouldSortReviewTabByScore ? reviewerRowsForReviewTab : filteredReviews)
+        ? submitterRowsForReviewTab
+        : reviewerRowsForReviewTab
 
     if (props.isLoadingReview) {
         return <TableLoading />
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.tsx b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.tsx
index 536480f4e..657488568 100644
--- a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.tsx
+++ b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.tsx
@@ -204,7 +204,8 @@ export const TabContentSubmissions: FC<Props> = props => {
                 return
             }
 
-            const key = getSubmissionHistoryKey(memberId, submissionId)
+            const submissionType = submissionInfoById.get(submissionId)?.type
+            const key = getSubmissionHistoryKey(memberId, submissionId, submissionType)
             const entries = historyByMember.get(key) ?? []
             if (!entries.length) {
                 return
@@ -212,7 +213,7 @@ export const TabContentSubmissions: FC<Props> = props => {
 
             setHistoryKey(key)
         },
-        [historyByMember],
+        [historyByMember, submissionInfoById],
     )
 
     const handleHistoryButtonClick = useCallback(
@@ -524,7 +525,11 @@ export const TabContentSubmissions: FC<Props> = props => {
                             return <span>-</span>
                         }
 
-                        const key = getSubmissionHistoryKey(submission.memberId, submission.id)
+                        const key = getSubmissionHistoryKey(
+                            submission.memberId,
+                            submission.id,
+                            submission.type,
+                        )
                         const historyEntries = historyByMember.get(key) ?? []
                         if (!historyEntries.length) {
                             return <span>-</span>
diff --git a/src/apps/review/src/lib/components/TableReview/TableReview.tsx b/src/apps/review/src/lib/components/TableReview/TableReview.tsx
index fec6728bc..a06faab00 100644
--- a/src/apps/review/src/lib/components/TableReview/TableReview.tsx
+++ b/src/apps/review/src/lib/components/TableReview/TableReview.tsx
@@ -41,7 +41,7 @@ import {
 } from '../../models'
 import {
     aggregateSubmissionReviews,
-    challengeHasSubmissionLimit,
+    getChallengeSubmissionSelectionLimit,
     isMarathonMatchChallenge,
     isReviewPhase,
     isReviewPhaseCurrentlyOpen,
@@ -180,6 +180,11 @@ export const TableReview: FC<TableReviewProps> = (props: TableReviewProps) => {
         [challengeInfo, submissionTypes],
     )
 
+    const submissionSelectionLimit = useMemo<number | undefined>(
+        () => getChallengeSubmissionSelectionLimit(challengeInfo),
+        [challengeInfo],
+    )
+
     const {
         closeHistoryModal,
         historyByMember,
@@ -193,11 +198,12 @@ export const TableReview: FC<TableReviewProps> = (props: TableReviewProps) => {
         datas: reviewPhaseDatas,
         filteredAll: filteredChallengeSubmissions,
         isSubmissionTab: true,
+        maxVisibleSubmissions: submissionSelectionLimit,
     })
 
     const restrictToLatest = useMemo<boolean>(
-        () => challengeHasSubmissionLimit(challengeInfo),
-        [challengeInfo],
+        () => submissionSelectionLimit !== undefined,
+        [submissionSelectionLimit],
     )
     const useAggregateReviewScore = useMemo<boolean>(
         () => isMarathonMatchChallenge(challengeInfo),
@@ -650,7 +656,11 @@ export const TableReview: FC<TableReviewProps> = (props: TableReviewProps) => {
             )
         }
 
-        const historyKeyForRow = getSubmissionHistoryKey(submission.memberId, submission.id)
+        const historyKeyForRow = getSubmissionHistoryKey(
+            submission.memberId,
+            submission.id,
+            submission.type,
+        )
         const rowHistory = historyByMember.get(historyKeyForRow) ?? []
 
         const buildHistoryAction = (): JSX.Element | undefined => {
diff --git a/src/apps/review/src/lib/components/TableReviewForSubmitter/TableReviewForSubmitter.tsx b/src/apps/review/src/lib/components/TableReviewForSubmitter/TableReviewForSubmitter.tsx
index bd6aad00d..cfe24785b 100644
--- a/src/apps/review/src/lib/components/TableReviewForSubmitter/TableReviewForSubmitter.tsx
+++ b/src/apps/review/src/lib/components/TableReviewForSubmitter/TableReviewForSubmitter.tsx
@@ -40,7 +40,7 @@ import type {
 } from '../common/types'
 import {
     aggregateSubmissionReviews,
-    challengeHasSubmissionLimit,
+    getChallengeSubmissionSelectionLimit,
     getSubmissionHistoryKey,
     isAppealsPhase,
     isAppealsResponsePhase,
@@ -155,6 +155,11 @@ export const TableReviewForSubmitter: FC<TableReviewForSubmitterProps> = (props:
         [challengeInfo?.submissions, datas, submissionTypes],
     )
 
+    const submissionSelectionLimit = useMemo<number | undefined>(
+        () => getChallengeSubmissionSelectionLimit(challengeInfo),
+        [challengeInfo],
+    )
+
     const {
         closeHistoryModal,
         historyByMember,
@@ -168,11 +173,12 @@ export const TableReviewForSubmitter: FC<TableReviewForSubmitterProps> = (props:
         datas,
         filteredAll,
         isSubmissionTab: true,
+        maxVisibleSubmissions: submissionSelectionLimit,
     })
 
     const restrictToLatest = useMemo<boolean>(
-        () => challengeHasSubmissionLimit(challengeInfo),
-        [challengeInfo],
+        () => submissionSelectionLimit !== undefined,
+        [submissionSelectionLimit],
     )
     const useAggregateReviewScore = useMemo<boolean>(
         () => isMarathonMatchChallenge(challengeInfo),
@@ -524,6 +530,7 @@ export const TableReviewForSubmitter: FC<TableReviewForSubmitterProps> = (props:
                     const historyKeyForSubmission = getSubmissionHistoryKey(
                         submission.memberId,
                         submission.id,
+                        submission.type,
                     )
                     const historyEntries = historyByMember.get(historyKeyForSubmission) ?? []
                     const filteredHistory = restrictToLatest
diff --git a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
index 62f4617fd..512ce4dee 100644
--- a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
+++ b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
@@ -33,7 +33,7 @@ import {
 import { TableWrapper } from '../TableWrapper'
 import { SubmissionHistoryModal } from '../SubmissionHistoryModal'
 import {
-    challengeHasSubmissionLimit,
+    getChallengeSubmissionSelectionLimit,
     getHandleUrl,
     getSubmissionHistoryKey,
     isReviewPhaseCurrentlyOpen,
@@ -400,7 +400,11 @@ const createHistoryAction = ({
         return undefined
     }
 
-    const historyKeyForRow = getSubmissionHistoryKey(data.memberId, data.submissionId)
+    const historyKeyForRow = getSubmissionHistoryKey(
+        data.memberId,
+        data.submissionId,
+        data.type,
+    )
     const historyEntries = historyByMember.get(historyKeyForRow) ?? []
     if (!historyEntries.length) {
         return undefined
@@ -945,9 +949,16 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
         [submissionMetaById],
     )
 
+    const submissionSelectionLimit = useMemo<number | undefined>(
+        () => getChallengeSubmissionSelectionLimit(challengeInfo),
+        [challengeInfo],
+    )
+
     const submissionHistory = useMemo(
-        () => partitionSubmissionHistory(primarySubmissionInfos, historySourceSubmissions),
-        [historySourceSubmissions, primarySubmissionInfos],
+        () => partitionSubmissionHistory(primarySubmissionInfos, historySourceSubmissions, {
+            visibleSubmissionCount: submissionSelectionLimit,
+        }),
+        [historySourceSubmissions, primarySubmissionInfos, submissionSelectionLimit],
     )
 
     const { historyByMember, latestSubmissionIds }: SubmissionHistoryPartition = submissionHistory
@@ -957,16 +968,14 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
         rows: visibleScreenings,
     }: ScreeningRowsSelection = useMemo(
         () => selectVisibleScreeningRows({
-            hasSubmissionLimit: challengeHasSubmissionLimit(challengeInfo),
             latestSubmissionIds,
             screeningRows: props.screenings,
-            submissionInfos: primarySubmissionInfos,
+            submissionLimit: submissionSelectionLimit,
         }),
         [
-            challengeInfo,
             latestSubmissionIds,
-            primarySubmissionInfos,
             props.screenings,
+            submissionSelectionLimit,
         ],
     )
 
@@ -1051,7 +1060,8 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
 
     const openHistoryModal = useCallback(
         (memberId: string | undefined, submissionId: string): void => {
-            const key = getSubmissionHistoryKey(memberId, submissionId)
+            const submissionType = submissionMetaById.get(submissionId)?.type
+            const key = getSubmissionHistoryKey(memberId, submissionId, submissionType)
             const historyEntries = historyByMember.get(key)
             if (!historyEntries || historyEntries.length === 0) {
                 return
@@ -1059,7 +1069,7 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
 
             setHistoryKey(key)
         },
-        [historyByMember],
+        [historyByMember, submissionMetaById],
     )
 
     const openReopenDialog = useCallback(
diff --git a/src/apps/review/src/lib/hooks/useSubmissionHistory.ts b/src/apps/review/src/lib/hooks/useSubmissionHistory.ts
index 649265df0..e318f039d 100644
--- a/src/apps/review/src/lib/hooks/useSubmissionHistory.ts
+++ b/src/apps/review/src/lib/hooks/useSubmissionHistory.ts
@@ -9,9 +9,14 @@ import {
 import type { SubmissionHistoryPartition } from '../utils/submissionHistory'
 
 interface UseSubmissionHistoryParams {
+    /** Primary table submissions, including review or screening details. */
     datas: SubmissionInfo[]
+    /** Complete matching challenge history used to rank submissions. */
     filteredAll: SubmissionInfo[]
+    /** Whether the consuming table supports submission-history actions. */
     isSubmissionTab: boolean
+    /** Positive latest-submission count per member/type group. Defaults to one. */
+    maxVisibleSubmissions?: number
 }
 
 export interface UseSubmissionHistoryResult {
@@ -26,16 +31,23 @@ export interface UseSubmissionHistoryResult {
 }
 
 /**
- * Encapsulates submission history modal state and derived metadata for tables.
+ * Encapsulate submission-history ranking and modal state for Review tables.
+ *
+ * @param params - Primary rows, complete matching history, table mode, and visible count.
+ * @returns Latest selected rows and IDs, older member/type history, and modal callbacks.
+ * @throws Does not throw; invalid visible counts are normalized by the partition utility.
  */
 export function useSubmissionHistory({
     datas,
     filteredAll,
     isSubmissionTab,
+    maxVisibleSubmissions,
 }: UseSubmissionHistoryParams): UseSubmissionHistoryResult {
     const submissionHistory = useMemo<SubmissionHistoryPartition>(
-        () => partitionSubmissionHistory(datas, filteredAll),
-        [datas, filteredAll],
+        () => partitionSubmissionHistory(datas, filteredAll, {
+            visibleSubmissionCount: maxVisibleSubmissions,
+        }),
+        [datas, filteredAll, maxVisibleSubmissions],
     )
 
     const {
@@ -58,7 +70,9 @@ export function useSubmissionHistory({
 
     const openHistoryModal: (memberId: string | undefined, submissionId: string) => void = useCallback(
         (memberId: string | undefined, submissionId: string): void => {
-            const key = getSubmissionHistoryKey(memberId, submissionId)
+            const submissionType = datas.find(submission => submission.id === submissionId)?.type
+                ?? filteredAll.find(submission => submission.id === submissionId)?.type
+            const key = getSubmissionHistoryKey(memberId, submissionId, submissionType)
             const entries = historyByMember.get(key)
             if (!entries || entries.length === 0) {
                 return
@@ -66,7 +80,7 @@ export function useSubmissionHistory({
 
             setHistoryKey(key)
         },
-        [historyByMember],
+        [datas, filteredAll, historyByMember],
     )
 
     const closeHistoryModal = useCallback((): void => {
diff --git a/src/apps/review/src/lib/utils/challenge.spec.ts b/src/apps/review/src/lib/utils/challenge.spec.ts
index b6c48380a..39f52fb24 100644
--- a/src/apps/review/src/lib/utils/challenge.spec.ts
+++ b/src/apps/review/src/lib/utils/challenge.spec.ts
@@ -4,6 +4,7 @@ import {
     buildPhaseTabs,
     collectReopenEligiblePhaseIds,
     findPhaseByTabLabel,
+    getChallengeSubmissionSelectionLimit,
     hasPendingApprovalReview,
     isFirst2FinishChallenge,
     isMarathonMatchChallenge,
@@ -51,6 +52,115 @@ const createBackendPhase = (
 })
 
 describe('challenge phase tab helpers', () => {
+    it('uses the configured Design submission count', () => {
+        expect(getChallengeSubmissionSelectionLimit({
+            metadata: [{
+                name: 'submissionLimit',
+                value: JSON.stringify({ count: '2', limit: 'true', unlimited: 'false' }),
+            }],
+            track: {
+                id: 'design-track',
+                name: 'Design',
+            },
+        }))
+            .toBe(2)
+    })
+
+    it('retains the latest-one policy for a finite Design count of one', () => {
+        expect(getChallengeSubmissionSelectionLimit({
+            metadata: [{
+                name: 'submissionLimit',
+                value: JSON.stringify({ count: 1, limit: true, unlimited: false }),
+            }],
+            track: {
+                id: 'design-track',
+                name: 'Design',
+            },
+        }))
+            .toBe(1)
+    })
+
+    it('keeps explicit and default Design submission limits unlimited', () => {
+        const track = {
+            id: 'design-track',
+            name: 'Design',
+        }
+
+        expect(getChallengeSubmissionSelectionLimit({ metadata: [], track }))
+            .toBeUndefined()
+        expect(getChallengeSubmissionSelectionLimit({
+            metadata: [{
+                name: 'submissionLimit',
+                value: JSON.stringify({ count: '', limit: 'false', unlimited: 'true' }),
+            }],
+            track,
+        }))
+            .toBeUndefined()
+    })
+
+    it('recognizes Design from canonical track fields and keeps non-Design latest-one', () => {
+        expect(getChallengeSubmissionSelectionLimit({
+            metadata: [],
+            track: {
+                id: 'design-track',
+                name: '',
+                track: 'DESIGN',
+            },
+        }))
+            .toBeUndefined()
+        expect(getChallengeSubmissionSelectionLimit({
+            metadata: [{
+                name: 'submissionLimit',
+                value: JSON.stringify({ count: '', limit: 'false', unlimited: 'true' }),
+            }],
+            track: {
+                id: 'development-track',
+                name: 'Development',
+            },
+        }))
+            .toBe(1)
+    })
+
+    it.each([
+        [
+            'an explicit unlimited flag with a stale count',
+            { count: '5', limit: 'false' },
+            undefined,
+        ],
+        [
+            'contradictory flags',
+            { count: '2', limit: 'true', unlimited: 'true' },
+            1,
+        ],
+        [
+            'a non-integer count',
+            '2.5',
+            1,
+        ],
+        [
+            'an invalid higher-priority count alias',
+            { count: 'invalid', maximum: '4' },
+            1,
+        ],
+        [
+            'an unrecognized boolean flag alias with a valid count',
+            { count: '3', limit: 'unlimited' },
+            3,
+        ],
+    ])('matches the backend policy for %s', (_description, value, expected) => {
+        expect(getChallengeSubmissionSelectionLimit({
+            metadata: [{
+                name: 'submissionLimit',
+                value: typeof value === 'string' ? value : JSON.stringify(value),
+            }],
+            track: {
+                id: 'design-track',
+                name: 'Design',
+            },
+        }))
+            .toBe(expected)
+    })
+
     it('recognizes Marathon Match challenges from type metadata', () => {
         expect(isMarathonMatchChallenge({
             type: {
diff --git a/src/apps/review/src/lib/utils/challenge.ts b/src/apps/review/src/lib/utils/challenge.ts
index df58c44b9..31dceb290 100644
--- a/src/apps/review/src/lib/utils/challenge.ts
+++ b/src/apps/review/src/lib/utils/challenge.ts
@@ -54,6 +54,13 @@ export function isAppealsResponsePhase(challengeInfo?: ChallengeInfo): boolean {
 }
 
 const SUBMISSION_LIMIT_KEY = 'submissionlimit'
+const SUBMISSION_LIMIT_COUNT_FIELDS = [
+    'count',
+    'max',
+    'maximum',
+    'limitCount',
+    'value',
+] as const
 const UNLIMITED_KEYWORDS = ['unlimited', 'false', '0', 'no', 'none']
 const TRUE_KEYWORDS = ['true', 'yes', '1']
 
@@ -87,6 +94,39 @@ function parseBooleanFlag(value: unknown): boolean | undefined {
     return undefined
 }
 
+/**
+ * Parse submission-limit object flags using the backend's accepted boolean aliases.
+ *
+ * @param value - Raw `limit` or `unlimited` flag.
+ * @returns The recognized boolean value, or `undefined` for malformed aliases.
+ * @throws Does not throw.
+ */
+function parseSubmissionLimitFlag(value: unknown): boolean | undefined {
+    if (typeof value === 'boolean') {
+        return value
+    }
+
+    if (value === 1 || value === 0) {
+        return value === 1
+    }
+
+    if (typeof value !== 'string') {
+        return undefined
+    }
+
+    const normalized = value.trim()
+        .toLowerCase()
+    if (TRUE_KEYWORDS.includes(normalized)) {
+        return true
+    }
+
+    if (['false', 'no', '0'].includes(normalized)) {
+        return false
+    }
+
+    return undefined
+}
+
 function hasPositiveNumeric(value: unknown): boolean {
     if (value === undefined || value === null) {
         return false
@@ -171,7 +211,16 @@ function evaluateObjectLimit(candidate: Record<string, unknown>): boolean {
     return true
 }
 
-export function challengeHasSubmissionLimit(challengeInfo?: ChallengeInfo): boolean {
+/**
+ * Determine whether legacy submission-limit metadata represents a finite limit.
+ *
+ * @param challengeInfo - Challenge metadata containing the legacy `submissionLimit` entry.
+ * @returns True for finite or malformed legacy values and false for explicit unlimited values.
+ * @throws Does not throw; missing metadata retains the legacy finite-limit fallback.
+ */
+export function challengeHasSubmissionLimit(
+    challengeInfo?: Pick<ChallengeInfo, 'metadata'>,
+): boolean {
     const rawValue = findSubmissionLimitMetadata(challengeInfo?.metadata)
     if (rawValue === undefined || rawValue === null) {
         return true
@@ -198,6 +247,104 @@ export function challengeHasSubmissionLimit(challengeInfo?: ChallengeInfo): bool
     return true
 }
 
+/**
+ * Convert a numeric metadata value to a safe positive-integer submission count.
+ *
+ * @param value - Raw count value from challenge metadata.
+ * @returns The positive whole-number count, or `undefined` when the value is not positive numeric data.
+ * @throws Does not throw; invalid values are ignored.
+ */
+function parsePositiveSubmissionLimit(value: unknown): number | undefined {
+    if (typeof value !== 'number' && typeof value !== 'string') {
+        return undefined
+    }
+
+    const numericValue = Number(value)
+    return Number.isSafeInteger(numericValue) && numericValue > 0
+        ? numericValue
+        : undefined
+}
+
+/**
+ * Resolve how many submissions per member and exact submission type Review should display.
+ *
+ * Design challenges with missing or explicit unlimited metadata keep every submission visible;
+ * a positive configured count selects that many. Flag conflicts, invalid counts, malformed Design
+ * data, and all non-Design challenges retain the existing latest-one behavior. Explicit unlimited
+ * flags take precedence over stale counts. These rules mirror the backend selection policy so the
+ * UI displays the same submission set for which scorecards were created.
+ *
+ * @param challengeInfo - Challenge track and submission-limit metadata.
+ * @returns A positive latest-submission count, or `undefined` when every submission is visible.
+ * @throws Does not throw; malformed limited Design metadata falls back to one.
+ */
+export function getChallengeSubmissionSelectionLimit(
+    challengeInfo?: Pick<ChallengeInfo, 'metadata' | 'track'>,
+): number | undefined {
+    const trackCandidates = [
+        challengeInfo?.track?.name,
+        challengeInfo?.track?.abbreviation,
+        challengeInfo?.track?.track,
+    ]
+    const isDesignChallenge = trackCandidates.some(candidate => (
+        normalizeChallengeKey(candidate) === 'design'
+    ))
+    if (!isDesignChallenge) {
+        return 1
+    }
+
+    const rawValue = findSubmissionLimitMetadata(challengeInfo?.metadata)
+    if (rawValue === undefined || rawValue === null) {
+        return undefined
+    }
+
+    const normalized = normalizeLimitMetadataValue(rawValue)
+    const primitiveLimit = parsePositiveSubmissionLimit(normalized)
+    if (primitiveLimit !== undefined) {
+        return primitiveLimit
+    }
+
+    if (typeof normalized === 'number' && normalized === 0) {
+        return undefined
+    }
+
+    if (typeof normalized === 'boolean') {
+        return normalized ? 1 : undefined
+    }
+
+    if (typeof normalized === 'string') {
+        return UNLIMITED_KEYWORDS.includes(normalized.trim()
+            .toLowerCase())
+            ? undefined
+            : 1
+    }
+
+    if (normalized && typeof normalized === 'object' && !Array.isArray(normalized)) {
+        const candidate = normalized as Record<string, unknown>
+        const unlimitedFlag = parseSubmissionLimitFlag(candidate.unlimited)
+        const limitFlag = parseSubmissionLimitFlag(candidate.limit)
+        const countValue = SUBMISSION_LIMIT_COUNT_FIELDS
+            .map(fieldName => candidate[fieldName])
+            .find(value => value !== undefined && value !== null && value !== '')
+        const count = parsePositiveSubmissionLimit(countValue)
+        const flagsConflict = unlimitedFlag !== undefined
+            && limitFlag !== undefined
+            && unlimitedFlag === limitFlag
+
+        if (flagsConflict) {
+            return 1
+        }
+
+        if (unlimitedFlag === true || limitFlag === false) {
+            return undefined
+        }
+
+        return count ?? 1
+    }
+
+    return 1
+}
+
 export type PhaseLike = Pick<
     BackendPhase,
     | 'id'
diff --git a/src/apps/review/src/lib/utils/screeningRows.spec.ts b/src/apps/review/src/lib/utils/screeningRows.spec.ts
index 101982820..1ac1f3c22 100644
--- a/src/apps/review/src/lib/utils/screeningRows.spec.ts
+++ b/src/apps/review/src/lib/utils/screeningRows.spec.ts
@@ -1,47 +1,21 @@
-import type { Screening, SubmissionInfo } from '../models'
+import type { Screening } from '../models'
 
 import { selectVisibleScreeningRows } from './screeningRows'
 
 const screeningRows = [
-    { submissionId: 'member-one-old' },
+    { submissionId: 'member-one-oldest' },
+    { submissionId: 'member-one-middle' },
     { submissionId: 'member-one-latest' },
-    { submissionId: 'member-two-old' },
+    { submissionId: 'member-two-oldest' },
+    { submissionId: 'member-two-middle' },
     { submissionId: 'member-two-latest' },
 ] as Screening[]
 
-const latestSubmissionIds = new Set([
-    'member-one-latest',
-    'member-two-latest',
-])
-
 describe('selectVisibleScreeningRows', () => {
-    it('retains every row for an unlimited challenge without latest flags', () => {
-        const result = selectVisibleScreeningRows({
-            hasSubmissionLimit: false,
-            latestSubmissionIds,
-            screeningRows,
-            submissionInfos: [{}, {}, {}, {}],
-        })
-
-        expect(result.isRestrictedToLatest)
-            .toBe(false)
-        expect(result.rows)
-            .toBe(screeningRows)
-    })
-
-    it('retains every row for an unlimited challenge with stale latest flags', () => {
-        const submissionInfos: Array<Pick<SubmissionInfo, 'isLatest'>> = [
-            { isLatest: false },
-            { isLatest: true },
-            { isLatest: false },
-            { isLatest: true },
-        ]
-
+    it('retains every row for an unlimited challenge', () => {
         const result = selectVisibleScreeningRows({
-            hasSubmissionLimit: false,
-            latestSubmissionIds,
+            latestSubmissionIds: new Set(),
             screeningRows,
-            submissionInfos,
         })
 
         expect(result.isRestrictedToLatest)
@@ -50,41 +24,45 @@ describe('selectVisibleScreeningRows', () => {
             .toBe(screeningRows)
     })
 
-    it('retains every row for a limited challenge without explicit latest flags', () => {
+    it('retains the latest two selected rows per member for a finite count of two', () => {
         const result = selectVisibleScreeningRows({
-            hasSubmissionLimit: true,
-            latestSubmissionIds,
+            latestSubmissionIds: new Set([
+                'member-one-middle',
+                'member-one-latest',
+                'member-two-middle',
+                'member-two-latest',
+            ]),
             screeningRows,
-            submissionInfos: [{}, {}, {}, {}],
+            submissionLimit: 2,
         })
 
         expect(result.isRestrictedToLatest)
-            .toBe(false)
+            .toBe(true)
         expect(result.rows)
-            .toBe(screeningRows)
+            .toEqual([
+                screeningRows[1],
+                screeningRows[2],
+                screeningRows[4],
+                screeningRows[5],
+            ])
     })
 
-    it('retains only explicit latest submissions for a limited challenge', () => {
-        const submissionInfos: Array<Pick<SubmissionInfo, 'isLatest'>> = [
-            { isLatest: false },
-            { isLatest: true },
-            { isLatest: false },
-            { isLatest: true },
-        ]
-
+    it('retains only the selected latest row for a finite count of one', () => {
         const result = selectVisibleScreeningRows({
-            hasSubmissionLimit: true,
-            latestSubmissionIds,
+            latestSubmissionIds: new Set([
+                'member-one-latest',
+                'member-two-latest',
+            ]),
             screeningRows,
-            submissionInfos,
+            submissionLimit: 1,
         })
 
         expect(result.isRestrictedToLatest)
             .toBe(true)
         expect(result.rows)
             .toEqual([
-                screeningRows[1],
-                screeningRows[3],
+                screeningRows[2],
+                screeningRows[5],
             ])
     })
 })
diff --git a/src/apps/review/src/lib/utils/screeningRows.ts b/src/apps/review/src/lib/utils/screeningRows.ts
index c47e6a49d..74696073f 100644
--- a/src/apps/review/src/lib/utils/screeningRows.ts
+++ b/src/apps/review/src/lib/utils/screeningRows.ts
@@ -1,6 +1,4 @@
-import type { Screening, SubmissionInfo } from '../models'
-
-import { hasIsLatestFlag } from './submissionHistory'
+import type { Screening } from '../models'
 
 export interface ScreeningRowsSelection {
     isRestrictedToLatest: boolean
@@ -8,36 +6,31 @@ export interface ScreeningRowsSelection {
 }
 
 export interface SelectVisibleScreeningRowsOptions {
-    hasSubmissionLimit: boolean
     latestSubmissionIds: ReadonlySet<string>
     screeningRows: Screening[]
-    submissionInfos: Array<Pick<SubmissionInfo, 'isLatest'>>
+    submissionLimit?: number
 }
 
 /**
  * Select the Screening rows that should be displayed for a challenge.
  *
  * The Screening table uses this selection for both desktop and mobile views.
- * Limited challenges collapse submission history only when the API supplies
- * explicit `isLatest` flags. Unlimited challenges, or responses without those
- * flags, retain every Screening row. This function performs no I/O and does
- * not throw.
+ * Finite challenges retain the latest configured number of submission IDs selected
+ * independently per member and exact submission type. Unlimited challenges retain
+ * every Screening row. This function performs no I/O and does not throw.
  *
  * @param options visibility inputs for the challenge and its submissions
- * @param options.hasSubmissionLimit whether the challenge limits submissions
  * @param options.latestSubmissionIds latest submission ids calculated per member
  * @param options.screeningRows Screening rows available for display
- * @param options.submissionInfos submission metadata containing optional latest flags
+ * @param options.submissionLimit finite latest-submission count, or undefined for all
  * @returns the visible rows and whether submission history was collapsed
  */
 export function selectVisibleScreeningRows({
-    hasSubmissionLimit,
     latestSubmissionIds,
     screeningRows,
-    submissionInfos,
+    submissionLimit,
 }: SelectVisibleScreeningRowsOptions): ScreeningRowsSelection {
-    const isRestrictedToLatest = hasSubmissionLimit
-        && hasIsLatestFlag(submissionInfos)
+    const isRestrictedToLatest = submissionLimit !== undefined
 
     return {
         isRestrictedToLatest,
diff --git a/src/apps/review/src/lib/utils/submissionHistory.spec.ts b/src/apps/review/src/lib/utils/submissionHistory.spec.ts
new file mode 100644
index 000000000..6ba74773c
--- /dev/null
+++ b/src/apps/review/src/lib/utils/submissionHistory.spec.ts
@@ -0,0 +1,119 @@
+import type { SubmissionInfo } from '../models'
+
+import {
+    getSubmissionHistoryKey,
+    partitionSubmissionHistory,
+} from './submissionHistory'
+
+/**
+ * Build submission metadata for history-ranking tests.
+ *
+ * @param id - Submission identifier.
+ * @param type - Exact submission type.
+ * @param submittedDate - ISO submission timestamp.
+ * @returns A submission owned by the shared test member.
+ */
+function createSubmission(
+    id: string,
+    type: string,
+    submittedDate: string,
+): SubmissionInfo {
+    return {
+        id,
+        memberId: 'member-one',
+        submittedDate,
+        type,
+    }
+}
+
+const submissions: SubmissionInfo[] = [
+    createSubmission('contest-oldest', 'CONTEST_SUBMISSION', '2026-08-10T10:00:00Z'),
+    createSubmission('contest-middle', 'CONTEST_SUBMISSION', '2026-08-10T11:00:00Z'),
+    createSubmission('contest-newest', 'CONTEST_SUBMISSION', '2026-08-10T12:00:00Z'),
+    createSubmission('checkpoint-oldest', 'CHECKPOINT_SUBMISSION', '2026-08-09T10:00:00Z'),
+    createSubmission('checkpoint-newest', 'CHECKPOINT_SUBMISSION', '2026-08-09T11:00:00Z'),
+]
+
+describe('partitionSubmissionHistory', () => {
+    it('retains the latest two submissions independently for each exact type', () => {
+        const result = partitionSubmissionHistory(submissions, submissions, {
+            visibleSubmissionCount: 2,
+        })
+
+        expect(result.latestSubmissionIds)
+            .toEqual(new Set([
+                'contest-newest',
+                'contest-middle',
+                'checkpoint-newest',
+                'checkpoint-oldest',
+            ]))
+        expect(result.historyByMember.get(getSubmissionHistoryKey(
+            'member-one',
+            'contest-newest',
+            'CONTEST_SUBMISSION',
+        )))
+            .toEqual([submissions[0]])
+        expect(result.historyByMember.has(getSubmissionHistoryKey(
+            'member-one',
+            'checkpoint-newest',
+            'CHECKPOINT_SUBMISSION',
+        )))
+            .toBe(false)
+    })
+
+    it('defaults finite selection to the latest one per member and type', () => {
+        const result = partitionSubmissionHistory(submissions, submissions)
+
+        expect(result.latestSubmissionIds)
+            .toEqual(new Set([
+                'contest-newest',
+                'checkpoint-newest',
+            ]))
+        expect(result.historyByMember.get(getSubmissionHistoryKey(
+            'member-one',
+            'contest-newest',
+            'CONTEST_SUBMISSION',
+        )))
+            .toEqual([
+                submissions[1],
+                submissions[0],
+            ])
+        expect(result.historyByMember.get(getSubmissionHistoryKey(
+            'member-one',
+            'checkpoint-newest',
+            'CHECKPOINT_SUBMISSION',
+        )))
+            .toEqual([submissions[3]])
+    })
+
+    it('ranks complete history before retaining only eligible primary rows', () => {
+        const eligibleOlderSubmission = submissions[1]
+        const completeHistory = [
+            eligibleOlderSubmission,
+            submissions[2],
+        ]
+
+        const latestOne = partitionSubmissionHistory(
+            [eligibleOlderSubmission],
+            completeHistory,
+            { visibleSubmissionCount: 1 },
+        )
+        expect(latestOne.latestSubmissionIds)
+            .toEqual(new Set(['contest-newest']))
+        expect(latestOne.latestSubmissions)
+            .toEqual([])
+
+        const latestTwo = partitionSubmissionHistory(
+            [eligibleOlderSubmission],
+            completeHistory,
+            { visibleSubmissionCount: 2 },
+        )
+        expect(latestTwo.latestSubmissionIds)
+            .toEqual(new Set([
+                'contest-newest',
+                'contest-middle',
+            ]))
+        expect(latestTwo.latestSubmissions)
+            .toEqual([eligibleOlderSubmission])
+    })
+})
diff --git a/src/apps/review/src/lib/utils/submissionHistory.ts b/src/apps/review/src/lib/utils/submissionHistory.ts
index a82f29ce7..60ec3fbe9 100644
--- a/src/apps/review/src/lib/utils/submissionHistory.ts
+++ b/src/apps/review/src/lib/utils/submissionHistory.ts
@@ -1,26 +1,74 @@
 import { SubmissionInfo } from '../models'
 
 export interface SubmissionHistoryPartition {
-    latestSubmissions: SubmissionInfo[]
-    latestSubmissionIds: Set<string>
+    /** Older submissions grouped by member and exact normalized submission type. */
     historyByMember: Map<string, SubmissionInfo[]>
+    /** IDs of the latest configured number of submissions in every member/type group. */
+    latestSubmissionIds: Set<string>
+    /** Primary submission rows associated with the latest configured IDs. */
+    latestSubmissions: SubmissionInfo[]
+}
+
+export interface PartitionSubmissionHistoryOptions {
+    /** Positive number of submissions retained in each member/type group. Defaults to one. */
+    visibleSubmissionCount?: number
+}
+
+/**
+ * Normalize the submission type used to isolate contest and checkpoint history.
+ *
+ * @param submissionType - Submission type returned by the API.
+ * @returns A stable normalized type key, including a fallback for missing types.
+ * @throws Does not throw.
+ */
+function normalizeSubmissionHistoryType(submissionType?: string): string {
+    const normalizedType = (submissionType ?? '')
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]/g, '')
+
+    return normalizedType || '__unknown_type__'
 }
 
+/**
+ * Build the lookup key used for one member's history of an exact submission type.
+ *
+ * @param memberId - Submission owner ID, when available.
+ * @param submissionId - Submission ID used to isolate rows with no owner.
+ * @param submissionType - Exact submission type, normalized for legacy spelling variants.
+ * @returns A stable member/type history key.
+ * @throws Does not throw.
+ */
 export function getSubmissionHistoryKey(
     memberId: string | undefined,
     submissionId: string,
+    submissionType?: string,
 ): string {
-    if (memberId && memberId.length) {
-        return memberId
-    }
+    const memberKey = memberId && memberId.length
+        ? memberId
+        : `__unknown__::${submissionId}`
 
-    return `__unknown__::${submissionId}`
+    return `${memberKey}::${normalizeSubmissionHistoryType(submissionType)}`
 }
 
+/**
+ * Check whether any submission includes the API's explicit latest flag.
+ *
+ * @param submissions - Submission-like objects to inspect.
+ * @returns True when at least one object includes an `isLatest` value.
+ * @throws Does not throw.
+ */
 export function hasIsLatestFlag<T extends { isLatest?: boolean }>(submissions: T[]): boolean {
     return submissions.some(submission => submission.isLatest !== undefined)
 }
 
+/**
+ * Resolve a submission timestamp for newest-first ordering.
+ *
+ * @param submission - Submission metadata containing raw or formatted dates.
+ * @returns Milliseconds since epoch, or zero when neither date is valid.
+ * @throws Does not throw; invalid dates fall back to zero.
+ */
 function getSubmissionTimestamp(submission: SubmissionInfo): number {
     const candidates: Array<Date | undefined> = []
 
@@ -44,9 +92,40 @@ function getSubmissionTimestamp(submission: SubmissionInfo): number {
     return 0
 }
 
+/**
+ * Normalize the requested number of visible submissions per member/type group.
+ *
+ * @param visibleSubmissionCount - Raw configured visible count.
+ * @returns A positive whole-number count, defaulting to one.
+ * @throws Does not throw.
+ */
+function normalizeVisibleSubmissionCount(visibleSubmissionCount?: number): number {
+    if (!Number.isFinite(visibleSubmissionCount) || Number(visibleSubmissionCount) <= 0) {
+        return 1
+    }
+
+    return Math.max(1, Math.floor(Number(visibleSubmissionCount)))
+}
+
+/**
+ * Partition submissions into the latest configured rows and older history.
+ *
+ * Submissions are ranked independently for every member and normalized submission type. Explicit
+ * `isLatest` rows remain first for backward compatibility, followed by submission timestamp. A
+ * duplicated submission ID from the primary and complete-history inputs consumes only one slot.
+ * Only primary rows are returned for display, so ranking cannot reintroduce an ineligible history
+ * entry or promote an older eligible submission into a newer entry's configured slot.
+ *
+ * @param submissions - Primary table submissions.
+ * @param allSubmissions - Optional complete submission history used for ranking and history actions.
+ * @param options - Partition options, including the visible count per member/type group.
+ * @returns Latest submission rows and IDs plus older history grouped by member/type.
+ * @throws Does not throw; invalid visible counts default to one.
+ */
 export function partitionSubmissionHistory(
     submissions: SubmissionInfo[],
     allSubmissions?: SubmissionInfo[],
+    options: PartitionSubmissionHistoryOptions = {},
 ): SubmissionHistoryPartition {
     const byMember = new Map<string, SubmissionInfo[]>()
     const addEntry = (submission: SubmissionInfo | undefined): void => {
@@ -57,6 +136,7 @@ export function partitionSubmissionHistory(
         const memberKey = getSubmissionHistoryKey(
             submission.memberId,
             submission.id,
+            submission.type,
         )
         const list = byMember.get(memberKey)
         if (list) {
@@ -75,56 +155,46 @@ export function partitionSubmissionHistory(
     const latestSubmissions: SubmissionInfo[] = []
     const latestSubmissionIds = new Set<string>()
     const historyByMember = new Map<string, SubmissionInfo[]>()
-    const primaryIds = new Set(primarySubmissions.map(entry => entry.id))
+    const visibleSubmissionCount = normalizeVisibleSubmissionCount(
+        options.visibleSubmissionCount,
+    )
 
     byMember.forEach((entries, memberKey) => {
         const sorted = entries
             .slice()
-            .sort((a, b) => getSubmissionTimestamp(b) - getSubmissionTimestamp(a))
+            .sort((a, b) => {
+                const latestDifference = Number(Boolean(b.isLatest)) - Number(Boolean(a.isLatest))
+                if (latestDifference !== 0) {
+                    return latestDifference
+                }
 
-        const flaggedLatest = sorted.filter(entry => entry.isLatest)
-        const latestEntry = flaggedLatest.length > 0 ? flaggedLatest[0] : sorted[0]
+                return getSubmissionTimestamp(b) - getSubmissionTimestamp(a)
+            })
+        const seenSubmissionIds = new Set<string>()
+        const uniqueSorted = sorted.filter(entry => {
+            if (!entry.id || seenSubmissionIds.has(entry.id)) {
+                return false
+            }
+
+            seenSubmissionIds.add(entry.id)
+            return true
+        })
+        const visibleEntries = uniqueSorted.slice(0, visibleSubmissionCount)
+        const visibleIdsForGroup = new Set(visibleEntries.map(entry => entry.id))
 
-        if (latestEntry?.id) {
-            const latestId = latestEntry.id
+        visibleEntries.forEach(visibleEntry => {
+            const latestId = visibleEntry.id
             const matchingPrimary = primarySubmissions.filter(entry => entry.id === latestId)
-            if (matchingPrimary.length > 0) {
-                matchingPrimary.forEach(entry => {
-                    latestSubmissions.push(entry)
-                })
-            } else {
-                latestSubmissions.push(latestEntry)
-            }
+            matchingPrimary.forEach(entry => {
+                latestSubmissions.push(entry)
+            })
 
             latestSubmissionIds.add(latestId)
-        } else if (latestEntry) {
-            latestSubmissions.push(latestEntry)
-        }
+        })
 
-        const historyEntries = sorted.filter(entry => entry.id !== latestEntry?.id)
+        const historyEntries = uniqueSorted.filter(entry => !visibleIdsForGroup.has(entry.id))
         if (historyEntries.length > 0) {
-            const seenIds = new Set<string>()
-            const uniqueHistory = historyEntries.filter(entry => {
-                const key = entry.id
-                if (!key) {
-                    return false
-                }
-
-                if (primaryIds.has(key) && latestSubmissionIds.has(key)) {
-                    return false
-                }
-
-                if (seenIds.has(key)) {
-                    return false
-                }
-
-                seenIds.add(key)
-                return true
-            })
-
-            if (uniqueHistory.length > 0) {
-                historyByMember.set(memberKey, uniqueHistory)
-            }
+            historyByMember.set(memberKey, historyEntries)
         }
     })
 
diff --git a/src/apps/support/README.md b/src/apps/support/README.md
index be3c0eff0..ead5236ab 100644
--- a/src/apps/support/README.md
+++ b/src/apps/support/README.md
@@ -3,7 +3,8 @@
 The Support subapp lets authenticated Topcoder members open requests, follow
 their status, and reply to the Topcoder Support Team. Users with the exact
 `Topcoder Support Team` role can see all tickets, assign themselves, search
-closed tickets, reply, and close resolved requests.
+closed tickets, and reply to or close resolved requests assigned to them.
+Closed ticket details identify the Support Team user who closed the request.
 
 ## Routes
 
diff --git a/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.module.scss b/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.module.scss
index 739979694..f1de3bce5 100644
--- a/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.module.scss
+++ b/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.module.scss
@@ -1,7 +1,60 @@
+@import '@libs/ui/styles/includes';
+
 .markdown {
     line-height: 1.55;
     overflow-wrap: anywhere;
 
+    a,
+    a:hover {
+        color: $link-blue-dark;
+        text-decoration: underline;
+    }
+
+    strong {
+        font-weight: $font-weight-bold;
+    }
+
+    em {
+        font-style: italic;
+    }
+
+    h1,
+    h2,
+    h3 {
+        font-weight: $font-weight-bold;
+        margin: $sp-4 0 $sp-2;
+    }
+
+    h1 {
+        font-size: 24px;
+        line-height: 28px;
+    }
+
+    h2 {
+        font-size: 20px;
+        line-height: 24px;
+    }
+
+    h3 {
+        font-size: 18px;
+        line-height: 22px;
+    }
+
+    ol,
+    ul {
+        list-style-position: outside;
+        margin: $sp-3 0;
+        padding-left: $sp-6;
+    }
+
+    ol {
+        list-style-type: decimal;
+    }
+
+    ul {
+        list-style-type: disc;
+    }
+
     > :first-child {
         margin-top: 0;
     }
diff --git a/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.spec.tsx b/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.spec.tsx
new file mode 100644
index 000000000..79f398813
--- /dev/null
+++ b/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.spec.tsx
@@ -0,0 +1,117 @@
+/* eslint-disable import/no-extraneous-dependencies, ordered-imports/ordered-imports */
+import '@testing-library/jest-dom'
+import type { ElementType } from 'react'
+import { readFileSync } from 'fs'
+import { render, screen } from '@testing-library/react'
+import remarkBreaks from 'remark-breaks'
+import remarkGfm from 'remark-gfm'
+
+import { MarkdownContent } from './MarkdownContent'
+
+interface MarkdownRendererProps {
+    children: string
+    components: {
+        a: ElementType
+    }
+    remarkPlugins: unknown[]
+    skipHtml: boolean
+}
+
+const mockReactMarkdown = jest.fn()
+
+jest.mock('react-markdown', () => ({
+    __esModule: true,
+    default: (props: MarkdownRendererProps): JSX.Element => {
+        mockReactMarkdown(props)
+        return <div data-testid='markdown-source'>{props.children}</div>
+    },
+}))
+
+jest.mock('remark-breaks', () => ({
+    __esModule: true,
+    default: jest.fn(),
+}))
+
+jest.mock('remark-gfm', () => ({
+    __esModule: true,
+    default: jest.fn(),
+}))
+
+const markdownStyles = readFileSync(`${__dirname}/MarkdownContent.module.scss`, 'utf8')
+const ticketDetailStyles = readFileSync(
+    `${__dirname}/../../../pages/ticket-details/TicketDetailPage.module.scss`,
+    'utf8',
+)
+
+describe('MarkdownContent', () => {
+    beforeEach(() => {
+        jest.clearAllMocks()
+    })
+
+    it('passes rich formatting and uploaded-file Markdown to the safe GFM renderer', () => {
+        const markdown = [
+            '# Request heading',
+            '**Bold text** and *italic text*',
+            '[sample.zip](https://example.test/sample.zip)',
+            '- First item',
+            '1. First step',
+        ].join('\n\n')
+
+        render(<MarkdownContent markdown={markdown} />)
+
+        expect(screen.getByTestId('markdown-source').textContent)
+            .toBe(markdown)
+        expect(mockReactMarkdown)
+            .toHaveBeenCalledWith(expect.objectContaining({
+                children: markdown,
+                remarkPlugins: [remarkGfm, remarkBreaks],
+                skipHtml: true,
+            }))
+    })
+
+    it('opens GFM links in a safe new tab', () => {
+        const markdown = 'https://www.topcoder-dev.com/challenges'
+
+        render(<MarkdownContent markdown={markdown} />)
+        const markdownProps = mockReactMarkdown.mock.calls[0][0] as MarkdownRendererProps
+        const MarkdownLink = markdownProps.components.a
+
+        render(
+            <MarkdownLink href={markdown}>
+                {markdown}
+            </MarkdownLink>,
+        )
+        const link = screen.getByRole('link', { name: markdown })
+
+        expect(link)
+            .toHaveAttribute('href', markdown)
+        expect(link)
+            .toHaveAttribute('target', '_blank')
+        expect(link)
+            .toHaveAttribute('rel', 'noopener noreferrer')
+    })
+
+    it('keeps Markdown formatting visible after the platform style reset', () => {
+        expect(markdownStyles)
+            .toMatch(/a,[\s\S]*a:hover \{[\s\S]*color: \$link-blue-dark;[\s\S]*text-decoration: underline;/)
+        expect(markdownStyles)
+            .toMatch(/strong \{[\s\S]*font-weight: \$font-weight-bold;/)
+        expect(markdownStyles)
+            .toMatch(/em \{[\s\S]*font-style: italic;/)
+        expect(markdownStyles)
+            .toMatch(/h1,[\s\S]*h2,[\s\S]*h3 \{[\s\S]*font-weight: \$font-weight-bold;/)
+        expect(markdownStyles)
+            .toMatch(/ol \{[\s\S]*list-style-type: decimal;/)
+        expect(markdownStyles)
+            .toMatch(/ul \{[\s\S]*list-style-type: disc;/)
+    })
+
+    it('limits conversation timeline styling to top-level messages', () => {
+        expect(ticketDetailStyles)
+            .toMatch(/\.timeline \{[\s\S]*> li \{/)
+        expect(ticketDetailStyles)
+            .toMatch(/\.timeline > li \{/)
+        expect(ticketDetailStyles)
+            .not.toMatch(/\.timeline li \{/)
+    })
+})
diff --git a/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.tsx b/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.tsx
index 8a0d1fb31..ce0c367d7 100644
--- a/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.tsx
+++ b/src/apps/support/src/lib/components/MarkdownContent/MarkdownContent.tsx
@@ -1,6 +1,6 @@
 /** Safe Markdown renderer for user-authored support content. */
-import { FC } from 'react'
-import ReactMarkdown from 'react-markdown'
+import type { FC } from 'react'
+import ReactMarkdown, { type Components } from 'react-markdown'
 import remarkBreaks from 'remark-breaks'
 import remarkGfm from 'remark-gfm'
 
@@ -10,8 +10,28 @@ export interface MarkdownContentProps {
     markdown: string
 }
 
+const markdownComponents: Components = {
+    /**
+     * Renders a Markdown link in a new tab without exposing the opener page.
+     *
+     * @param props anchor attributes and AST metadata produced by ReactMarkdown.
+     * @returns a safely targeted anchor used for links in support conversations.
+     * @throws Does not throw.
+     */
+    a: props => (
+        <a
+            href={props.href}
+            rel='noopener noreferrer'
+            target='_blank'
+            title={props.title}
+        >
+            {props.children}
+        </a>
+    ),
+}
+
 /**
- * Renders GFM and line breaks while dropping raw HTML.
+ * Renders GFM and line breaks with links opening in new tabs while dropping raw HTML.
  *
  * @param props untrusted Markdown source.
  * @returns safely rendered Markdown.
@@ -20,6 +40,7 @@ export interface MarkdownContentProps {
 export const MarkdownContent: FC<MarkdownContentProps> = props => (
     <div className={styles.markdown}>
         <ReactMarkdown
+            components={markdownComponents}
             remarkPlugins={[remarkGfm, remarkBreaks]}
             skipHtml
         >
diff --git a/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.spec.tsx b/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.spec.tsx
index cf72bf26a..1829612bf 100644
--- a/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.spec.tsx
+++ b/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.spec.tsx
@@ -144,7 +144,7 @@ describe('OpenSupportRequestModal', () => {
         expect(screen.getByRole('dialog')
             .getAttribute('data-size'))
             .toBe('body')
-        const challengeSelect = screen.getByLabelText('Challenge (if applicable)') as HTMLSelectElement
+        const challengeSelect = screen.getByLabelText('Active Challenge (if applicable)') as HTMLSelectElement
         expect(challengeSelect.options[0].text)
             .toBe('Select challenge')
         expect(mockUseSWR.mock.calls[0][0])
@@ -155,7 +155,7 @@ describe('OpenSupportRequestModal', () => {
         expect(mockedGetActiveChallenges)
             .toHaveBeenCalledWith('12345')
 
-        fireEvent.change(screen.getByLabelText('Challenge (if applicable)'), {
+        fireEvent.change(screen.getByLabelText('Active Challenge (if applicable)'), {
             target: { value: 'challenge-2' },
         })
         fireEvent.change(screen.getByLabelText('Description'), {
@@ -209,7 +209,7 @@ describe('OpenSupportRequestModal', () => {
             />,
         )
 
-        fireEvent.change(screen.getByLabelText('Challenge (if applicable)'), {
+        fireEvent.change(screen.getByLabelText('Active Challenge (if applicable)'), {
             target: { value: 'challenge-2' },
         })
         mockUseSWR.mockReturnValue({
diff --git a/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.tsx b/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.tsx
index d3ca825f9..a24197bc3 100644
--- a/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.tsx
+++ b/src/apps/support/src/lib/components/OpenSupportRequestModal/OpenSupportRequestModal.tsx
@@ -192,7 +192,7 @@ export const OpenSupportRequestModal: FC<OpenSupportRequestModalProps> = props =
         >
             <div className={styles.form}>
                 <div className={styles.challengeField}>
-                    <label htmlFor='support-challenge-id'>Challenge (if applicable)</label>
+                    <label htmlFor='support-challenge-id'>Active Challenge (if applicable)</label>
                     <Select<ChallengeOption, false>
                         aria-describedby={challengeError ? 'support-challenge-error' : undefined}
                         className={styles.challengeSelect}
diff --git a/src/apps/support/src/lib/components/TicketsTable/TicketsTable.spec.tsx b/src/apps/support/src/lib/components/TicketsTable/TicketsTable.spec.tsx
index 9eb25e932..a2bd12fc9 100644
--- a/src/apps/support/src/lib/components/TicketsTable/TicketsTable.spec.tsx
+++ b/src/apps/support/src/lib/components/TicketsTable/TicketsTable.spec.tsx
@@ -1,4 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies, ordered-imports/ordered-imports */
+import '@testing-library/jest-dom'
 import {
     fireEvent,
     render,
@@ -110,3 +111,66 @@ describe('TicketsTable challenge links', () => {
             .toBeNull()
     })
 })
+
+describe('TicketsTable unread indicators', () => {
+    const unreadTicket: SupportTicketSummary = {
+        ...baseTicket,
+        assignees: [{
+            assignedAt: '2026-08-07T00:00:00.000Z',
+            handle: 'support-member',
+            userId: 'staff-1',
+        }],
+        hasUnread: true,
+        status: 'CLOSED',
+    }
+
+    it('shows unread indicators to the assigned support team member', () => {
+        render(
+            <TicketsTable
+                currentUserId='staff-1'
+                isSupportTeam
+                onAssign={jest.fn()}
+                onOpen={jest.fn()}
+                tickets={[unreadTicket]}
+            />,
+        )
+
+        expect(screen.getAllByText('Unread'))
+            .toHaveLength(2)
+        expect(screen.getByLabelText('Unread ticket: Unable to submit'))
+            .toHaveClass('unread')
+    })
+
+    it('hides unread indicators from support team members who are not assigned', () => {
+        render(
+            <TicketsTable
+                currentUserId='staff-2'
+                isSupportTeam
+                onAssign={jest.fn()}
+                onOpen={jest.fn()}
+                tickets={[unreadTicket]}
+            />,
+        )
+
+        expect(screen.queryByText('Unread'))
+            .toBeNull()
+        expect(screen.getByLabelText('Read ticket: Unable to submit'))
+            .not.toHaveClass('unread')
+    })
+
+    it('preserves unread indicators for an ordinary member', () => {
+        render(
+            <TicketsTable
+                isSupportTeam={false}
+                onAssign={jest.fn()}
+                onOpen={jest.fn()}
+                tickets={[{ ...unreadTicket, assignees: [] }]}
+            />,
+        )
+
+        expect(screen.getAllByText('Unread'))
+            .toHaveLength(2)
+        expect(screen.getByLabelText('Unread ticket: Unable to submit'))
+            .toHaveClass('unread')
+    })
+})
diff --git a/src/apps/support/src/lib/components/TicketsTable/TicketsTable.tsx b/src/apps/support/src/lib/components/TicketsTable/TicketsTable.tsx
index e3434b70c..d04d57ca6 100644
--- a/src/apps/support/src/lib/components/TicketsTable/TicketsTable.tsx
+++ b/src/apps/support/src/lib/components/TicketsTable/TicketsTable.tsx
@@ -70,11 +70,11 @@ const Assignees = ({ ticket }: { ticket: SupportTicketSummary }): JSX.Element =>
 /**
  * Renders an accessible unread indicator that does not rely on color.
  *
- * @param ticket ticket summary.
+ * @param unread whether the ticket should appear unread to the current viewer.
  * @returns unread badge when required.
  * @throws Does not throw.
  */
-const UnreadBadge = ({ ticket }: { ticket: SupportTicketSummary }): JSX.Element => (ticket.hasUnread
+const UnreadBadge = ({ unread }: { unread: boolean }): JSX.Element => (unread
     ? (
         <span className={styles.unreadBadge}>
             <span aria-hidden='true'>●</span>
@@ -189,17 +189,18 @@ export const TicketsTable: FC<TicketsTableProps> = props => {
                     <tbody>
                         {props.tickets.map(ticket => {
                             const assigned = isTicketAssignedToUser(ticket, props.currentUserId)
+                            const unread = ticket.hasUnread && (!props.isSupportTeam || assigned)
                             return (
                                 <tr
-                                    aria-label={`${ticket.hasUnread ? 'Unread' : 'Read'} ticket: ${preview(ticket)}`}
-                                    className={classNames(ticket.hasUnread && styles.unread)}
+                                    aria-label={`${unread ? 'Unread' : 'Read'} ticket: ${preview(ticket)}`}
+                                    className={classNames(unread && styles.unread)}
                                     key={ticket.id}
                                     onClick={() => props.onOpen(ticket)}
                                     onKeyDown={event => handleKeyDown(event, ticket)}
                                     tabIndex={0}
                                 >
                                     <td>
-                                        <UnreadBadge ticket={ticket} />
+                                        <UnreadBadge unread={unread} />
                                         <span>{preview(ticket)}</span>
                                     </td>
                                     {props.isSupportTeam && (
@@ -236,12 +237,13 @@ export const TicketsTable: FC<TicketsTableProps> = props => {
             <div className={styles.mobile}>
                 {props.tickets.map(ticket => {
                     const assigned = isTicketAssignedToUser(ticket, props.currentUserId)
+                    const unread = ticket.hasUnread && (!props.isSupportTeam || assigned)
                     return (
                         <article
-                            className={classNames(styles.card, ticket.hasUnread && styles.unread)}
+                            className={classNames(styles.card, unread && styles.unread)}
                             key={ticket.id}
                         >
-                            <UnreadBadge ticket={ticket} />
+                            <UnreadBadge unread={unread} />
                             <h2>{preview(ticket)}</h2>
                             {props.isSupportTeam && (
                                 <p>
diff --git a/src/apps/support/src/lib/models/support.models.ts b/src/apps/support/src/lib/models/support.models.ts
index 5c346295f..f0c94d64f 100644
--- a/src/apps/support/src/lib/models/support.models.ts
+++ b/src/apps/support/src/lib/models/support.models.ts
@@ -33,6 +33,7 @@ export interface SupportTicketSummary {
     status: SupportTicketStatus
     openedAt: string
     closedAt?: string
+    closedByUserId?: string
     updatedAt: string
     latestActivityAt: string
     responseCount: number
diff --git a/src/apps/support/src/pages/ticket-details/TicketDetailPage.module.scss b/src/apps/support/src/pages/ticket-details/TicketDetailPage.module.scss
index 12558e005..415500b69 100644
--- a/src/apps/support/src/pages/ticket-details/TicketDetailPage.module.scss
+++ b/src/apps/support/src/pages/ticket-details/TicketDetailPage.module.scss
@@ -12,9 +12,11 @@
     text-decoration: none;
 }
 
-.challengeLink {
-    color: var(--Actived);
+.challengeLink,
+.challengeLink:hover {
+    color: $link-blue-dark;
     font-weight: 700;
+    text-decoration: underline;
 }
 
 .header {
@@ -107,7 +109,7 @@
     margin: 0;
     padding: 0;
 
-    li {
+    > li {
         border-left: 3px solid #9acfd3;
         padding: 0 0 $sp-5 $sp-5;
         position: relative;
@@ -182,7 +184,7 @@
         flex-direction: column;
     }
 
-    .timeline li {
+    .timeline > li {
         padding-left: $sp-4;
     }
 
diff --git a/src/apps/support/src/pages/ticket-details/TicketDetailPage.spec.tsx b/src/apps/support/src/pages/ticket-details/TicketDetailPage.spec.tsx
index 73d305864..03a275c91 100644
--- a/src/apps/support/src/pages/ticket-details/TicketDetailPage.spec.tsx
+++ b/src/apps/support/src/pages/ticket-details/TicketDetailPage.spec.tsx
@@ -1,4 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies, ordered-imports/ordered-imports, react/jsx-no-bind */
+import { readFileSync } from 'fs'
 import {
     fireEvent,
     render,
@@ -17,6 +18,26 @@ import { TicketDetailPage } from './TicketDetailPage'
 const mockMutate = jest.fn()
 const mockUseSWR = jest.fn()
 let mockProfile: { roles: string[]; userId: number | string }
+const ticketDetailStyles = readFileSync(`${__dirname}/TicketDetailPage.module.scss`, 'utf8')
+
+interface Deferred<T> {
+    promise: Promise<T>
+    resolve: (value: T) => void
+}
+
+/**
+ * Creates a promise whose completion can be controlled by the test.
+ *
+ * @returns deferred promise and its resolver.
+ * @throws Does not throw.
+ */
+function createDeferred<T>(): Deferred<T> {
+    let resolve: (value: T) => void = () => undefined
+    const promise = new Promise<T>(promiseResolve => {
+        resolve = promiseResolve
+    })
+    return { promise, resolve }
+}
 
 jest.mock('swr', () => ({
     __esModule: true,
@@ -110,7 +131,7 @@ const closedTicket: SupportTicketDetail = {
     updatedAt: '2026-08-07T01:00:00.000Z',
 }
 
-describe('TicketDetailPage closed reply access', () => {
+describe('TicketDetailPage reply access', () => {
     beforeEach(() => {
         jest.clearAllMocks()
         mockProfile = {
@@ -138,6 +159,9 @@ describe('TicketDetailPage closed reply access', () => {
         async () => {
             render(<TicketDetailPage />)
 
+            expect(mockUseSWR.mock.calls[0][2])
+                .toEqual({ revalidateOnFocus: true, shouldRetryOnError: false })
+
             const challengeLink = screen.getByRole('link', { name: 'View challenge' })
             expect(challengeLink.getAttribute('href'))
                 .toBe('https://www.example.test/challenges/challenge%2Fid')
@@ -173,4 +197,181 @@ describe('TicketDetailPage closed reply access', () => {
         expect(screen.getByText('This ticket is closed and cannot receive more replies.'))
             .toBeTruthy()
     })
+
+    it('styles the challenge anchor as a visible link', () => {
+        const challengeLinkRule = ticketDetailStyles.match(
+            /\.challengeLink,\s*\.challengeLink:hover \{[^}]*\}/,
+        )?.[0]
+
+        expect(challengeLinkRule)
+            .toContain('color: $link-blue-dark;')
+        expect(challengeLinkRule)
+            .toContain('text-decoration: underline;')
+    })
+
+    it('identifies the support staff member who closed the ticket', () => {
+        mockUseSWR.mockReturnValue({
+            data: {
+                ...closedTicket,
+                assignees: [{
+                    assignedAt: '2026-08-07T00:30:00.000Z',
+                    handle: 'support-agent',
+                    userId: '99999',
+                }],
+                closedByUserId: '99999',
+            },
+            error: undefined,
+            isValidating: false,
+            mutate: mockMutate,
+        })
+
+        render(<TicketDetailPage />)
+
+        expect(screen.getByText((_content, element) => (
+            element?.tagName === 'P'
+            && element.textContent?.includes('Closed') === true
+            && element.textContent?.includes('by support-agent') === true
+        )))
+            .toBeTruthy()
+    })
+
+    it('falls back to the stored closer user ID when no assignee snapshot matches', () => {
+        mockUseSWR.mockReturnValue({
+            data: {
+                ...closedTicket,
+                closedByUserId: 'legacy-staff-1',
+            },
+            error: undefined,
+            isValidating: false,
+            mutate: mockMutate,
+        })
+
+        render(<TicketDetailPage />)
+
+        expect(screen.getByText('legacy-staff-1'))
+            .toBeTruthy()
+    })
+
+    it('revalidates fresh detail after marking the ticket read', async () => {
+        const markReadRequest = createDeferred<void>()
+        mockedMarkRead.mockReturnValue(markReadRequest.promise)
+        mockUseSWR.mockReturnValue({
+            data: { ...closedTicket, hasUnread: true },
+            error: undefined,
+            isValidating: false,
+            mutate: mockMutate,
+        })
+
+        render(<TicketDetailPage />)
+        markReadRequest.resolve(undefined)
+
+        await waitFor(() => {
+            expect(mockMutate)
+                .toHaveBeenCalledTimes(1)
+        })
+        expect(mockMutate.mock.calls[0])
+            .toEqual([])
+    })
+
+    it('identifies support team replies without labelling the ticket owner', () => {
+        mockUseSWR.mockReturnValue({
+            data: {
+                ...closedTicket,
+                responseCount: 2,
+                responses: [{
+                    createdAt: '2026-08-07T01:30:00.000Z',
+                    id: 'response-owner',
+                    markdown: 'Member follow-up.',
+                    readBy: [],
+                    userHandle: 'ticket-owner',
+                    userId: '12345',
+                }, {
+                    createdAt: '2026-08-07T01:45:00.000Z',
+                    id: 'response-support',
+                    markdown: 'Support follow-up.',
+                    readBy: [],
+                    userHandle: 'support-agent',
+                    userId: '67890',
+                }],
+            },
+            error: undefined,
+            isValidating: false,
+            mutate: mockMutate,
+        })
+
+        render(<TicketDetailPage />)
+
+        const ownerReply = screen.getByText('Member follow-up.')
+            .closest('article')
+        const supportReply = screen.getByText('Support follow-up.')
+            .closest('article')
+
+        expect(ownerReply?.textContent)
+            .toContain('ticket-owner')
+        expect(ownerReply?.textContent)
+            .not.toContain('(Support Team)')
+        expect(supportReply?.textContent)
+            .toContain('support-agent (Support Team)')
+    })
+
+    it('requires non-owner support staff to assign an open ticket before replying or closing it', () => {
+        mockProfile = {
+            roles: ['Topcoder Support Team'],
+            userId: 99999,
+        }
+        mockUseSWR.mockReturnValue({
+            data: {
+                ...closedTicket,
+                closedAt: undefined,
+                status: 'OPEN',
+            },
+            error: undefined,
+            isValidating: false,
+            mutate: mockMutate,
+        })
+
+        render(<TicketDetailPage />)
+
+        expect(screen.queryByLabelText('Reply'))
+            .toBeNull()
+        expect(screen.getByText('Assign this ticket to yourself before replying.'))
+            .toBeTruthy()
+        expect((screen.getByRole('button', {
+            name: 'Close support ticket',
+        }) as HTMLButtonElement).disabled)
+            .toBe(true)
+    })
+
+    it('lets assigned support staff reply to and close an open ticket', () => {
+        mockProfile = {
+            roles: ['Topcoder Support Team'],
+            userId: 99999,
+        }
+        mockUseSWR.mockReturnValue({
+            data: {
+                ...closedTicket,
+                assignees: [{
+                    assignedAt: '2026-08-07T00:30:00.000Z',
+                    handle: 'support-agent',
+                    userId: '99999',
+                }],
+                closedAt: undefined,
+                status: 'OPEN',
+            },
+            error: undefined,
+            isValidating: false,
+            mutate: mockMutate,
+        })
+
+        render(<TicketDetailPage />)
+
+        expect(screen.getByLabelText('Reply'))
+            .toBeTruthy()
+        expect(screen.queryByText('Assign this ticket to yourself before replying.'))
+            .toBeNull()
+        expect((screen.getByRole('button', {
+            name: 'Close support ticket',
+        }) as HTMLButtonElement).disabled)
+            .toBe(false)
+    })
 })
diff --git a/src/apps/support/src/pages/ticket-details/TicketDetailPage.tsx b/src/apps/support/src/pages/ticket-details/TicketDetailPage.tsx
index d782b2063..b870423ab 100644
--- a/src/apps/support/src/pages/ticket-details/TicketDetailPage.tsx
+++ b/src/apps/support/src/pages/ticket-details/TicketDetailPage.tsx
@@ -43,7 +43,7 @@ import {
 import styles from './TicketDetailPage.module.scss'
 
 /**
- * Renders the original request followed by ascending replies and authorized actions.
+ * Renders the original request followed by ascending, role-labelled replies and authorized actions.
  *
  * @returns support ticket detail page.
  * @throws Does not throw; request failures are shown with recovery actions.
@@ -67,7 +67,7 @@ export const TicketDetailPage: FC = () => {
     const { data, error, isValidating, mutate } = useSWR<SupportTicketDetail>(
         requestKey,
         () => getSupportTicket(ticketId as string),
-        { revalidateOnFocus: false, shouldRetryOnError: false },
+        { revalidateOnFocus: true, shouldRetryOnError: false },
     )
 
     useEffect(() => {
@@ -75,7 +75,7 @@ export const TicketDetailPage: FC = () => {
 
         markedReadTicket.current = data.id
         markSupportTicketRead(data.id)
-            .then(() => mutate({ ...data, hasUnread: false }, false))
+            .then(() => mutate())
             .catch(() => undefined)
     }, [data, mutate])
 
@@ -104,8 +104,11 @@ export const TicketDetailPage: FC = () => {
         assignee => String(assignee.userId) === currentUserId,
     ))
     const closed = data.status === 'CLOSED'
+    const closedByAssignee = data.closedByUserId
+        ? data.assignees.find(assignee => String(assignee.userId) === String(data.closedByUserId))
+        : undefined
     const ticketOwner = Boolean(currentUserId && String(data.memberUserId) === currentUserId)
-    const canReply = !closed || ticketOwner
+    const canReply = ticketOwner || (!closed && (!supportTeam || assignedToCurrentUser))
     const replyContext = `${data.id}-reply-${replyRevision}`
 
     /**
@@ -232,6 +235,21 @@ export const TicketDetailPage: FC = () => {
                             Closed
                             {' '}
                             {formatSupportDate(data.closedAt)}
+                            {data.closedByUserId && (
+                                <>
+                                    {' '}
+                                    by
+                                    {' '}
+                                    <span>
+                                        {closedByAssignee ? (
+                                            <MemberHandle
+                                                color={closedByAssignee.handleColor}
+                                                handle={closedByAssignee.handle}
+                                            />
+                                        ) : data.closedByUserId}
+                                    </span>
+                                </>
+                            )}
                         </p>
                     )}
                 </div>
@@ -245,6 +263,7 @@ export const TicketDetailPage: FC = () => {
                             size='md'
                         />
                         <Button
+                            disabled={updatingAssignment || !assignedToCurrentUser}
                             label='Close support ticket'
                             onClick={() => setConfirmClose(true)}
                             primary
@@ -295,6 +314,7 @@ export const TicketDetailPage: FC = () => {
                                             color={response.userHandleColor}
                                             handle={response.userHandle}
                                         />
+                                        {response.userId !== data.memberUserId && ' (Support Team)'}
                                     </span>
                                     <time dateTime={response.createdAt}>{formatSupportDate(response.createdAt)}</time>
                                 </header>
@@ -332,7 +352,11 @@ export const TicketDetailPage: FC = () => {
                     </div>
                 </section>
             ) : (
-                <p className={styles.closedNotice}>This ticket is closed and cannot receive more replies.</p>
+                <p className={styles.closedNotice}>
+                    {closed
+                        ? 'This ticket is closed and cannot receive more replies.'
+                        : 'Assign this ticket to yourself before replying.'}
+                </p>
             )}
 
             <BaseModal
diff --git a/src/apps/support/src/pages/tickets/TicketsPage.spec.tsx b/src/apps/support/src/pages/tickets/TicketsPage.spec.tsx
new file mode 100644
index 000000000..3d2f373fb
--- /dev/null
+++ b/src/apps/support/src/pages/tickets/TicketsPage.spec.tsx
@@ -0,0 +1,70 @@
+/* eslint-disable import/no-extraneous-dependencies, ordered-imports/ordered-imports */
+import { render } from '@testing-library/react'
+
+import { OpenTicketsPage } from './TicketsPage'
+
+const mockUseSWR = jest.fn()
+
+jest.mock('swr', () => ({
+    __esModule: true,
+    default: (...args: unknown[]) => mockUseSWR(...args),
+}))
+
+jest.mock('react-router-dom', () => ({
+    useNavigate: () => jest.fn(),
+    useSearchParams: () => [new URLSearchParams(), jest.fn()],
+}))
+
+jest.mock('~/config', () => ({
+    EnvironmentConfig: { API: { V6: 'https://api.example.test/v6' } },
+}), { virtual: true })
+
+jest.mock('~/libs/core', () => ({
+    useProfileContext: () => ({
+        profile: { roles: ['Topcoder User'], userId: 12345 },
+    }),
+    UserRole: { topcoderSupportTeam: 'Topcoder Support Team' },
+}), { virtual: true })
+
+jest.mock('~/libs/ui', () => ({
+    Button: () => <></>,
+}), { virtual: true })
+
+jest.mock('../../config/routes.config', () => ({
+    buildSupportPath: (...segments: string[]) => `/support/${segments.join('/')}`,
+}))
+
+jest.mock('../../lib/components', () => ({
+    MemberHandleAutocomplete: () => <></>,
+    OpenSupportRequestModal: () => <></>,
+    SupportEmpty: () => <></>,
+    SupportError: () => <></>,
+    SupportLoading: () => <></>,
+    SupportTabs: () => <></>,
+    TicketsTable: () => <></>,
+}))
+
+jest.mock('../../lib/services', () => ({
+    assignSupportTicketToMe: jest.fn(),
+    buildTicketListUrl: () => 'support-tickets',
+    getSupportTickets: jest.fn(),
+}))
+
+describe('TicketsPage cache freshness', () => {
+    beforeEach(() => {
+        jest.clearAllMocks()
+        mockUseSWR.mockReturnValue({
+            data: undefined,
+            error: undefined,
+            isValidating: true,
+            mutate: jest.fn(),
+        })
+    })
+
+    it('refreshes ticket assignments when the requester returns to the page', () => {
+        render(<OpenTicketsPage />)
+
+        expect(mockUseSWR.mock.calls[0][2])
+            .toEqual({ revalidateOnFocus: true, shouldRetryOnError: false })
+    })
+})
diff --git a/src/apps/support/src/pages/tickets/TicketsPage.tsx b/src/apps/support/src/pages/tickets/TicketsPage.tsx
index ca79ef94c..da3ba51fd 100644
--- a/src/apps/support/src/pages/tickets/TicketsPage.tsx
+++ b/src/apps/support/src/pages/tickets/TicketsPage.tsx
@@ -114,7 +114,7 @@ const TicketsPage: FC<TicketsPageProps> = props => {
     const { data, error, isValidating, mutate } = useSWR(
         requestKey,
         () => getSupportTickets(query),
-        { revalidateOnFocus: false, shouldRetryOnError: false },
+        { revalidateOnFocus: true, shouldRetryOnError: false },
     )
 
     /**
diff --git a/src/apps/work/src/lib/schemas/challenge-editor.schema.spec.ts b/src/apps/work/src/lib/schemas/challenge-editor.schema.spec.ts
index 0c0203da9..5918ca0d8 100644
--- a/src/apps/work/src/lib/schemas/challenge-editor.schema.spec.ts
+++ b/src/apps/work/src/lib/schemas/challenge-editor.schema.spec.ts
@@ -332,11 +332,12 @@ describe('challenge-editor schema reviewer slot assignment validation', () => {
             .toBeTruthy()
     })
 
-    it('still requires an assigned checkpoint screener', async () => {
+    it('accepts an unassigned checkpoint screener for the Checkpoint Screening phase', async () => {
         await expect(
             challengeAdvancedOptionsSchema.validate({
                 ...baseFormData,
                 phases: [{
+                    id: 'checkpoint-screening-phase-instance-id',
                     name: 'Checkpoint Screening',
                     phaseId: 'checkpoint-screening-phase-id',
                 }],
@@ -344,17 +345,15 @@ describe('challenge-editor schema reviewer slot assignment validation', () => {
                     {
                         isMemberReview: true,
                         memberReviewerCount: 1,
-                        phaseId: 'checkpoint-screening-phase-id',
+                        phaseId: 'checkpoint-screening-phase-instance-id',
                         scorecardId: 'checkpoint-screening-scorecard-id',
                         shouldOpenOpportunity: false,
                     },
                 ],
             }),
         )
-            .rejects
-            .toMatchObject({
-                path: 'reviewers[0].memberId',
-            })
+            .resolves
+            .toBeTruthy()
     })
 
     it('accepts required reviewer slot assignments when opportunity is closed', async () => {
@@ -377,6 +376,25 @@ describe('challenge-editor schema reviewer slot assignment validation', () => {
             .toBeTruthy()
     })
 
+    it('accepts a persisted member handle while its member id is resolved during save', async () => {
+        await expect(
+            challengeAdvancedOptionsSchema.validate({
+                ...baseFormData,
+                reviewers: [
+                    {
+                        handle: 'TCConnCopilot',
+                        isMemberReview: true,
+                        memberReviewerCount: 1,
+                        scorecardId: 'scorecard-id',
+                        shouldOpenOpportunity: false,
+                    },
+                ],
+            }),
+        )
+            .resolves
+            .toBeTruthy()
+    })
+
     it('rejects reviewer counts above the manual reviewer limit', async () => {
         await expect(
             challengeAdvancedOptionsSchema.validate({
diff --git a/src/apps/work/src/lib/schemas/challenge-editor.schema.ts b/src/apps/work/src/lib/schemas/challenge-editor.schema.ts
index f44aa3cfe..e90090c07 100644
--- a/src/apps/work/src/lib/schemas/challenge-editor.schema.ts
+++ b/src/apps/work/src/lib/schemas/challenge-editor.schema.ts
@@ -441,11 +441,10 @@ export const challengeAdvancedOptionsSchema = yup.object({
                             ? reviewer.additionalMemberIds
                             : []
                         const normalizedAssignedMemberSlots = [
-                            reviewer.memberId,
-                            ...additionalMemberIds,
+                            toNormalizedText(reviewer.memberId) || toNormalizedText(reviewer.handle),
+                            ...additionalMemberIds.map(memberId => toNormalizedText(memberId)),
                         ]
                             .slice(0, reviewerSlots)
-                            .map(memberId => toNormalizedText(memberId))
                         const missingSlotIndex = normalizedAssignedMemberSlots.findIndex(memberId => !memberId)
                         const hasAllAssignments = normalizedAssignedMemberSlots.length === reviewerSlots
                             && missingSlotIndex === -1
diff --git a/src/apps/work/src/lib/utils/assignment-dates.utils.spec.ts b/src/apps/work/src/lib/utils/assignment-dates.utils.spec.ts
index 5d220b6a4..d8b1d6399 100644
--- a/src/apps/work/src/lib/utils/assignment-dates.utils.spec.ts
+++ b/src/apps/work/src/lib/utils/assignment-dates.utils.spec.ts
@@ -57,7 +57,7 @@ describe('assignment-dates.utils', () => {
                 .toBe('-')
         })
 
-        it('returns N/A for cancelled or closed engagements', () => {
+        it('returns N/A for cancelled or closed engagements, and terminated assignments', () => {
             expect(formatAssignmentDaysLeftInEngagement(
                 '2026-01-01T12:00:00.000Z',
                 1,
@@ -74,6 +74,14 @@ describe('assignment-dates.utils', () => {
             ))
                 .toBe('N/A')
 
+            expect(formatAssignmentDaysLeftInEngagement(
+                '2026-01-01T12:00:00.000Z',
+                1,
+                'TERMINATED',
+                new Date('2026-01-16T12:00:00.000Z'),
+            ))
+                .toBe('N/A')
+
             expect(formatAssignmentDaysLeftInEngagement(
                 '2026-01-01T12:00:00.000Z',
                 1,
diff --git a/src/apps/work/src/lib/utils/assignment-dates.utils.ts b/src/apps/work/src/lib/utils/assignment-dates.utils.ts
index b4131d744..1af058d81 100644
--- a/src/apps/work/src/lib/utils/assignment-dates.utils.ts
+++ b/src/apps/work/src/lib/utils/assignment-dates.utils.ts
@@ -146,11 +146,11 @@ export function getAssignmentDaysLeftInEngagement(
 /**
  * Formats remaining engagement days for Assignments list display.
  *
- * Cancelled or closed engagements show `N/A`.
+ * Cancelled or closed engagements, and terminated assignments, show `N/A`.
  *
  * @param startDate billing start date.
  * @param durationMonths assignment duration in months.
- * @param engagementStatus optional engagement status.
+ * @param engagementStatus optional engagement or assignment status.
  * @param now optional "today" override for tests.
  * @returns display string such as `16 days`, `N/A`, or `-` when unavailable.
  */
diff --git a/src/apps/work/src/lib/utils/reviewer.utils.ts b/src/apps/work/src/lib/utils/reviewer.utils.ts
index 3db86039c..fc1ed2cb2 100644
--- a/src/apps/work/src/lib/utils/reviewer.utils.ts
+++ b/src/apps/work/src/lib/utils/reviewer.utils.ts
@@ -8,7 +8,7 @@ import type {
  *
  * @param value reviewer or phase value to normalize.
  * @returns trimmed text for string values, otherwise an empty string.
- * @remarks Used internally while resolving whether a reviewer belongs to standard Screening.
+ * @remarks Used internally while resolving whether a reviewer belongs to a screening phase.
  * @throws Does not throw.
  */
 function normalizeReviewerValue(value: unknown): string {
@@ -22,9 +22,9 @@ function normalizeReviewerValue(value: unknown): string {
  *
  * @param reviewer reviewer configuration whose phase should be inspected.
  * @param phases challenge phases used to resolve the reviewer's phase name.
- * @returns `true` only for a human reviewer configured on the standard Screening phase.
- * @remarks Form validation and reviewer fields use this exception; Checkpoint Screening and every
- * other reviewer phase still require assignments up front.
+ * @returns `true` for a human reviewer configured on Screening or Checkpoint Screening.
+ * @remarks Form validation and reviewer fields use this exception; every other reviewer phase
+ * still requires assignments up front.
  * @throws Does not throw.
  */
 export function isScreenerAssignmentOptional(
@@ -46,8 +46,13 @@ export function isScreenerAssignmentOptional(
         const matchesPhase = reviewerPhaseId === phaseTemplateId
             || reviewerPhaseId === phaseInstanceId
 
+        const normalizedPhaseName = normalizeReviewerValue(phase.name)
+            .toLowerCase()
+
         return matchesPhase
-            && normalizeReviewerValue(phase.name)
-                .toLowerCase() === 'screening'
+            && (
+                normalizedPhaseName === 'screening'
+                || normalizedPhaseName === 'checkpoint screening'
+            )
     })
 }
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.spec.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.spec.tsx
index 7b75c4292..e92f03cee 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.spec.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.spec.tsx
@@ -592,6 +592,41 @@ describe('ChallengeEditorPage', () => {
             .toBe(true)
     })
 
+    it('keeps launch enabled for a fun challenge without budget approval', async () => {
+        mockedUseFetchChallenge.mockReturnValue({
+            challenge: {
+                approvalStatus: 'PENDING_APPROVAL',
+                discussions: [{
+                    url: 'https://example.com/forum/challenges/456',
+                }],
+                funChallenge: true,
+                id: '456',
+                name: 'Fun challenge',
+                prizeSets: [],
+                status: 'DRAFT',
+            },
+            error: undefined,
+            isLoading: false,
+            mutate: jest.fn(),
+        })
+
+        renderPage(
+            '/projects/123/challenges/456/view',
+            '/projects/:projectId/challenges/:challengeId/view',
+        )
+
+        await waitFor(() => {
+            expect(screen.getByText('Challenge View Form'))
+                .toBeTruthy()
+        })
+
+        expect(screen.getAllByRole('button', { name: 'Launch' }))
+            .toHaveLength(2)
+        expect(screen.getAllByRole('button', { name: 'Launch' })
+            .every(button => !(button as HTMLButtonElement).disabled))
+            .toBe(true)
+    })
+
     it('keeps launch enabled when challenge budget is approved', async () => {
         mockedUseFetchChallenge.mockReturnValue({
             challenge: {
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.tsx
index 40f992eb9..14a3f0e8b 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/ChallengeEditorPage.tsx
@@ -1287,7 +1287,10 @@ export const ChallengeEditorPage: FC = () => {
     const isBudgetApproved = isBudgetApprovedForLaunch(
         challengeApprovalStatus || headerChallenge?.approvalStatus,
     )
-    const isLaunchDisabled = isLaunching || isSavingChallenge || !isBudgetApproved
+    const requiresBudgetApproval = headerChallenge?.funChallenge !== true
+    const isLaunchDisabled = isLaunching
+        || isSavingChallenge
+        || (requiresBudgetApproval && !isBudgetApproved)
     const handleSavingChange = useCallback((isSaving: boolean): void => {
         setIsSavingChallenge(isSaving)
     }, [])
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/README.md b/src/apps/work/src/pages/challenges/ChallengeEditorPage/README.md
index 177d67c46..ef6c0948c 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/README.md
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/README.md
@@ -23,7 +23,7 @@
   payload is available, so the create route can expand to the full editor immediately after the
   initial draft is created.
 - `components/*Field.tsx`: field-level components for each challenge section.
-- `components/ReviewersField/*`: tabbed human/AI review configuration. Human reviewers stay on the challenge form, while AI reviewer configs load/save through the review API and sync saved AI workflows back into the challenge `reviewers` array. Existing AI configs are reloaded once per saved challenge even if the challenge payload is temporarily missing synced AI reviewer rows, while still avoiding empty-config lookups for unsaved challenges, ordinary parent rerenders in edit mode, and same-session re-fetches right after a config is intentionally removed. Removing an AI config also detaches the synced AI workflow reviewers from the challenge. In read-only view mode the tab switcher remains clickable so users can inspect AI config details inside the disabled challenge form, and the review summary surfaces the human-review table, AI workflow details, resolved scorecard names, review flow, and estimated reviewer cost without requiring edits. Repeated human-review rows that share the same resource role now consume persisted challenge-resource assignments in row order so every assigned reviewer still appears once in the summary, and mixed legacy resource layouts continue into the generic `Reviewer` fallback pool when a phase-specific role runs out of persisted assignments. The editor hydration, editable tab, summary, and post-save reset now tolerate persisted resource rows that only expose role names, member handles, or member ids instead of the full modern payload shape, so refreshed drafts and newly saved drafts reopen with the saved reviewer assignments intact. Initial persisted-resource hydration also keeps running while the form is still in its mount-time normalization window, so internal dirty flags from compatibility fields do not block restored copilot or reviewer assignments after a full refresh. The AI-gating failure path keeps the locked state grouped under the gate so the diagram matches the legacy work-manager layout, including `AI_GATING` configs whose workflows do not explicitly mark `isGating`. On narrow screens the review-flow diagram switches to a compact portrait branch: submission stays full width, the `AI Gate` and `Locked` states sit side by side as narrower cards, the `< threshold` connector sits between those two cards, and the human-review path continues only from the gate column. When AI reviewers exist without a persisted AI screening phase, the schedule editor injects a virtual `AI Screening` row after submission phases. This `Review` section is hidden for `Task` and `Marathon Match` challenges because those flows use dedicated reviewer assignment UIs.
+- `components/ReviewersField/*`: tabbed human/AI review configuration. Every user editing a Design `Challenge` sees one Screener selector that synchronizes the selected member across final Screening and, for two-round challenges, Checkpoint Screening while preserving all hidden phase, scorecard, and reviewer defaults. Administrators additionally get a `Show advanced review configuration` toggle that expands the full tabbed interface on demand; copilots and managers only see the Screener selector. Human reviewers stay on the challenge form, while AI reviewer configs load/save through the review API and sync saved AI workflows back into the challenge `reviewers` array. Existing AI configs are reloaded once per saved challenge even if the challenge payload is temporarily missing synced AI reviewer rows, while still avoiding empty-config lookups for unsaved challenges, ordinary parent rerenders in edit mode, and same-session re-fetches right after a config is intentionally removed. Removing an AI config also detaches the synced AI workflow reviewers from the challenge. In read-only view mode the tab switcher remains clickable so users can inspect AI config details inside the disabled challenge form, and the review summary surfaces the human-review table, AI workflow details, resolved scorecard names, review flow, and estimated reviewer cost without requiring edits. Repeated human-review rows that share the same resource role now consume persisted challenge-resource assignments in row order so every assigned reviewer still appears once in the summary, and mixed legacy resource layouts continue into the generic `Reviewer` fallback pool when a phase-specific role runs out of persisted assignments. The editor hydration, editable tab, summary, and post-save reset now tolerate persisted resource rows that only expose role names, member handles, or member ids instead of the full modern payload shape, so refreshed drafts and newly saved drafts reopen with the saved reviewer assignments intact. Initial persisted-resource hydration also keeps running while the form is still in its mount-time normalization window, so internal dirty flags from compatibility fields do not block restored copilot or reviewer assignments after a full refresh. The AI-gating failure path keeps the locked state grouped under the gate so the diagram matches the legacy work-manager layout, including `AI_GATING` configs whose workflows do not explicitly mark `isGating`. On narrow screens the review-flow diagram switches to a compact portrait branch: submission stays full width, the `AI Gate` and `Locked` states sit side by side as narrower cards, the `< threshold` connector sits between those two cards, and the human-review path continues only from the gate column. When AI reviewers exist without a persisted AI screening phase, the schedule editor injects a virtual `AI Screening` row after submission phases. This `Review` section is hidden for `Task` and `Marathon Match` challenges because those flows use dedicated reviewer assignment UIs.
 - `ChallengeEditorPage.module.scss` and `components/ChallengeEditorForm.module.scss`: page and form layout styling, including the grouped `Prizes & Billing` layout that keeps the challenge-prizes and copilot-fee inputs at fixed widths on larger screens, preserves whitespace to the right, and moves the billing summary underneath them.
 
 ## Validation Rules
@@ -45,7 +45,7 @@ The form uses `challengeBasicInfoSchema` from `src/apps/work/src/lib/schemas/cha
 - `tags`: optional string array.
 - `skills`: required unless billing account is listed in `SKILLS_OPTIONAL_BILLING_ACCOUNT_IDS`.
 - `reviewer`: optional for task challenges.
-- `reviewers`: when using `Save as Draft` from `NEW` status, non-task/non-marathon challenges must include reviewer coverage for configured review phases. If required phases are configured, each phase must have at least one member reviewer with a scorecard. The standard Screening configuration and scorecard remain required, but its Screener member assignment may be left empty until after launch; other closed manual reviewer assignments remain required.
+- `reviewers`: when using `Save as Draft` from `NEW` status, non-task/non-marathon challenges must include reviewer coverage for configured review phases. If required phases are configured, each phase must have at least one member reviewer with a scorecard. The Screening and Checkpoint Screening configurations and scorecards remain required, but their Screener member assignments may be left empty until after launch; other closed manual reviewer assignments remain required.
 - `AI review configuration`: templates and manual configs autosave separately once valid, switching a template-backed config to manual mode keeps its copied settings but clears the template link on save, and the AI tab becomes read-only after the challenge has submissions.
 
 ## Autosave Behavior
@@ -75,16 +75,21 @@ The form uses `challengeBasicInfoSchema` from `src/apps/work/src/lib/schemas/cha
 - `ChallengeScheduleSection`: schedule editor for challenge start and phase dates. It keeps the detected timezone above the controls, renders the `Start Date` label with the `Scheduled` and `Immediately` start-mode radios aligned to the end of that header row above the input with a green selected state, keeps outside-label date-picker controls visible and interactive when the shared input wrapper omits an empty internal label, persists the selected start mode in challenge metadata so saved `/edit` and `/view` routes reopen with the correct radio state, initializes missing challenge start dates from existing phase starts or the current date before calculating blank phase rows, recalculates root phase dates when the challenge start changes, and upgrades populated legacy non-task schedules to the scheduling API during serialization even if asynchronous hydration restores a stale disabled flag. It honors completed phases' actual dates when deriving and displaying schedule rows, lets incomplete active Design phases be shortened no earlier than the current date/time, prevents incomplete active non-Design phases from being shortened, reports rejected schedule edits to the form so manual saves show the relevant validation error and autosave pauses until the edit is corrected, and keeps completed phases' end-date and duration controls locked to match legacy work-manager behavior. `Task` challenges hide this editable section across create, edit, and read-only view routes to match legacy work-manager behavior and retain a disabled legacy scheduling flag.
 - `DesignWorkTypeField`: shown for Design + Challenge, with the legacy work-type options (`Application Front-End Design`, `Print/Presentation`, `Web Design`, `Widget or Mobile Screen Design`, `Wireframes`). The selected value is stored in challenge tags.
 - `FunChallengeField`: shown for `Marathon Match` type and remains editable after creation so the form can switch between fun-challenge and standard marathon-match fields.
+- `ShowDashboardField`: `Show Dashboard` checkbox shown in Advanced Options only for `Marathon Match`
+  type challenges. It reloads from the exact string-valued `show_data_dashboard` challenge metadata
+  entry consumed by the challenge details page, and defaults to checked for fun challenges that have
+  no saved value yet. Creating a Marathon Match persists `show_data_dashboard` as `true` for fun
+  challenges and `false` otherwise.
 - `Test Challenge` checkbox: shown only in Advanced Options after the challenge has been created;
   it is omitted from Basic Information during initial creation. It defaults unchecked, reloads
   from `is_test_challenge`, and explicitly persists metadata value `true` or `false`. Test
   challenges do not generate payments, and authorized modifiers can delete them after they reach
   a completed or cancelled status.
-- `ReviewersField`: hidden for `Task` and `Marathon Match` challenges because manual reviewer assignment is handled elsewhere. On the human-review tab, each manual reviewer card keeps the legacy review-type dropdown, backfills missing legacy review-type values from the matching default reviewer or iterative-review phase fallback, and each manual reviewer phase selector hides registration/submission phases and any phase already assigned on another manual reviewer card while preserving the card's current selection. When default reviewer metadata is missing, stale, or already covered by existing rows, `Add reviewer` starts from the next unassigned selectable reviewer phase, preferring review phases before approval or screening phases, so single-round Design schedules add the Approver row instead of a registration/submission or duplicate reviewer row. Manual reviewer counts are capped before rendering member assignment controls so closed public opportunities cannot create an unbounded number of member selectors. Design challenge manual reviewers always keep the public review opportunity checkbox disabled and unchecked. Standard Screening member selectors remain available but are optional so a copilot can assign the Screener after launch.
+- `ReviewersField`: hidden for `Task` and `Marathon Match` challenges because manual reviewer assignment is handled elsewhere. The simplified Design Challenge review section repairs missing, duplicate, and stale hidden reviewer rows from the active defaults while exposing the Screening and Checkpoint Screening member selectors. Checkpoint Review, Review, and Approval are private and automatically assigned to the selected copilot during save; Design Challenge creation and saving highlight the Copilot field when no copilot is selected. On the full human-review tab, each manual reviewer card keeps the legacy review-type dropdown, backfills missing legacy review-type values from the matching default reviewer or iterative-review phase fallback, and each manual reviewer phase selector hides registration/submission phases and any phase already assigned on another manual reviewer card while preserving the card's current selection. When default reviewer metadata is missing, stale, or already covered by existing rows, `Add reviewer` starts from the next unassigned selectable reviewer phase, preferring review phases before approval or screening phases, so single-round Design schedules add the Approver row instead of a registration/submission or duplicate reviewer row. Manual reviewer counts are capped before rendering member assignment controls so closed public opportunities cannot create an unbounded number of member selectors. The full Design reviewer editor keeps the public review opportunity checkbox disabled and unchecked. Screening and Checkpoint Screening member selectors remain available but are optional so a copilot can assign the Screener or Checkpoint Screener after launch.
 - `Submission Settings`: shown for Design `Challenge` and Design `First2Finish` types, and contains the final-deliverables, stock-art, and submission-limit compatibility fields.
 - `RegisteredMemberDownloadField`: shown in Advanced Options for every created challenge type. The radio group persists `allowAllRegistrantsToDownloadWinningSubmissions` as the exact string `true` for all challenge registrants or `false` for passing submitters only. New Development challenges default to passing submitters; other new challenges, including Design, default to all registrants. Existing challenges without the metadata retain passing-submitter-only access.
 - `FinalDeliverablesField`: design-challenge file-type editor that persists the legacy `fileTypes` metadata payload used on challenge draft pages.
-- `MaximumSubmissionsField`: submission-limit editor with `Unlimited` (the default) and `Limited` modes. Limited mode reveals a numeric count field, and both modes persist the legacy `submissionLimit` JSON metadata contract consumed by challenge and review applications. Existing limited values are restored without being overwritten, while missing or malformed metadata is normalized to unlimited after initial resource hydration so copilot restoration completes before autosave/manual-save treats the default as a user change.
+- `MaximumSubmissionsField`: submission-limit editor with `Unlimited` (the default) and `Limited` modes. Limited mode reveals a numeric count field, and both modes persist the legacy `submissionLimit` JSON metadata contract consumed by challenge and review applications. Existing limited values are restored without being overwritten, including when a draft-save response omits submission-limit metadata, while missing or malformed metadata is normalized to unlimited after initial resource hydration so copilot restoration completes before autosave/manual-save treats the default as a user change.
 - `ChallengeDescriptionField`: public markdown spec editor with a `Copy spec` action that copies
   the current Markdown in both edit and read-only view modes.
 - `ChallengePrivateDescriptionField`: optional private markdown spec editor.
@@ -134,6 +139,8 @@ The form uses `challengeBasicInfoSchema` from `src/apps/work/src/lib/schemas/cha
 ## Header Actions
 
 - `Launch` is shown on the details tab for `DRAFT` challenges in the header for both view and edit routes, and again in the footer beside `Save Challenge` while editing.
+- Fun challenges bypass the manual budget-approval launch gate; other challenge types require an
+  approved budget before launch.
 - Read-only view routes repeat the available `Edit`, `Launch`, `Cancel`, and `Mark Complete` actions at the bottom of the page. Challenge quick links remain in the header only.
 - The work app blocks launch attempts when the parent project billing account is inactive, expired, or has insufficient remaining funds, matching the legacy work-manager launch restriction.
 - Task challenges cannot be launched until `Assigned Member` is set, which ensures the task is assigned before it becomes publicly visible.
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.spec.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.spec.tsx
index da06806b1..154691d68 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.spec.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.spec.tsx
@@ -613,6 +613,9 @@ jest.mock('./CopilotField', () => ({
                         value={controller.field.value || ''}
                     />
                 </label>
+                {controller.fieldState.error?.message
+                    ? <span role='alert'>{controller.fieldState.error.message}</span>
+                    : undefined}
                 <button
                     onClick={handleAssignYourself}
                     type='button'
@@ -651,7 +654,22 @@ jest.mock('./FinalDeliverablesField', () => ({
     FinalDeliverablesField: () => <>Final Deliverables Field</>,
 }))
 jest.mock('./FunChallengeField', () => ({
-    FunChallengeField: () => <></>,
+    FunChallengeField: function MockFunChallengeField() {
+        const reactHookForm: typeof import('react-hook-form') = jest.requireActual('react-hook-form')
+        const controller = reactHookForm.useController({
+            control: reactHookForm.useFormContext().control,
+            name: 'funChallenge',
+        })
+
+        return (
+            <input
+                aria-label='Fun Challenge'
+                checked={controller.field.value === true}
+                onChange={event => controller.field.onChange(event.target.checked)}
+                type='checkbox'
+            />
+        )
+    },
 }))
 jest.mock('./GroupsField', () => ({
     GroupsField: () => <></>,
@@ -660,6 +678,12 @@ jest.mock('./MaximumSubmissionsField', () => ({
     MaximumSubmissionsField: (props: {
         deferDirty?: boolean
     }) => {
+        const reactHookForm: typeof import('react-hook-form') = jest.requireActual('react-hook-form')
+        const metadata = reactHookForm.useWatch({
+            control: reactHookForm.useFormContext().control,
+            name: 'metadata',
+        })
+
         mockMaximumSubmissionsDeferDirtyValues.push(props.deferDirty === true)
 
         return (
@@ -667,6 +691,7 @@ jest.mock('./MaximumSubmissionsField', () => ({
                 data-defer-dirty={props.deferDirty === true
                     ? 'true'
                     : 'false'}
+                data-metadata={JSON.stringify(metadata || [])}
                 data-testid='maximum-submissions-field'
             >
                 Maximum Submissions Field
@@ -684,7 +709,11 @@ jest.mock('./ReviewCostField', () => ({
     ReviewCostField: () => <></>,
 }))
 jest.mock('./ReviewersField', () => ({
-    ReviewersField: (props: { isReadOnly?: boolean }) => {
+    ReviewersField: (props: {
+        canConfigureFullReview?: boolean
+        isReadOnly?: boolean
+        screenerOnly?: boolean
+    }) => {
         const reactHookForm: typeof import('react-hook-form') = jest.requireActual('react-hook-form')
         const reviewers = reactHookForm.useWatch({
             control: reactHookForm.useFormContext().control,
@@ -693,8 +722,10 @@ jest.mock('./ReviewersField', () => ({
 
         return (
             <div
+                data-can-configure-full-review={props.canConfigureFullReview === true ? 'true' : 'false'}
                 data-read-only={props.isReadOnly === true ? 'true' : 'false'}
                 data-reviewers={JSON.stringify(reviewers || [])}
+                data-screener-only={props.screenerOnly === true ? 'true' : 'false'}
                 data-testid='reviewers-field'
             >
                 Reviewers Field
@@ -708,6 +739,10 @@ jest.mock('./ReviewTypeField', () => ({
 jest.mock('./RoundTypeField', () => ({
     RoundTypeField: () => <></>,
 }))
+jest.mock('./ShowDashboardField', () => ({
+    SHOW_DATA_DASHBOARD_METADATA_FIELD: 'show_data_dashboard',
+    ShowDashboardField: () => <>Show Dashboard Field</>,
+}))
 jest.mock('./StockArtsField', () => ({
     StockArtsField: function StockArtsField() {
         const React: typeof import('react') = jest.requireActual('react')
@@ -838,6 +873,7 @@ describe('ChallengeEditorForm', () => {
     } as Challenge
     const validDraftChallenge = {
         ...draftChallenge,
+        approvalStatus: 'APPROVED',
         description: 'Valid public specification for the attachment save regression test.',
         prizeSets: [{
             prizes: [{
@@ -857,15 +893,21 @@ describe('ChallengeEditorForm', () => {
         ...validDraftChallenge,
         status: 'NEW',
     } as Challenge
-    const designChallengeWithDeferredScreener = {
+    const designChallengeWithDeferredScreeners = {
         ...validDraftChallenge,
         approvalStatus: 'APPROVED',
+        copilot: 'TCConnCopilot',
         phases: [
             {
                 duration: 60,
                 name: 'Screening',
                 phaseId: 'screening-phase-id',
             },
+            {
+                duration: 60,
+                name: 'Checkpoint Screening',
+                phaseId: 'checkpoint-screening-phase-id',
+            },
             {
                 duration: 60,
                 name: 'Review',
@@ -881,6 +923,14 @@ describe('ChallengeEditorForm', () => {
                 scorecardId: 'screening-scorecard-id',
                 shouldOpenOpportunity: false,
             },
+            {
+                additionalMemberIds: [],
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'checkpoint-screening-phase-id',
+                scorecardId: 'checkpoint-screening-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
             {
                 additionalMemberIds: [],
                 isMemberReview: true,
@@ -898,6 +948,85 @@ describe('ChallengeEditorForm', () => {
         },
         typeId: 'design-challenge-type-id',
     } as Challenge
+    const twoRoundDesignChallengeWithCopilotReviewers = {
+        ...validDraftChallenge,
+        copilot: 'TCConnCopilot',
+        phases: [
+            {
+                duration: 60,
+                name: 'Checkpoint Screening',
+                phaseId: 'checkpoint-screening-phase-id',
+            },
+            {
+                duration: 60,
+                name: 'Checkpoint Review',
+                phaseId: 'checkpoint-review-phase-id',
+            },
+            {
+                duration: 60,
+                name: 'Screening',
+                phaseId: 'screening-phase-id',
+            },
+            {
+                duration: 60,
+                name: 'Review',
+                phaseId: 'review-phase-id',
+            },
+            {
+                duration: 60,
+                name: 'Approval',
+                phaseId: 'approval-phase-id',
+            },
+        ],
+        reviewers: [
+            {
+                isMemberReview: true,
+                memberId: 'screener-member-id',
+                memberReviewerCount: 1,
+                phaseId: 'checkpoint-screening-phase-id',
+                scorecardId: 'checkpoint-screening-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                handle: 'TCConnCopilot',
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'checkpoint-review-phase-id',
+                scorecardId: 'checkpoint-review-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                isMemberReview: true,
+                memberId: 'screener-member-id',
+                memberReviewerCount: 1,
+                phaseId: 'screening-phase-id',
+                scorecardId: 'screening-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                handle: 'TCConnCopilot',
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'review-phase-id',
+                scorecardId: 'review-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                handle: 'TCConnCopilot',
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'approval-phase-id',
+                scorecardId: 'approval-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+        ],
+        trackId: 'design-track-id',
+        type: {
+            abbreviation: 'CH',
+            name: 'Challenge',
+        },
+        typeId: 'design-challenge-type-id',
+    } as Challenge
     const taskDraftChallenge = {
         ...draftChallenge,
         task: {
@@ -959,7 +1088,11 @@ describe('ChallengeEditorForm', () => {
             },
         })
         mockedUseFetchProjectBillingAccount.mockReturnValue({
-            billingAccount: undefined,
+            billingAccount: {
+                active: true,
+                id: '80001063',
+                totalBudgetRemaining: 500,
+            },
             isLoading: false,
         })
         mockedUseFetchResourceRoles.mockImplementation(() => ({
@@ -990,8 +1123,28 @@ describe('ChallengeEditorForm', () => {
         mockedFetchProjectBillingAccountService.mockResolvedValue({
             billingAccount: undefined,
         })
-        mockedFetchProfile.mockResolvedValue(undefined)
-        mockedFetchResourceRolesService.mockResolvedValue([])
+        mockedFetchProfile.mockResolvedValue({
+            handle: 'TCConnCopilot',
+            userId: '40158994',
+        })
+        mockedFetchResourceRolesService.mockResolvedValue([
+            {
+                id: 'copilot-role-id',
+                name: 'Copilot',
+            },
+            {
+                id: 'checkpoint-reviewer-role-id',
+                name: 'Checkpoint Reviewer',
+            },
+            {
+                id: 'reviewer-role-id',
+                name: 'Reviewer',
+            },
+            {
+                id: 'approver-role-id',
+                name: 'Approver',
+            },
+        ])
         mockedFetchResourcesService.mockResolvedValue([])
         mockedSearchProfilesByUserIds.mockResolvedValue([])
         mockedCreateResource.mockResolvedValue(undefined)
@@ -1181,7 +1334,10 @@ describe('ChallengeEditorForm', () => {
             <MemoryRouter>
                 <WorkAppContext.Provider value={managerContextValue}>
                     <ChallengeEditorForm
-                        challenge={validDraftChallenge}
+                        challenge={{
+                            ...validDraftChallenge,
+                            approvalStatus: 'PENDING_APPROVAL',
+                        }}
                         isReadOnly
                     />
                 </WorkAppContext.Provider>
@@ -1850,7 +2006,61 @@ describe('ChallengeEditorForm', () => {
         })
     })
 
-    it('launches a design draft before a screener member is assigned', async () => {
+    it('launches a fun challenge without budget approval', async () => {
+        let launchAction: (() => Promise<void>) | undefined
+
+        mockedUseFetchProjectBillingAccount.mockReturnValue({
+            billingAccount: {
+                active: true,
+                id: '80001063',
+                totalBudgetRemaining: 500,
+            },
+            isLoading: false,
+        })
+        mockedPatchChallenge.mockResolvedValue({
+            ...validDraftChallenge,
+            approvalStatus: 'APPROVED',
+            funChallenge: true,
+            status: 'ACTIVE',
+        })
+
+        render(
+            <MemoryRouter>
+                <ChallengeEditorForm
+                    challenge={{
+                        ...validDraftChallenge,
+                        approvalStatus: 'PENDING_APPROVAL',
+                        funChallenge: true,
+                    }}
+                    isReadOnly
+                    onRegisterLaunchAction={action => {
+                        launchAction = action
+                    }}
+                />
+            </MemoryRouter>,
+        )
+
+        await waitFor(() => {
+            expect(launchAction)
+                .toEqual(expect.any(Function))
+        })
+
+        await act(async () => {
+            await launchAction?.()
+        })
+
+        await waitFor(() => {
+            expect(mockedPatchChallenge)
+                .toHaveBeenCalledWith('12345', expect.objectContaining({
+                    funChallenge: true,
+                    status: 'ACTIVE',
+                }))
+        })
+        expect(mockedShowErrorToast)
+            .not.toHaveBeenCalledWith('Challenge launch is blocked until budget approval is Approved.')
+    })
+
+    it('launches a design draft before screening members are assigned', async () => {
         let launchAction: (() => Promise<void>) | undefined
 
         mockedUseFetchChallengeTracks.mockReturnValue({
@@ -1878,14 +2088,14 @@ describe('ChallengeEditorForm', () => {
             isLoading: false,
         })
         mockedPatchChallenge.mockResolvedValue({
-            ...designChallengeWithDeferredScreener,
+            ...designChallengeWithDeferredScreeners,
             status: 'ACTIVE',
         })
 
         render(
             <MemoryRouter>
                 <ChallengeEditorForm
-                    challenge={designChallengeWithDeferredScreener}
+                    challenge={designChallengeWithDeferredScreeners}
                     isReadOnly
                     onRegisterLaunchAction={action => {
                         launchAction = action
@@ -1911,6 +2121,10 @@ describe('ChallengeEditorForm', () => {
                             phaseId: 'screening-phase-id',
                             scorecardId: 'screening-scorecard-id',
                         }),
+                        expect.objectContaining({
+                            phaseId: 'checkpoint-screening-phase-id',
+                            scorecardId: 'checkpoint-screening-scorecard-id',
+                        }),
                     ]),
                     status: 'ACTIVE',
                 }))
@@ -2996,94 +3210,259 @@ describe('ChallengeEditorForm', () => {
             .toBeNull()
     })
 
-    it('does not delete manual iterative reviewer resources when saving a first2finish draft', async () => {
-        const user = userEvent.setup()
-
+    it('uses the simplified screener review for a copilot editing a Design Challenge', () => {
         mockedUseFetchChallengeTracks.mockReturnValue({
             isLoading: false,
             tracks: [{
-                id: 'design-track',
+                id: 'design-track-id',
                 name: 'Design',
                 track: 'DESIGN',
             }],
         })
         mockedUseFetchChallengeTypes.mockReturnValue({
             challengeTypes: [{
-                abbreviation: 'F2F',
-                id: 'design-first2finish',
-                isTask: false,
-                name: 'First2Finish',
+                abbreviation: 'CH',
+                id: 'design-challenge-type-id',
+                name: 'Challenge',
             }],
             isLoading: false,
         })
-        mockedUseFetchResourceRoles.mockReturnValue({
-            error: undefined,
-            isError: false,
+
+        render(
+            <MemoryRouter>
+                <WorkAppContext.Provider value={copilotContextValue}>
+                    <ChallengeEditorForm challenge={designChallengeWithDeferredScreeners} />
+                </WorkAppContext.Provider>
+            </MemoryRouter>,
+        )
+
+        expect(screen.getByTestId('reviewers-field'))
+            .toHaveAttribute('data-screener-only', 'true')
+    })
+
+    it('uses persisted Design Challenge metadata for the copilot review gate', () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
             isLoading: false,
-            resourceRoles: [{
-                id: 'iterative-reviewer-role-id',
-                name: 'Iterative Reviewer',
-            }],
+            tracks: [],
         })
-        mockedUseFetchResources.mockReturnValue({
-            error: undefined,
-            isError: false,
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [],
             isLoading: false,
-            mutate: jest.fn(),
-            resources: [{
-                challengeId: '12345',
-                memberHandle: 'taasiintake300',
-                memberId: 'manual-reviewer-member-id',
-                role: 'Iterative Reviewer',
-                roleId: 'iterative-reviewer-role-id',
-            }],
         })
-        mockedPatchChallenge.mockResolvedValue(first2FinishDraftChallenge)
 
         render(
             <MemoryRouter>
-                <ChallengeEditorForm challenge={first2FinishDraftChallenge} />
+                <WorkAppContext.Provider value={copilotContextValue}>
+                    <ChallengeEditorForm
+                        challenge={{
+                            ...designChallengeWithDeferredScreeners,
+                            track: {
+                                abbreviation: 'DESIGN',
+                                name: 'Design',
+                            },
+                        }}
+                    />
+                </WorkAppContext.Provider>
             </MemoryRouter>,
         )
 
-        await user.type(screen.getByLabelText('Challenge Name'), ' updated')
-        await user.click(screen.getByRole('button', { name: 'Save Challenge' }))
-
-        await waitFor(() => {
-            expect(mockedPatchChallenge)
-                .toHaveBeenCalledTimes(1)
-        })
-
-        expect(mockedDeleteResource)
-            .not.toHaveBeenCalled()
+        expect(screen.getByTestId('reviewers-field'))
+            .toHaveAttribute('data-screener-only', 'true')
     })
 
-    it('does not delete submitter resources when saving a non-task draft', async () => {
-        const user = userEvent.setup()
-
+    it('uses the simplified screener review for an admin editing a Design Challenge', () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            isLoading: false,
+            tracks: [{
+                id: 'design-track-id',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
         mockedUseFetchChallengeTypes.mockReturnValue({
             challengeTypes: [{
                 abbreviation: 'CH',
-                id: 'type-id',
-                isTask: false,
+                id: 'design-challenge-type-id',
                 name: 'Challenge',
             }],
             isLoading: false,
         })
-        mockedUseFetchResourceRoles.mockReturnValue({
-            error: undefined,
-            isError: false,
-            isLoading: false,
-            resourceRoles: [{
-                id: 'submitter-role-id',
-                name: 'Submitter',
-            }],
-        })
-        mockedUseFetchResources.mockReturnValue({
-            error: undefined,
-            isError: false,
-            isLoading: false,
-            mutate: jest.fn(),
+        const adminContextValue: WorkAppContextModel = {
+            ...copilotContextValue,
+            isAdmin: true,
+            userRoles: ['administrator'],
+        }
+
+        render(
+            <MemoryRouter>
+                <WorkAppContext.Provider value={adminContextValue}>
+                    <ChallengeEditorForm challenge={designChallengeWithDeferredScreeners} />
+                </WorkAppContext.Provider>
+            </MemoryRouter>,
+        )
+
+        expect(screen.getByTestId('reviewers-field'))
+            .toHaveAttribute('data-screener-only', 'true')
+        expect(screen.getByTestId('reviewers-field'))
+            .toHaveAttribute('data-can-configure-full-review', 'true')
+    })
+
+    it('uses the simplified screener review for a manager editing a Design Challenge', () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            isLoading: false,
+            tracks: [{
+                id: 'design-track-id',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'CH',
+                id: 'design-challenge-type-id',
+                name: 'Challenge',
+            }],
+            isLoading: false,
+        })
+        const managerContextValue: WorkAppContextModel = {
+            ...copilotContextValue,
+            isCopilot: false,
+            isManager: true,
+            userRoles: ['project manager'],
+        }
+
+        render(
+            <MemoryRouter>
+                <WorkAppContext.Provider value={managerContextValue}>
+                    <ChallengeEditorForm challenge={designChallengeWithDeferredScreeners} />
+                </WorkAppContext.Provider>
+            </MemoryRouter>,
+        )
+
+        expect(screen.getByTestId('reviewers-field'))
+            .toHaveAttribute('data-screener-only', 'true')
+        expect(screen.getByTestId('reviewers-field'))
+            .toHaveAttribute('data-can-configure-full-review', 'false')
+    })
+
+    it('keeps the full review configuration for a copilot editing a Design First2Finish', () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            isLoading: false,
+            tracks: [{
+                id: 'design-track',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'F2F',
+                id: 'design-first2finish',
+                name: 'First2Finish',
+            }],
+            isLoading: false,
+        })
+
+        render(
+            <MemoryRouter>
+                <WorkAppContext.Provider value={copilotContextValue}>
+                    <ChallengeEditorForm challenge={first2FinishDraftChallenge} />
+                </WorkAppContext.Provider>
+            </MemoryRouter>,
+        )
+
+        expect(screen.getByTestId('reviewers-field'))
+            .toHaveAttribute('data-screener-only', 'false')
+    })
+
+    it('does not delete manual iterative reviewer resources when saving a first2finish draft', async () => {
+        const user = userEvent.setup()
+
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            isLoading: false,
+            tracks: [{
+                id: 'design-track',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'F2F',
+                id: 'design-first2finish',
+                isTask: false,
+                name: 'First2Finish',
+            }],
+            isLoading: false,
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            error: undefined,
+            isError: false,
+            isLoading: false,
+            resourceRoles: [{
+                id: 'iterative-reviewer-role-id',
+                name: 'Iterative Reviewer',
+            }],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            error: undefined,
+            isError: false,
+            isLoading: false,
+            mutate: jest.fn(),
+            resources: [{
+                challengeId: '12345',
+                memberHandle: 'taasiintake300',
+                memberId: 'manual-reviewer-member-id',
+                role: 'Iterative Reviewer',
+                roleId: 'iterative-reviewer-role-id',
+            }],
+        })
+        mockedPatchChallenge.mockResolvedValue(first2FinishDraftChallenge)
+
+        render(
+            <MemoryRouter>
+                <ChallengeEditorForm challenge={first2FinishDraftChallenge} />
+            </MemoryRouter>,
+        )
+
+        await user.type(screen.getByLabelText('Challenge Name'), ' updated')
+        await user.click(screen.getByRole('button', { name: 'Save Challenge' }))
+
+        await waitFor(() => {
+            expect(mockedPatchChallenge)
+                .toHaveBeenCalledTimes(1)
+        })
+
+        expect(mockedDeleteResource)
+            .not.toHaveBeenCalled()
+    })
+
+    it('does not delete submitter resources when saving a non-task draft', async () => {
+        const user = userEvent.setup()
+
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'CH',
+                id: 'type-id',
+                isTask: false,
+                name: 'Challenge',
+            }],
+            isLoading: false,
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            error: undefined,
+            isError: false,
+            isLoading: false,
+            resourceRoles: [{
+                id: 'submitter-role-id',
+                name: 'Submitter',
+            }],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            error: undefined,
+            isError: false,
+            isLoading: false,
+            mutate: jest.fn(),
             resources: [{
                 challengeId: '12345',
                 memberHandle: 'task-user',
@@ -3379,6 +3758,11 @@ describe('ChallengeEditorForm', () => {
         let launchAction: (() => Promise<void>) | undefined
         let launchError: Error | undefined
 
+        mockedUseFetchProjectBillingAccount.mockReturnValue({
+            billingAccount: undefined,
+            isLoading: false,
+        })
+
         mockedUseFetchChallengeTracks.mockReturnValue({
             isLoading: false,
             tracks: [{
@@ -4136,7 +4520,31 @@ describe('ChallengeEditorForm', () => {
         })
     })
 
-    it('saves a new design draft before a screener member is assigned', async () => {
+    it('shows the concrete schema error when saving an invalid draft', async () => {
+        const user = userEvent.setup()
+
+        render(
+            <MemoryRouter>
+                <ChallengeEditorForm
+                    challenge={{
+                        ...validNewChallenge,
+                        description: '',
+                    }}
+                />
+            </MemoryRouter>,
+        )
+
+        await user.click(screen.getByRole('button', { name: 'Save as Draft' }))
+
+        expect(await screen.findByText('Public specification must be at least 10 characters'))
+            .toBeInTheDocument()
+        expect(screen.queryByText('Please fix validation errors before saving.'))
+            .not.toBeInTheDocument()
+        expect(mockedPatchChallenge)
+            .not.toHaveBeenCalled()
+    })
+
+    it('saves a new design draft before screening members are assigned', async () => {
         const user = userEvent.setup()
 
         mockedUseFetchChallengeTracks.mockReturnValue({
@@ -4156,7 +4564,7 @@ describe('ChallengeEditorForm', () => {
             isLoading: false,
         })
         mockedPatchChallenge.mockResolvedValue({
-            ...designChallengeWithDeferredScreener,
+            ...designChallengeWithDeferredScreeners,
             status: 'DRAFT',
         })
 
@@ -4164,7 +4572,7 @@ describe('ChallengeEditorForm', () => {
             <MemoryRouter initialEntries={['/projects/100578/challenges/new']}>
                 <ChallengeEditorForm
                     challenge={{
-                        ...designChallengeWithDeferredScreener,
+                        ...designChallengeWithDeferredScreeners,
                         status: 'NEW',
                     }}
                     projectId='100578'
@@ -4183,12 +4591,251 @@ describe('ChallengeEditorForm', () => {
                             phaseId: 'screening-phase-id',
                             scorecardId: 'screening-scorecard-id',
                         }),
+                        expect.objectContaining({
+                            phaseId: 'checkpoint-screening-phase-id',
+                            scorecardId: 'checkpoint-screening-scorecard-id',
+                        }),
+                    ]),
+                    status: 'DRAFT',
+                }))
+        })
+        expect(mockedShowErrorToast)
+            .not.toHaveBeenCalledWith(expect.stringContaining('Assign all required members'))
+    })
+
+    it('saves a two-round design draft with private copilot reviewers', async () => {
+        const user = userEvent.setup()
+
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            isLoading: false,
+            tracks: [{
+                id: 'design-track-id',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'CH',
+                id: 'design-challenge-type-id',
+                name: 'Challenge',
+            }],
+            isLoading: false,
+        })
+        mockedPatchChallenge.mockResolvedValue({
+            ...twoRoundDesignChallengeWithCopilotReviewers,
+            status: 'DRAFT',
+        })
+        mockedFetchProfile.mockResolvedValue({
+            handle: 'TCConnCopilot',
+            userId: '40158994',
+        })
+        mockedFetchResourceRolesService.mockResolvedValue([
+            {
+                id: 'copilot-role-id',
+                name: 'Copilot',
+            },
+            {
+                id: 'checkpoint-reviewer-role-id',
+                name: 'Checkpoint Reviewer',
+            },
+            {
+                id: 'reviewer-role-id',
+                name: 'Reviewer',
+            },
+            {
+                id: 'approver-role-id',
+                name: 'Approver',
+            },
+        ])
+
+        render(
+            <MemoryRouter initialEntries={['/projects/100578/challenges/new']}>
+                <WorkAppContext.Provider value={copilotContextValue}>
+                    <ChallengeEditorForm
+                        challenge={{
+                            ...twoRoundDesignChallengeWithCopilotReviewers,
+                            status: 'NEW',
+                        }}
+                        projectId='100578'
+                    />
+                </WorkAppContext.Provider>
+            </MemoryRouter>,
+        )
+
+        await user.type(screen.getByLabelText('Challenge Name'), ' updated')
+        await user.click(screen.getByRole('button', { name: 'Save as Draft' }))
+
+        await waitFor(() => {
+            expect(mockedPatchChallenge)
+                .toHaveBeenCalledWith('12345', expect.objectContaining({
+                    reviewers: expect.arrayContaining([
+                        expect.objectContaining({
+                            memberId: 'screener-member-id',
+                            phaseId: 'checkpoint-screening-phase-id',
+                        }),
+                        expect.objectContaining({
+                            memberId: '40158994',
+                            phaseId: 'checkpoint-review-phase-id',
+                            shouldOpenOpportunity: false,
+                        }),
+                        expect.objectContaining({
+                            memberId: 'screener-member-id',
+                            phaseId: 'screening-phase-id',
+                        }),
+                        expect.objectContaining({
+                            memberId: '40158994',
+                            phaseId: 'review-phase-id',
+                            shouldOpenOpportunity: false,
+                        }),
+                        expect.objectContaining({
+                            memberId: '40158994',
+                            phaseId: 'approval-phase-id',
+                            shouldOpenOpportunity: false,
+                        }),
                     ]),
                     status: 'DRAFT',
                 }))
         })
+        expect(mockedShowErrorToast)
+            .not.toHaveBeenCalledWith(expect.stringContaining('validation'))
         expect(mockedShowErrorToast)
             .not.toHaveBeenCalledWith(expect.stringContaining('Assign all required members'))
+        await waitFor(() => {
+            expect(mockedCreateResource.mock.calls)
+                .toEqual(expect.arrayContaining([
+                    [{
+                        challengeId: '12345',
+                        memberHandle: 'TCConnCopilot',
+                        roleId: 'checkpoint-reviewer-role-id',
+                    }],
+                    [{
+                        challengeId: '12345',
+                        memberHandle: 'TCConnCopilot',
+                        roleId: 'reviewer-role-id',
+                    }],
+                    [{
+                        challengeId: '12345',
+                        memberHandle: 'TCConnCopilot',
+                        roleId: 'approver-role-id',
+                    }],
+                ]))
+        })
+    })
+
+    it('highlights the copilot field when private design reviewers cannot be assigned', async () => {
+        const user = userEvent.setup()
+
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            isLoading: false,
+            tracks: [{
+                id: 'design-track-id',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'CH',
+                id: 'design-challenge-type-id',
+                name: 'Challenge',
+            }],
+            isLoading: false,
+        })
+
+        render(
+            <MemoryRouter initialEntries={['/projects/100578/challenges/new']}>
+                <ChallengeEditorForm
+                    challenge={{
+                        ...twoRoundDesignChallengeWithCopilotReviewers,
+                        copilot: undefined,
+                        reviewers: twoRoundDesignChallengeWithCopilotReviewers.reviewers
+                            ?.map(reviewer => ({
+                                ...reviewer,
+                                handle: undefined,
+                                memberId: [
+                                    'checkpoint-review-phase-id',
+                                    'review-phase-id',
+                                    'approval-phase-id',
+                                ].includes(reviewer.phaseId || '')
+                                    ? undefined
+                                    : reviewer.memberId,
+                            })),
+                        status: 'NEW',
+                    }}
+                    projectId='100578'
+                />
+            </MemoryRouter>,
+        )
+
+        await user.click(screen.getByRole('button', { name: 'Save as Draft' }))
+
+        expect(await screen.findByRole('alert'))
+            .toHaveTextContent('Select a copilot to assign Checkpoint Review, Review, and Approval.')
+        expect(mockedPatchChallenge)
+            .not.toHaveBeenCalled()
+    })
+
+    it('keeps submission-limit metadata visible when the draft save response omits metadata', async () => {
+        const user = userEvent.setup()
+        const submissionLimitMetadata = [{
+            name: 'submissionLimit',
+            value: JSON.stringify({
+                count: '2',
+                limit: 'true',
+                unlimited: 'false',
+            }),
+        }]
+
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            isLoading: false,
+            tracks: [{
+                id: 'design-track-id',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'CH',
+                id: 'design-challenge-type-id',
+                name: 'Challenge',
+            }],
+            isLoading: false,
+        })
+        mockedPatchChallenge.mockResolvedValue({
+            ...designChallengeWithDeferredScreeners,
+            metadata: [],
+            status: 'DRAFT',
+        })
+
+        render(
+            <MemoryRouter initialEntries={['/projects/100578/challenges/new']}>
+                <ChallengeEditorForm
+                    challenge={{
+                        ...designChallengeWithDeferredScreeners,
+                        metadata: submissionLimitMetadata,
+                        status: 'NEW',
+                    }}
+                    projectId='100578'
+                />
+            </MemoryRouter>,
+        )
+
+        expect(screen.getByTestId('maximum-submissions-field'))
+            .toHaveAttribute('data-metadata', JSON.stringify(submissionLimitMetadata))
+
+        await user.type(screen.getByLabelText('Challenge Name'), ' updated')
+        await user.click(screen.getByRole('button', { name: 'Save as Draft' }))
+
+        await waitFor(() => {
+            expect(mockedPatchChallenge)
+                .toHaveBeenCalledTimes(1)
+            expect(mockedShowSuccessToast)
+                .toHaveBeenCalled()
+            expect(screen.getByTestId('maximum-submissions-field'))
+                .toHaveAttribute('data-metadata', JSON.stringify(submissionLimitMetadata))
+        })
     })
 
     it('reports DRAFT status when task assignee sync fails after the challenge save', async () => {
@@ -4368,6 +5015,7 @@ describe('ChallengeEditorForm', () => {
         await user.type(screen.getByLabelText('Challenge Name'), 'Design challenge')
         await user.type(screen.getByLabelText('Challenge Track'), 'design-track')
         await user.type(screen.getByLabelText('Challenge Type'), 'design-challenge')
+        await user.type(screen.getByLabelText('Copilot Field'), 'TCConnCopilot')
 
         await waitFor(() => {
             expect(screen.getByLabelText('Work Type'))
@@ -4416,6 +5064,7 @@ describe('ChallengeEditorForm', () => {
         await user.type(screen.getByLabelText('Challenge Name'), 'Design challenge')
         await user.type(screen.getByLabelText('Challenge Track'), 'design-track')
         await user.type(screen.getByLabelText('Challenge Type'), 'design-challenge')
+        await user.type(screen.getByLabelText('Copilot Field'), 'TCConnCopilot')
         await user.type(screen.getByLabelText('Work Type'), 'Web Design')
         await user.click(screen.getByRole('button', { name: 'New' }))
 
@@ -4505,6 +5154,7 @@ describe('ChallengeEditorForm', () => {
         await user.type(screen.getByLabelText('Challenge Type'), 'challenge-type-id')
 
         if (workType) {
+            await user.type(screen.getByLabelText('Copilot Field'), 'TCConnCopilot')
             await user.type(screen.getByLabelText('Work Type'), workType)
         }
 
@@ -4524,6 +5174,73 @@ describe('ChallengeEditorForm', () => {
         })
     })
 
+    it.each([
+        {
+            expectedShowDataDashboard: 'true',
+            isFunChallenge: true,
+        },
+        {
+            expectedShowDataDashboard: 'false',
+            isFunChallenge: false,
+        },
+    ])('creates a Marathon Match with show_data_dashboard $expectedShowDataDashboard', async ({
+        expectedShowDataDashboard,
+        isFunChallenge,
+    }: {
+        expectedShowDataDashboard: string
+        isFunChallenge: boolean
+    }) => {
+        const user = userEvent.setup()
+
+        mockedUseFetchChallengeTypes.mockReturnValue({
+            challengeTypes: [{
+                abbreviation: 'MM',
+                id: 'marathon-match-id',
+                isActive: true,
+                isTask: false,
+                name: 'Marathon Match',
+            }],
+            isLoading: false,
+        })
+        mockedCreateChallenge.mockResolvedValue({
+            id: 'created-challenge-id',
+            name: 'Marathon Match challenge',
+            status: 'NEW',
+        })
+        mockedFetchChallenge.mockResolvedValue({
+            id: 'created-challenge-id',
+            name: 'Marathon Match challenge',
+            status: 'NEW',
+        })
+
+        render(
+            <MemoryRouter>
+                <ChallengeEditorForm projectId='12345' />
+            </MemoryRouter>,
+        )
+
+        await user.type(screen.getByLabelText('Challenge Name'), 'Marathon Match challenge')
+        await user.type(screen.getByLabelText('Challenge Track'), 'track-id')
+        await user.type(screen.getByLabelText('Challenge Type'), 'marathon-match-id')
+
+        if (isFunChallenge) {
+            await user.click(screen.getByRole('checkbox', { name: 'Fun Challenge' }))
+        }
+
+        await user.click(screen.getByRole('button', { name: 'New' }))
+
+        await waitFor(() => {
+            expect(mockedCreateChallenge)
+                .toHaveBeenCalledWith(expect.objectContaining({
+                    funChallenge: isFunChallenge,
+                    metadata: expect.arrayContaining([{
+                        name: 'show_data_dashboard',
+                        value: expectedShowDataDashboard,
+                    }]),
+                }))
+        })
+    })
+
     it('creates a forum discussion for forum-enabled challenge types', async () => {
         const user = userEvent.setup()
 
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.tsx
index 682a8afe7..b71d0acf1 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.tsx
@@ -85,7 +85,11 @@ import {
     transformChallengeToFormData,
     transformFormDataToChallenge,
 } from '../../../../lib/utils'
-import { booleanToMetadata } from '../../../../lib/utils/metadata.utils'
+import {
+    booleanToMetadata,
+    getMetadataValue,
+    setMetadataValue,
+} from '../../../../lib/utils/metadata.utils'
 import { isScreenerAssignmentOptional } from '../../../../lib/utils/reviewer.utils'
 import {
     getProjectBillingAccountChallengeErrorMessage,
@@ -184,6 +188,10 @@ import {
 import {
     RoundTypeField,
 } from './RoundTypeField'
+import {
+    ShowDashboardField,
+    SHOW_DATA_DASHBOARD_METADATA_FIELD,
+} from './ShowDashboardField'
 import {
     StockArtsField,
 } from './StockArtsField'
@@ -288,9 +296,31 @@ interface PersistCreatedChallengeCopilotResult {
     warningMessage?: string
 }
 
+interface DesignCopilotReviewerAssignmentConfig {
+    phaseName: string
+    roleNames: readonly string[]
+}
+
 const SAVE_VALIDATION_ERROR_MESSAGE = 'Please fix validation errors before saving.'
 const SAVED_BUTTON_STATE_DURATION_MS = 2000
 const DESIGN_WORK_TYPE_REQUIRED_MESSAGE = 'Select a work type'
+const DESIGN_REVIEW_COPILOT_REQUIRED_MESSAGE
+    = 'Select a copilot to assign Checkpoint Review, Review, and Approval.'
+const DESIGN_REVIEW_COPILOT_ERROR_TYPE = 'designReviewCopilotRequired'
+const DESIGN_COPILOT_REVIEWER_ASSIGNMENT_CONFIGS: readonly DesignCopilotReviewerAssignmentConfig[] = [
+    {
+        phaseName: 'Checkpoint Review',
+        roleNames: ['Checkpoint Reviewer'],
+    },
+    {
+        phaseName: 'Review',
+        roleNames: ['Reviewer'],
+    },
+    {
+        phaseName: 'Approval',
+        roleNames: ['Approver'],
+    },
+]
 const TASK_ASSIGNED_MEMBER_REQUIRED_FOR_LAUNCH_MESSAGE
     = 'Assign a member before launching a task challenge.'
 const APPROVAL_REQUIRED_FOR_LAUNCH_MESSAGE
@@ -464,6 +494,45 @@ function normalizeTextValue(value: unknown): string {
     return value.trim()
 }
 
+/**
+ * Finds the first user-facing message in React Hook Form's nested validation errors.
+ *
+ * @param errors field-error tree supplied to the invalid-submit callback.
+ * @returns the first non-empty validation message, or `undefined` when none is available.
+ * @remarks Nested and array fields, including hidden reviewer rows, do not expose a root-level
+ * message. The save footer uses this helper so every rejected submit explains what must be fixed.
+ * @throws Does not throw; cyclic field references are ignored.
+ */
+function getFirstFormValidationMessage(errors: unknown): string | undefined {
+    const visitedValues = new Set<object>()
+
+    function findMessage(value: unknown): string | undefined {
+        if (!value || typeof value !== 'object' || visitedValues.has(value)) {
+            return undefined
+        }
+
+        visitedValues.add(value)
+
+        const message = normalizeTextValue((value as { message?: unknown }).message)
+        if (message) {
+            return message
+        }
+
+        for (const [key, childValue] of Object.entries(value)) {
+            if (key !== 'ref') {
+                const childMessage = findMessage(childValue)
+                if (childMessage) {
+                    return childMessage
+                }
+            }
+        }
+
+        return undefined
+    }
+
+    return findMessage(errors)
+}
+
 /**
  * Normalizes challenge term form values into term ids.
  *
@@ -929,6 +998,101 @@ function normalizeReviewerPhaseId(phase: {
     return normalizeTextValue(phase?.phaseId) || normalizeTextValue(phase?.id)
 }
 
+/**
+ * Assigns the selected Design Challenge copilot to the hidden private reviewer phases.
+ *
+ * @param formData current challenge form snapshot containing phases, reviewers, and copilot.
+ * @param copilotMemberId resolved Topcoder member id for the selected copilot.
+ * @returns a form-data copy whose Checkpoint Review, Review, and Approval rows are private and
+ * assigned to the copilot; unrelated reviewer rows are preserved.
+ * @remarks Used immediately before save serialization so the challenge payload and reviewer
+ * resource assignments carry the same member identity.
+ * @throws Does not throw.
+ */
+function applyDesignCopilotReviewerAssignments(
+    formData: ChallengeEditorFormData,
+    copilotMemberId: string,
+): ChallengeEditorFormData {
+    const selectedCopilot = normalizeTextValue(formData.copilot)
+    const phaseNameById = new Map(
+        (Array.isArray(formData.phases)
+            ? formData.phases
+            : [])
+            .map(phase => {
+                const phaseId = normalizeReviewerPhaseId(phase)
+                const phaseName = normalizeTextValue(phase.name)
+
+                return phaseId && phaseName
+                    ? [phaseId, phaseName] as const
+                    : undefined
+            })
+            .filter((entry): entry is readonly [string, string] => !!entry),
+    )
+    const copilotReviewPhaseKeys = new Set(
+        DESIGN_COPILOT_REVIEWER_ASSIGNMENT_CONFIGS
+            .map(config => normalizeReviewerPhaseName(config.phaseName)),
+    )
+    const reviewers = (Array.isArray(formData.reviewers)
+        ? formData.reviewers
+        : [])
+        .map(reviewer => {
+            const phaseName = phaseNameById.get(normalizeReviewerPhaseId(reviewer))
+
+            if (
+                isAiReviewer(reviewer)
+                || !copilotReviewPhaseKeys.has(normalizeReviewerPhaseName(phaseName))
+            ) {
+                return reviewer
+            }
+
+            return {
+                ...reviewer,
+                additionalMemberIds: undefined,
+                handle: selectedCopilot || undefined,
+                memberId: copilotMemberId,
+                memberReviewerCount: 1,
+                shouldOpenOpportunity: false,
+            }
+        })
+
+    return {
+        ...formData,
+        reviewers,
+    }
+}
+
+/**
+ * Resolves the selected copilot handle to the member id required by private reviewer rows.
+ *
+ * @param copilot selected copilot handle or an already-normalized numeric member id.
+ * @returns the selected copilot's Topcoder member id.
+ * @remarks Used by the save flow before reviewer payload serialization.
+ * @throws when the selection is empty or the member profile cannot provide a user id.
+ */
+async function resolveDesignCopilotReviewerMemberId(copilot: unknown): Promise<string> {
+    const selectedCopilot = normalizeTextValue(copilot)
+
+    if (!selectedCopilot) {
+        throw new Error(DESIGN_REVIEW_COPILOT_REQUIRED_MESSAGE)
+    }
+
+    if (/^\d+$/.test(selectedCopilot)) {
+        return selectedCopilot
+    }
+
+    const profile = await fetchProfile(selectedCopilot)
+    const memberId = profile?.userId === undefined || profile?.userId === null
+        ? ''
+        : String(profile.userId)
+            .trim()
+
+    if (!memberId) {
+        throw new Error('Unable to resolve the selected copilot for reviewer assignment.')
+    }
+
+    return memberId
+}
+
 function isMarathonMatchChallengeTypeByNameAndAbbreviation({
     abbreviation,
     name,
@@ -2017,17 +2181,17 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
     )
     const isChallengeTypeSelected = useMemo(
         (): boolean => {
-            const normalizedChallengeTypeName = (selectedChallengeType?.name || '')
+            const normalizedChallengeTypeName = (resolvedChallengeTypeName || '')
                 .trim()
                 .toUpperCase()
-            const normalizedChallengeTypeAbbreviation = (selectedChallengeType?.abbreviation || '')
+            const normalizedChallengeTypeAbbreviation = (resolvedChallengeTypeAbbreviation || '')
                 .trim()
                 .toUpperCase()
 
             return normalizedChallengeTypeName === CHALLENGE_TYPE_CHALLENGE_NAME
                 || normalizedChallengeTypeAbbreviation === CHALLENGE_TYPE_CHALLENGE_ABBREVIATION
         },
-        [selectedChallengeType],
+        [resolvedChallengeTypeAbbreviation, resolvedChallengeTypeName],
     )
     const isTaskChallengeSelected = useMemo(
         (): boolean => isTaskChallengeType(selectedChallengeType)
@@ -2188,6 +2352,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
     const isChallengeCreated = !!currentChallengeId
     const isFunChallengeSelected = values.funChallenge === true
     const showFunChallengeField = isMarathonMatchChallengeSelected
+    const showDashboardField = isMarathonMatchChallengeSelected
     const showMarathonMatchScorerSection = isMarathonMatchChallengeSelected && isChallengeCreated
     const showRateChallengeField = isMarathonMatchChallengeSelected || isDevelopmentChallengeSelected
     const showPrizesAndBillingSection = !isFunChallengeSelected
@@ -2219,6 +2384,57 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
     const shouldUseCopilotBillingSummary = workAppContext.isCopilot
         && !workAppContext.isAdmin
         && !workAppContext.isManager
+    const shouldUseSimplifiedDesignReview = isDesignTrackSelected
+        && isChallengeTypeSelected
+    /**
+     * Validates the copilot required for hidden private Design reviewer assignments.
+     *
+     * @param formData current challenge form snapshot.
+     * @returns `true` when the simplified review flow is not active or a copilot is selected;
+     * otherwise registers the visible Copilot field error and returns `false`.
+     * @throws Does not throw.
+     */
+    const validateDesignReviewCopilotSelection = useCallback((
+        formData: ChallengeEditorFormData,
+    ): boolean => {
+        if (
+            !shouldUseSimplifiedDesignReview
+            || normalizeTextValue(formData.copilot)
+        ) {
+            return true
+        }
+
+        setError('copilot', {
+            message: DESIGN_REVIEW_COPILOT_REQUIRED_MESSAGE,
+            type: DESIGN_REVIEW_COPILOT_ERROR_TYPE,
+        })
+        setSaveStatus('idle')
+        setSaveValidationError(DESIGN_REVIEW_COPILOT_REQUIRED_MESSAGE)
+
+        return false
+    }, [
+        setError,
+        shouldUseSimplifiedDesignReview,
+    ])
+
+    useEffect(() => {
+        if (
+            !normalizeTextValue(values.copilot)
+            || formState.errors.copilot?.type !== DESIGN_REVIEW_COPILOT_ERROR_TYPE
+        ) {
+            return
+        }
+
+        clearErrors('copilot')
+        if (saveValidationError === DESIGN_REVIEW_COPILOT_REQUIRED_MESSAGE) {
+            setSaveValidationError(undefined)
+        }
+    }, [
+        clearErrors,
+        formState.errors.copilot?.type,
+        saveValidationError,
+        values.copilot,
+    ])
     const getPersistedAssignmentValueByFields = useCallback((
         fallbackValue: string | undefined,
         roleNames: readonly string[],
@@ -2480,7 +2696,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             fetchResources(challengeId),
             loadSingleAssignmentResourceRoles(),
         ])
-        const resourceSyncOperations = getSingleAssignmentConfigs(
+        const resourceSyncOperations: Promise<void>[] = getSingleAssignmentConfigs(
             isTaskSingleAssignmentChallenge(formData),
         )
             .map(config => {
@@ -2506,6 +2722,36 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                     })
             })
             .filter((operation): operation is Promise<void> => !!operation)
+        const selectedCopilot = getSingleAssignmentFieldValue(formData, 'copilot')
+
+        if (shouldUseSimplifiedDesignReview && selectedCopilot) {
+            DESIGN_COPILOT_REVIEWER_ASSIGNMENT_CONFIGS.forEach(config => {
+                const persistedValue = getPersistedAssignmentValueByFields(
+                    undefined,
+                    config.roleNames,
+                    ['memberHandle', 'memberId'],
+                    persistedResources,
+                    persistedResourceRoles,
+                )
+
+                if (hasSameNormalizedValue(selectedCopilot, persistedValue)) {
+                    return
+                }
+
+                resourceSyncOperations.push(syncSingleAssignmentResource({
+                    challengeId,
+                    nextValue: selectedCopilot,
+                    resourceRolesOverride: persistedResourceRoles,
+                    resourcesOverride: persistedResources,
+                    resourceValueFields: [
+                        'memberHandle',
+                        'memberId',
+                    ],
+                    roleNames: config.roleNames,
+                    valueField: 'memberHandle',
+                }))
+            })
+        }
 
         if (resourceSyncOperations.length === 0) {
             return
@@ -2518,6 +2764,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
         isTaskSingleAssignmentChallenge,
         loadSingleAssignmentResourceRoles,
         mutateChallengeResources,
+        shouldUseSimplifiedDesignReview,
         syncSingleAssignmentResource,
     ])
     /**
@@ -3015,6 +3262,10 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                 return
             }
 
+            if (!validateDesignReviewCopilotSelection(getValues())) {
+                return
+            }
+
             clearErrors('workType')
             setSaveError(undefined)
             setSaveValidationError(undefined)
@@ -3064,7 +3315,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                     discussionForum: formData.discussionForum,
                     selectedChallengeType,
                 })
-                const metadata = booleanToMetadata(
+                const baseMetadata = booleanToMetadata(
                     booleanToMetadata(
                         formData.metadata,
                         REGISTERED_MEMBER_DOWNLOAD_METADATA_FIELD,
@@ -3073,6 +3324,14 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                     IS_TEST_CHALLENGE_METADATA_FIELD,
                     formData.isTestChallenge === true,
                 )
+                // Marathon Match fun challenges are created with the data dashboard enabled.
+                const metadata = isMarathonMatchChallengeSelected
+                    ? booleanToMetadata(
+                        baseMetadata,
+                        SHOW_DATA_DASHBOARD_METADATA_FIELD,
+                        formData.funChallenge === true,
+                    )
+                    : baseMetadata
                 const createdChallenge = await createChallenge({
                     discussions,
                     funChallenge: formData.funChallenge === true,
@@ -3160,6 +3419,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             fallbackProjectId,
             getValues,
             isDevelopmentTrackSelected,
+            isMarathonMatchChallengeSelected,
             isTaskSingleAssignmentChallenge,
             reset,
             onChallengeCreated,
@@ -3171,6 +3431,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             syncSingleAssignmentResource,
             timelineTemplates,
             trigger,
+            validateDesignReviewCopilotSelection,
         ],
     )
 
@@ -3220,6 +3481,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
 
             if (
                 isChallengeBeingActivated
+                && formData.funChallenge !== true
                 && normalizeStatus(formData.approvalStatus) !== CHALLENGE_APPROVAL_STATUS.APPROVED
             ) {
                 setSaveStatus('idle')
@@ -3288,6 +3550,40 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                     formDataToSave = getValues()
                 }
 
+                if (shouldUseSimplifiedDesignReview) {
+                    try {
+                        const copilotMemberId = await resolveDesignCopilotReviewerMemberId(
+                            formDataToSave.copilot,
+                        )
+
+                        formDataToSave = applyDesignCopilotReviewerAssignments(
+                            formDataToSave,
+                            copilotMemberId,
+                        )
+                        setValue('reviewers', formDataToSave.reviewers, {
+                            shouldDirty: false,
+                            shouldValidate: true,
+                        })
+                    } catch (error) {
+                        const errorMessage = error instanceof Error
+                            ? error.message
+                            : DESIGN_REVIEW_COPILOT_REQUIRED_MESSAGE
+
+                        setError('copilot', {
+                            message: errorMessage,
+                            type: DESIGN_REVIEW_COPILOT_ERROR_TYPE,
+                        })
+                        setSaveStatus('idle')
+                        setSaveValidationError(errorMessage)
+
+                        if (!options.isAutosave) {
+                            showErrorToast(errorMessage)
+                        }
+
+                        throw createHandledLaunchBlockError(errorMessage)
+                    }
+                }
+
                 const formDataWithProjectBilling = applyProjectBillingToChallengeFormData(
                     formDataToSave,
                     resolvedProjectBillingAccount,
@@ -3326,6 +3622,25 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                         formDataWithProjectBilling.phases,
                         persistedFormData.phases,
                     )
+                const savedMetadata = Array.isArray(savedChallengeSnapshot.metadata)
+                    ? persistedFormData.metadata
+                    : formDataWithProjectBilling.metadata
+                const submittedSubmissionLimit = getMetadataValue(
+                    formDataWithProjectBilling.metadata,
+                    'submissionLimit',
+                )
+                const savedSubmissionLimit = getMetadataValue(
+                    savedMetadata,
+                    'submissionLimit',
+                )
+                const postSaveMetadata = submittedSubmissionLimit === undefined
+                    || savedSubmissionLimit !== undefined
+                    ? savedMetadata
+                    : setMetadataValue(
+                        savedMetadata,
+                        'submissionLimit',
+                        submittedSubmissionLimit,
+                    )
 
                 const nextValues = applySingleAssignmentFieldValues(
                     await hydratePersistedSavedFormData(
@@ -3335,6 +3650,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                             attachments: Array.isArray(persistedFormData.attachments)
                                 ? persistedFormData.attachments
                                 : formDataWithProjectBilling.attachments,
+                            metadata: postSaveMetadata,
                         },
                     ),
                     formDataWithProjectBilling,
@@ -3414,6 +3730,8 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             selectedChallengeTrack,
             selectedChallengeType,
             setError,
+            setValue,
+            shouldUseSimplifiedDesignReview,
             syncDraftSingleAssignments,
             usesManualReviewers,
             viewModePath,
@@ -3534,14 +3852,20 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                 })
             },
             () => {
+                if (!validateDesignReviewCopilotSelection(getValues())) {
+                    throw new Error(DESIGN_REVIEW_COPILOT_REQUIRED_MESSAGE)
+                }
+
                 showErrorToast('Please fix validation errors before launching')
                 throw new Error('Challenge launch validation failed')
             },
         )()
     }, [
+        getValues,
         handleSubmit,
         isScorerBlockingChallengeActions,
         saveChallenge,
+        validateDesignReviewCopilotSelection,
     ])
 
     const launchChallengeRef = useRef(launchChallenge)
@@ -3623,6 +3947,10 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                 isSaveAsDraft,
             }: SaveStatusMetadata = getSaveStatusMetadata(formData.status, {})
 
+            if (!validateDesignReviewCopilotSelection(formData)) {
+                return
+            }
+
             if (isScorerBlockingChallengeActions) {
                 showErrorToast('Save a valid scorer configuration before saving the challenge')
                 return
@@ -3674,13 +4002,23 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             saveChallenge,
             scheduleValidationError,
             setError,
+            validateDesignReviewCopilotSelection,
         ],
     )
 
-    const onInvalidSubmit = useCallback((): void => {
+    const onInvalidSubmit = useCallback((errors: unknown): void => {
+        if (!validateDesignReviewCopilotSelection(getValues())) {
+            return
+        }
+
         setSaveStatus('idle')
-        setSaveValidationError(SAVE_VALIDATION_ERROR_MESSAGE)
-    }, [])
+        setSaveValidationError(
+            getFirstFormValidationMessage(errors) || SAVE_VALIDATION_ERROR_MESSAGE,
+        )
+    }, [
+        getValues,
+        validateDesignReviewCopilotSelection,
+    ])
 
     const statusText = useMemo(
         () => getStatusText(isSaving ? 'saving' : saveStatus),
@@ -3833,10 +4171,12 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                 <h3 className={styles.sectionTitle}>Review</h3>
                 <div className={styles.block}>
                     <ReviewersField
+                        canConfigureFullReview={workAppContext.isAdmin}
                         isReadOnly={isReadOnly}
                         onConfigSaveControllerReady={function (controller: AiReviewConfigSaveController | undefined) {
                             aiReviewConfigSaveControllerRef.current = controller
                         }}
+                        screenerOnly={shouldUseSimplifiedDesignReview}
                     />
                 </div>
             </section>
@@ -4182,6 +4522,9 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                                         {showRateChallengeField
                                             ? <RateChallengeField />
                                             : undefined}
+                                        {showDashboardField
+                                            ? <ShowDashboardField disabled={isReadOnly} />
+                                            : undefined}
                                         <TestChallengeField disabled={isReadOnly} />
                                     </div>
                                 </section>
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.spec.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.spec.tsx
index ee86b0b1f..da8966dfe 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.spec.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.spec.tsx
@@ -32,6 +32,7 @@ import {
     MAX_MANUAL_REVIEWER_COUNT,
 } from '../../../../../lib/constants/challenge-editor.constants'
 import {
+    createResource,
     deleteResource,
     fetchDefaultReviewers,
     fetchProfile,
@@ -39,6 +40,7 @@ import {
 } from '../../../../../lib/services'
 import {
     ChallengeEditorFormData,
+    Reviewer,
 } from '../../../../../lib/models'
 
 import HumanReviewTab from './HumanReviewTab'
@@ -68,6 +70,7 @@ jest.mock('../../../../../lib/components/form', () => ({
             control: formContext.control,
             name: props.name,
         })
+
         const selectedValue = typeof controller.field.value === 'string'
             ? controller.field.value
             : ''
@@ -156,8 +159,11 @@ jest.mock('../../../../../lib/components/form', () => ({
         )
     },
     FormUserAutocomplete: (props: {
+        disabled?: boolean
         label: string
         name: string
+        onValueChange?: (value: string) => void
+        placeholder?: string
         required?: boolean
     }) => {
         const {
@@ -170,13 +176,26 @@ jest.mock('../../../../../lib/components/form', () => ({
             name: props.name,
         })
 
+        function handleChange(event: ChangeEvent<HTMLInputElement>): void {
+            props.onValueChange?.(event.target.value)
+            controller.field.onChange(event.target.value)
+        }
+
         return (
             <div
                 data-required={String(props.required === true)}
                 data-testid={props.name}
                 data-value={controller.field.value || ''}
             >
-                <span>{props.label}</span>
+                <label htmlFor={props.name}>{props.label}</label>
+                <input
+                    aria-label={props.label}
+                    disabled={props.disabled}
+                    id={props.name}
+                    onChange={handleChange}
+                    placeholder={props.placeholder}
+                    value={controller.field.value || ''}
+                />
             </div>
         )
     },
@@ -221,6 +240,7 @@ const mockedUseFetchChallengeTracks = useFetchChallengeTracks as jest.Mock
 const mockedUseFetchChallengeTypes = useFetchChallengeTypes as jest.Mock
 const mockedUseFetchResourceRoles = useFetchResourceRoles as jest.Mock
 const mockedUseFetchResources = useFetchResources as jest.Mock
+const mockedCreateResource = createResource as jest.Mock
 const mockedDeleteResource = deleteResource as jest.Mock
 const mockedFetchDefaultReviewers = fetchDefaultReviewers as jest.Mock
 const mockedFetchProfile = fetchProfile as jest.Mock
@@ -257,11 +277,15 @@ interface TestHarnessProps {
     restoreStaleScorecardId?: boolean
     showAdditionalMemberIdsValue?: boolean
     showMemberValue?: boolean
+    showMemberValueIndex?: number
+    showSecondMemberValue?: boolean
     showPublicOpportunityValue?: boolean
     showRoleValue?: boolean
     showRoleValueIndex?: number
+    showReviewersValue?: boolean
     showScorecardValue?: boolean
     showScorecardValueIndex?: number
+    screenerOnly?: boolean
 }
 
 const baseDefaultValues: ChallengeEditorFormData = {
@@ -398,6 +422,7 @@ const TestHarness = (props: TestHarnessProps): JSX.Element => {
     })
     const roleValueIndex = props.showRoleValueIndex ?? 0
     const scorecardValueIndex = props.showScorecardValueIndex ?? 0
+    const memberValueIndex = props.showMemberValueIndex ?? 0
 
     useEffect(() => {
         if (!props.initialScorecardErrorMessage) {
@@ -415,7 +440,7 @@ const TestHarness = (props: TestHarnessProps): JSX.Element => {
 
     return (
         <FormProvider {...formMethods}>
-            <HumanReviewTab />
+            <HumanReviewTab screenerOnly={props.screenerOnly} />
             {props.restoreStaleAdditionalMemberIds
                 ? <StaleAdditionalMemberIdsReporter />
                 : undefined}
@@ -434,7 +459,14 @@ const TestHarness = (props: TestHarnessProps): JSX.Element => {
             {props.showMemberValue
                 ? (
                     <div data-testid='member-id-value'>
-                        {formMethods.watch('reviewers.0.memberId') || ''}
+                        {String(formMethods.watch(`reviewers.${memberValueIndex}.memberId` as never) || '')}
+                    </div>
+                )
+                : undefined}
+            {props.showSecondMemberValue
+                ? (
+                    <div data-testid='second-member-id-value'>
+                        {formMethods.watch('reviewers.1.memberId') || ''}
                     </div>
                 )
                 : undefined}
@@ -452,6 +484,13 @@ const TestHarness = (props: TestHarnessProps): JSX.Element => {
                     </div>
                 )
                 : undefined}
+            {props.showReviewersValue
+                ? (
+                    <div data-testid='reviewers-value'>
+                        {JSON.stringify(formMethods.watch('reviewers'))}
+                    </div>
+                )
+                : undefined}
             {props.showScorecardValue
                 ? (
                     <div data-testid='scorecard-id-value'>
@@ -498,6 +537,7 @@ describe('HumanReviewTab', () => {
                 .mockResolvedValue(undefined),
             resources: [],
         })
+        mockedCreateResource.mockResolvedValue(undefined)
         mockedDeleteResource.mockResolvedValue(undefined)
         mockedFetchDefaultReviewers.mockImplementation(() => createPendingPromise())
         mockedFetchProfile.mockResolvedValue(undefined)
@@ -631,7 +671,7 @@ describe('HumanReviewTab', () => {
         })
     })
 
-    it('keeps a Reviewer resource on Review when Screening has no assigned Screener', async () => {
+    it('keeps a Reviewer resource on Review when screening phases have no assigned screeners', async () => {
         mockedUseFetchResourceRoles.mockReturnValue({
             resourceRoles: [
                 {
@@ -642,6 +682,10 @@ describe('HumanReviewTab', () => {
                     id: 'role-reviewer',
                     name: 'Reviewer',
                 },
+                {
+                    id: 'role-checkpoint-screener',
+                    name: 'Checkpoint Screener',
+                },
             ],
         })
         mockedUseFetchResources.mockReturnValue({
@@ -665,6 +709,11 @@ describe('HumanReviewTab', () => {
                             name: 'Screening',
                             phaseId: 'phase-screening',
                         },
+                        {
+                            id: 'checkpoint-screening-instance',
+                            name: 'Checkpoint Screening',
+                            phaseId: 'phase-checkpoint-screening',
+                        },
                         {
                             id: 'review-instance',
                             name: 'Review',
@@ -679,6 +728,13 @@ describe('HumanReviewTab', () => {
                             phaseId: 'phase-screening',
                             shouldOpenOpportunity: false,
                         },
+                        {
+                            additionalMemberIds: [],
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'phase-checkpoint-screening',
+                            shouldOpenOpportunity: false,
+                        },
                         {
                             additionalMemberIds: [],
                             isMemberReview: true,
@@ -696,6 +752,9 @@ describe('HumanReviewTab', () => {
                 .getAttribute('data-value'))
                 .toBe('')
             expect(screen.getByTestId('reviewers.1.memberId')
+                .getAttribute('data-value'))
+                .toBe('')
+            expect(screen.getByTestId('reviewers.2.memberId')
                 .getAttribute('data-value'))
                 .toBe('member-reviewer')
         })
@@ -942,7 +1001,198 @@ describe('HumanReviewTab', () => {
             .not.toBeNull()
     })
 
-    it('marks only the standard Screening member assignment optional', () => {
+    it('repairs hidden legacy rows and assigns private reviewers to the copilot', async () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [],
+        })
+        mockedFetchDefaultReviewers.mockResolvedValue([
+            {
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'checkpoint-review-phase-id',
+                scorecardId: 'checkpoint-review-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'review-phase-id',
+                scorecardId: 'review-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'checkpoint-screening-phase-id',
+                scorecardId: 'checkpoint-screening-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'screening-phase-id',
+                scorecardId: 'screening-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+            {
+                isMemberReview: true,
+                memberReviewerCount: 1,
+                phaseId: 'approval-phase-id',
+                scorecardId: 'approval-scorecard-id',
+                shouldOpenOpportunity: false,
+            },
+        ])
+        mockedFetchScorecards.mockResolvedValue([
+            {
+                id: 'checkpoint-review-scorecard-id',
+                name: 'Checkpoint Review Scorecard',
+                phaseId: 'checkpoint-review-phase-id',
+            },
+            {
+                id: 'review-scorecard-id',
+                name: 'Review Scorecard',
+                phaseId: 'review-phase-id',
+            },
+            {
+                id: 'checkpoint-screening-scorecard-id',
+                name: 'Checkpoint Screening Scorecard',
+                phaseId: 'checkpoint-screening-phase-id',
+            },
+            {
+                id: 'screening-scorecard-id',
+                name: 'Screening Scorecard',
+                phaseId: 'screening-phase-id',
+            },
+            {
+                id: 'approval-scorecard-id',
+                name: 'Approval Scorecard',
+                phaseId: 'approval-phase-id',
+            },
+        ])
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    copilot: 'TCConnCopilot',
+                    phases: [
+                        {
+                            name: 'Checkpoint Screening',
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
+                        {
+                            name: 'Checkpoint Review',
+                            phaseId: 'checkpoint-review-phase-id',
+                        },
+                        {
+                            name: 'Screening',
+                            phaseId: 'screening-phase-id',
+                        },
+                        {
+                            name: 'Review',
+                            phaseId: 'review-phase-id',
+                        },
+                        {
+                            name: 'Approval',
+                            phaseId: 'approval-phase-id',
+                        },
+                    ],
+                    reviewers: [
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'checkpoint-review-phase-id',
+                            scorecardId: 'checkpoint-review-scorecard-id',
+                            shouldOpenOpportunity: true,
+                        },
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'review-phase-id',
+                            scorecardId: 'review-scorecard-id',
+                            shouldOpenOpportunity: false,
+                        },
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'checkpoint-screening-phase-id',
+                            scorecardId: 'checkpoint-screening-scorecard-id',
+                            shouldOpenOpportunity: false,
+                        },
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 2,
+                            phaseId: 'approval-phase-id',
+                            scorecardId: 'stale-approval-scorecard-id',
+                            shouldOpenOpportunity: false,
+                        },
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'approval-phase-id',
+                            scorecardId: 'another-stale-approval-scorecard-id',
+                            shouldOpenOpportunity: true,
+                        },
+                    ],
+                }}
+                screenerOnly
+                showReviewersValue
+            />,
+        )
+
+        expect(screen.getByLabelText('Screener'))
+            .not.toBeNull()
+        await waitFor(() => {
+            const reconciledReviewers = JSON.parse(
+                screen.getByTestId('reviewers-value').textContent || '[]',
+            ) as Reviewer[]
+
+            expect(reconciledReviewers)
+                .toHaveLength(5)
+            expect(reconciledReviewers.map(reviewer => reviewer.phaseId))
+                .toEqual([
+                    'checkpoint-screening-phase-id',
+                    'checkpoint-review-phase-id',
+                    'screening-phase-id',
+                    'review-phase-id',
+                    'approval-phase-id',
+                ])
+            expect(reconciledReviewers.filter(reviewer => [
+                'checkpoint-review-phase-id',
+                'review-phase-id',
+                'approval-phase-id',
+            ].includes(reviewer.phaseId || '')))
+                .toEqual(expect.arrayContaining([
+                    expect.objectContaining({
+                        handle: 'TCConnCopilot',
+                        phaseId: 'checkpoint-review-phase-id',
+                        scorecardId: 'checkpoint-review-scorecard-id',
+                        shouldOpenOpportunity: false,
+                    }),
+                    expect.objectContaining({
+                        handle: 'TCConnCopilot',
+                        phaseId: 'review-phase-id',
+                        scorecardId: 'review-scorecard-id',
+                        shouldOpenOpportunity: false,
+                    }),
+                    expect.objectContaining({
+                        handle: 'TCConnCopilot',
+                        phaseId: 'approval-phase-id',
+                        scorecardId: 'approval-scorecard-id',
+                        shouldOpenOpportunity: false,
+                    }),
+                ]))
+        })
+    })
+
+    it('marks Screening and Checkpoint Screening member assignments optional', () => {
         mockedUseFetchChallengeTracks.mockReturnValue({
             tracks: [
                 {
@@ -961,6 +1211,10 @@ describe('HumanReviewTab', () => {
                             name: 'Screening',
                             phaseId: 'screening-phase-id',
                         },
+                        {
+                            name: 'Checkpoint Screening',
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
                         {
                             name: 'Review',
                             phaseId: 'review-phase-id',
@@ -974,6 +1228,13 @@ describe('HumanReviewTab', () => {
                             scorecardId: 'screening-scorecard-id',
                             shouldOpenOpportunity: false,
                         },
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'checkpoint-screening-phase-id',
+                            scorecardId: 'checkpoint-screening-scorecard-id',
+                            shouldOpenOpportunity: false,
+                        },
                         {
                             isMemberReview: true,
                             memberReviewerCount: 1,
@@ -989,9 +1250,586 @@ describe('HumanReviewTab', () => {
         expect(screen.getByTestId('reviewers.0.memberId'))
             .toHaveProperty('dataset.required', 'false')
         expect(screen.getByTestId('reviewers.1.memberId'))
+            .toHaveProperty('dataset.required', 'false')
+        expect(screen.getByTestId('reviewers.2.memberId'))
             .toHaveProperty('dataset.required', 'true')
     })
 
+    it('assigns one simplified screener selection to checkpoint and final screening roles', async () => {
+        const mutateResources = jest.fn()
+            .mockResolvedValue(undefined)
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [
+                {
+                    id: 'checkpoint-screener-role-id',
+                    name: 'Checkpoint Screener',
+                },
+                {
+                    id: 'screener-role-id',
+                    name: 'Screener',
+                },
+            ],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            isLoading: false,
+            mutate: mutateResources,
+            resources: [],
+        })
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    phases: [
+                        {
+                            name: 'Checkpoint Screening',
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
+                        {
+                            name: 'Screening',
+                            phaseId: 'screening-phase-id',
+                        },
+                    ],
+                    reviewers: [
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'checkpoint-screening-phase-id',
+                            scorecardId: 'checkpoint-screening-scorecard-id',
+                            shouldOpenOpportunity: false,
+                        },
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'screening-phase-id',
+                            scorecardId: 'screening-scorecard-id',
+                            shouldOpenOpportunity: false,
+                        },
+                    ],
+                }}
+                screenerOnly
+                showMemberValue
+                showMemberValueIndex={0}
+                showSecondMemberValue
+                showScorecardValue
+                showScorecardValueIndex={0}
+            />,
+        )
+
+        expect(screen.getByLabelText('Screener')
+            .getAttribute('placeholder'))
+            .toBe('Select user')
+        expect(screen.queryByLabelText('Phase'))
+            .toBeNull()
+        expect(screen.queryByLabelText('Scorecard'))
+            .toBeNull()
+
+        fireEvent.change(screen.getByLabelText('Screener'), {
+            target: {
+                value: 'screener-member-id',
+            },
+        })
+
+        await waitFor(() => {
+            expect(screen.getByTestId('member-id-value').textContent)
+                .toBe('screener-member-id')
+            expect(screen.getByTestId('second-member-id-value').textContent)
+                .toBe('screener-member-id')
+            expect((screen.getByLabelText('Screener') as HTMLInputElement).value)
+                .toBe('screener-member-id')
+            expect(mockedCreateResource.mock.calls)
+                .toEqual(expect.arrayContaining([
+                    [{
+                        challengeId: 'challenge-1',
+                        memberId: 'screener-member-id',
+                        roleId: 'checkpoint-screener-role-id',
+                    }],
+                    [{
+                        challengeId: 'challenge-1',
+                        memberId: 'screener-member-id',
+                        roleId: 'screener-role-id',
+                    }],
+                ]))
+        })
+        expect(screen.getByTestId('scorecard-id-value').textContent)
+            .toBe('checkpoint-screening-scorecard-id')
+        expect(mockedCreateResource)
+            .toHaveBeenCalledTimes(2)
+        expect(mockedDeleteResource)
+            .not.toHaveBeenCalled()
+        await waitFor(() => {
+            expect(mutateResources)
+                .toHaveBeenCalled()
+        })
+    })
+
+    it('disables simplified screener changes while both resource assignments synchronize', async () => {
+        const resourceCreateRequest = createDeferredPromise<void>()
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [
+                {
+                    id: 'checkpoint-screener-role-id',
+                    name: 'Checkpoint Screener',
+                },
+                {
+                    id: 'screener-role-id',
+                    name: 'Screener',
+                },
+            ],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            isError: false,
+            isLoading: false,
+            mutate: jest.fn()
+                .mockResolvedValue(undefined),
+            resources: [],
+        })
+        mockedCreateResource.mockReturnValue(resourceCreateRequest.promise)
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    phases: [
+                        {
+                            name: 'Checkpoint Screening',
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
+                        {
+                            name: 'Screening',
+                            phaseId: 'screening-phase-id',
+                        },
+                    ],
+                    reviewers: [
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
+                        {
+                            isMemberReview: true,
+                            memberReviewerCount: 1,
+                            phaseId: 'screening-phase-id',
+                        },
+                    ],
+                }}
+                screenerOnly
+            />,
+        )
+
+        const screenerField = screen.getByLabelText('Screener') as HTMLInputElement
+
+        fireEvent.change(screenerField, {
+            target: {
+                value: 'first-member-id',
+            },
+        })
+
+        await waitFor(() => {
+            expect(screenerField.disabled)
+                .toBe(true)
+        })
+        fireEvent.change(screenerField, {
+            target: {
+                value: 'second-member-id',
+            },
+        })
+        expect(mockedCreateResource)
+            .toHaveBeenCalledTimes(2)
+
+        await act(async () => {
+            resourceCreateRequest.resolve(undefined)
+            await resourceCreateRequest.promise
+        })
+        await waitFor(() => {
+            expect(screenerField.disabled)
+                .toBe(false)
+        })
+    })
+
+    it('disables simplified screener assignment when challenge resources fail to load', () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [{
+                id: 'screener-role-id',
+                name: 'Screener',
+            }],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            isError: true,
+            isLoading: false,
+            mutate: jest.fn()
+                .mockResolvedValue(undefined),
+            resources: [],
+        })
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    phases: [{
+                        name: 'Screening',
+                        phaseId: 'screening-phase-id',
+                    }],
+                    reviewers: [{
+                        isMemberReview: true,
+                        memberReviewerCount: 1,
+                        phaseId: 'screening-phase-id',
+                    }],
+                }}
+                screenerOnly
+            />,
+        )
+
+        expect((screen.getByLabelText('Screener') as HTMLInputElement).disabled)
+            .toBe(true)
+        expect(screen.getByText('Unable to load screener assignments.'))
+            .not.toBeNull()
+    })
+
+    it('replaces existing checkpoint and final screener resources together', async () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [
+                {
+                    id: 'checkpoint-screener-role-id',
+                    name: 'Checkpoint Screener',
+                },
+                {
+                    id: 'screener-role-id',
+                    name: 'Screener',
+                },
+            ],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            isLoading: false,
+            mutate: jest.fn()
+                .mockResolvedValue(undefined),
+            resources: [
+                {
+                    challengeId: 'challenge-1',
+                    memberId: 'old-member-id',
+                    roleId: 'checkpoint-screener-role-id',
+                    roleName: 'Checkpoint Screener',
+                },
+                {
+                    challengeId: 'challenge-1',
+                    memberId: 'old-member-id',
+                    roleId: 'screener-role-id',
+                    roleName: 'Screener',
+                },
+            ],
+        })
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    phases: [
+                        {
+                            name: 'Checkpoint Screening',
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
+                        {
+                            name: 'Screening',
+                            phaseId: 'screening-phase-id',
+                        },
+                    ],
+                    reviewers: [
+                        {
+                            isMemberReview: true,
+                            memberId: 'old-member-id',
+                            memberReviewerCount: 1,
+                            phaseId: 'checkpoint-screening-phase-id',
+                            scorecardId: 'checkpoint-scorecard-id',
+                        },
+                        {
+                            isMemberReview: true,
+                            memberId: 'old-member-id',
+                            memberReviewerCount: 1,
+                            phaseId: 'screening-phase-id',
+                            scorecardId: 'screening-scorecard-id',
+                        },
+                    ],
+                }}
+                screenerOnly
+            />,
+        )
+
+        fireEvent.change(screen.getByLabelText('Screener'), {
+            target: {
+                value: 'new-member-id',
+            },
+        })
+
+        await waitFor(() => {
+            expect(mockedDeleteResource.mock.calls)
+                .toEqual(expect.arrayContaining([
+                    [{
+                        challengeId: 'challenge-1',
+                        memberHandle: undefined,
+                        memberId: 'old-member-id',
+                        roleId: 'checkpoint-screener-role-id',
+                    }],
+                    [{
+                        challengeId: 'challenge-1',
+                        memberHandle: undefined,
+                        memberId: 'old-member-id',
+                        roleId: 'screener-role-id',
+                    }],
+                ]))
+        })
+        expect(mockedCreateResource)
+            .toHaveBeenCalledTimes(2)
+        expect(mockedDeleteResource)
+            .toHaveBeenCalledTimes(2)
+    })
+
+    it('clears existing checkpoint and final screener resources together', async () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [
+                {
+                    id: 'checkpoint-screener-role-id',
+                    name: 'Checkpoint Screener',
+                },
+                {
+                    id: 'screener-role-id',
+                    name: 'Screener',
+                },
+            ],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            isError: false,
+            isLoading: false,
+            mutate: jest.fn()
+                .mockResolvedValue(undefined),
+            resources: [
+                {
+                    challengeId: 'challenge-1',
+                    memberId: 'old-member-id',
+                    roleId: 'checkpoint-screener-role-id',
+                    roleName: 'Checkpoint Screener',
+                },
+                {
+                    challengeId: 'challenge-1',
+                    memberId: 'old-member-id',
+                    roleId: 'screener-role-id',
+                    roleName: 'Screener',
+                },
+            ],
+        })
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    phases: [
+                        {
+                            name: 'Checkpoint Screening',
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
+                        {
+                            name: 'Screening',
+                            phaseId: 'screening-phase-id',
+                        },
+                    ],
+                    reviewers: [
+                        {
+                            isMemberReview: true,
+                            memberId: 'old-member-id',
+                            memberReviewerCount: 1,
+                            phaseId: 'checkpoint-screening-phase-id',
+                        },
+                        {
+                            isMemberReview: true,
+                            memberId: 'old-member-id',
+                            memberReviewerCount: 1,
+                            phaseId: 'screening-phase-id',
+                        },
+                    ],
+                }}
+                screenerOnly
+            />,
+        )
+
+        fireEvent.change(screen.getByLabelText('Screener'), {
+            target: {
+                value: '',
+            },
+        })
+
+        await waitFor(() => {
+            expect(mockedDeleteResource)
+                .toHaveBeenCalledTimes(2)
+        })
+        expect(mockedCreateResource)
+            .not.toHaveBeenCalled()
+    })
+
+    it('does not duplicate a hydrated handle-only screener resource', async () => {
+        const mutateResources = jest.fn()
+            .mockResolvedValue(undefined)
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [{
+                id: 'screener-role-id',
+                name: 'Screener',
+            }],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            isError: false,
+            isLoading: false,
+            mutate: mutateResources,
+            resources: [{
+                challengeId: 'challenge-1',
+                memberHandle: 'legacy.screener',
+                roleId: 'screener-role-id',
+                roleName: 'Screener',
+            }],
+        })
+        mockedFetchProfile.mockResolvedValue({
+            handle: 'legacy.screener',
+            userId: 'legacy-member-id',
+        })
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    phases: [{
+                        name: 'Screening',
+                        phaseId: 'screening-phase-id',
+                    }],
+                    reviewers: [{
+                        isMemberReview: true,
+                        memberReviewerCount: 1,
+                        phaseId: 'screening-phase-id',
+                    }],
+                }}
+                screenerOnly
+            />,
+        )
+
+        await waitFor(() => {
+            expect((screen.getByLabelText('Screener') as HTMLInputElement).value)
+                .toBe('legacy-member-id')
+            expect((screen.getByLabelText('Screener') as HTMLInputElement).disabled)
+                .toBe(false)
+        })
+
+        fireEvent.change(screen.getByLabelText('Screener'), {
+            target: {
+                value: ' legacy-member-id ',
+            },
+        })
+
+        await waitFor(() => {
+            expect(mutateResources)
+                .toHaveBeenCalled()
+        })
+        expect(mockedCreateResource)
+            .not.toHaveBeenCalled()
+        expect(mockedDeleteResource)
+            .not.toHaveBeenCalled()
+    })
+
+    it('assigns only the final Screener role for one-round design challenges', async () => {
+        mockedUseFetchChallengeTracks.mockReturnValue({
+            tracks: [{
+                id: 'track-1',
+                name: 'Design',
+                track: 'DESIGN',
+            }],
+        })
+        mockedUseFetchResourceRoles.mockReturnValue({
+            isLoading: false,
+            resourceRoles: [{
+                id: 'screener-role-id',
+                name: 'Screener',
+            }],
+        })
+        mockedUseFetchResources.mockReturnValue({
+            isLoading: false,
+            mutate: jest.fn()
+                .mockResolvedValue(undefined),
+            resources: [],
+        })
+
+        render(
+            <TestHarness
+                defaultValues={{
+                    phases: [{
+                        name: 'Screening',
+                        phaseId: 'screening-phase-id',
+                    }],
+                    reviewers: [{
+                        isMemberReview: true,
+                        memberReviewerCount: 1,
+                        phaseId: 'screening-phase-id',
+                        scorecardId: 'screening-scorecard-id',
+                    }],
+                }}
+                screenerOnly
+            />,
+        )
+
+        fireEvent.change(screen.getByLabelText('Screener'), {
+            target: {
+                value: 'screener-member-id',
+            },
+        })
+
+        await waitFor(() => {
+            expect(mockedCreateResource)
+                .toHaveBeenCalledWith({
+                    challengeId: 'challenge-1',
+                    memberId: 'screener-member-id',
+                    roleId: 'screener-role-id',
+                })
+        })
+        expect(mockedCreateResource)
+            .toHaveBeenCalledTimes(1)
+    })
+
     it('defaults new manual reviewer cards to regular review type', async () => {
         mockedFetchScorecards.mockResolvedValue([])
 
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.tsx
index 0da18bd3e..f74401bba 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/HumanReviewTab.tsx
@@ -36,6 +36,8 @@ import {
     ChallengeEditorFormData,
     DefaultReviewer,
     Resource,
+    ResourcePayload,
+    ResourceRole,
     Reviewer,
     Scorecard,
 } from '../../../../../lib/models'
@@ -88,6 +90,15 @@ const APPEAL_PHASE_KEYS = new Set([
     'appeals',
     'appealsresponse',
 ])
+const SCREENER_ROLE_NAME_BY_PHASE_KEY: Record<string, string> = {
+    checkpointscreening: 'Checkpoint Screener',
+    screening: 'Screener',
+}
+const DESIGN_COPILOT_REVIEW_PHASE_KEYS = new Set([
+    'approval',
+    'checkpointreview',
+    'review',
+])
 const REVIEW_OPPORTUNITY_TYPES = {
     COMPONENT_DEV_REVIEW: 'COMPONENT_DEV_REVIEW',
     ITERATIVE_REVIEW: 'ITERATIVE_REVIEW',
@@ -595,12 +606,12 @@ function getReviewOpportunityTypeForReviewer(params: {
 function getRoleNameForPhaseName(phaseName: string | undefined): string {
     const normalizedPhaseName = normalizeKey(phaseName)
 
-    if (normalizedPhaseName === 'approval') {
-        return 'Approver'
+    if (SCREENER_ROLE_NAME_BY_PHASE_KEY[normalizedPhaseName]) {
+        return SCREENER_ROLE_NAME_BY_PHASE_KEY[normalizedPhaseName]
     }
 
-    if (normalizedPhaseName === 'checkpointscreening') {
-        return 'Checkpoint Screener'
+    if (normalizedPhaseName === 'approval') {
+        return 'Approver'
     }
 
     if (normalizedPhaseName === 'checkpointreview') {
@@ -611,11 +622,153 @@ function getRoleNameForPhaseName(phaseName: string | undefined): string {
         return 'Iterative Reviewer'
     }
 
-    if (normalizedPhaseName === 'screening') {
-        return 'Screener'
+    return 'Reviewer'
+}
+
+interface ScreenerResourceTarget {
+    assignedMemberIds: string[]
+    assignedResources: Resource[]
+    roleId: string
+    roleName: string
+}
+
+interface ScreenerReviewerEntry {
+    fieldIndex: number
+    reviewer: Reviewer
+    roleName: string
+}
+
+/**
+ * Resolves a screener resource member id, including a hydrated id for legacy handle-only rows.
+ *
+ * @param target screening-role resource target and its hydrated form assignments.
+ * @param resourceIndex persisted resource position within the target.
+ * @returns the normalized member id, or an empty string while a handle remains unresolved.
+ * @throws Does not throw.
+ */
+function getScreenerResourceMemberId(
+    target: ScreenerResourceTarget,
+    resourceIndex: number,
+): string {
+    return normalizeText(target.assignedResources[resourceIndex]?.memberId)
+        || normalizeText(target.assignedMemberIds[resourceIndex])
+}
+
+/**
+ * Builds the resource payload used to remove or restore an existing screener assignment.
+ *
+ * @param resource persisted challenge resource for a screening role.
+ * @returns a resource mutation payload, or `undefined` when the resource has no member identity.
+ * @remarks Used while synchronizing the simplified Design Challenge screener field.
+ * @throws Does not throw.
+ */
+function getResourceMutationPayload(resource: Resource): ResourcePayload | undefined {
+    const memberId = normalizeText(resource.memberId)
+    const memberHandle = normalizeText(resource.memberHandle)
+    const roleId = normalizeText(resource.roleId)
+
+    if (!roleId || (!memberId && !memberHandle)) {
+        return undefined
     }
 
-    return 'Reviewer'
+    return {
+        challengeId: resource.challengeId,
+        memberHandle: memberId ? undefined : memberHandle,
+        memberId: memberId || undefined,
+        roleId,
+    }
+}
+
+/**
+ * Finds persisted challenge resources for one named screening role.
+ *
+ * @param resources challenge resources available to the editor.
+ * @param resourceRoles resource-role metadata used when a resource only exposes a role id.
+ * @param roleName screening role name to match.
+ * @returns all resources assigned to the requested role.
+ * @remarks Role names and ids are both supported for legacy resource payloads.
+ * @throws Does not throw.
+ */
+function getResourcesForRoleName(
+    resources: Resource[],
+    resourceRoles: ResourceRole[],
+    roleName: string,
+): Resource[] {
+    const normalizedRoleName = normalizeKey(roleName)
+    const matchingRoleIds = new Set(resourceRoles
+        .filter(role => normalizeKey(role.name) === normalizedRoleName)
+        .map(role => normalizeText(role.id)))
+
+    return resources.filter(resource => (
+        normalizeKey(resource.roleName || resource.role) === normalizedRoleName
+        || matchingRoleIds.has(normalizeText(resource.roleId))
+    ))
+}
+
+/**
+ * Replaces the persisted assignments for every screening role with one selected member.
+ *
+ * @param params challenge id, selected member id, and screening-role resource targets.
+ * @returns a promise that resolves after all resource roles match the selected member.
+ * @remarks New assignments are created before old assignments are removed. Completed mutations
+ * are rolled back on failure so Checkpoint Screener and Screener do not remain out of sync.
+ * @throws Re-throws the resource service error after attempting rollback.
+ */
+async function syncScreenerResourceAssignments(params: {
+    challengeId: string
+    selectedMemberId: string
+    targets: ScreenerResourceTarget[]
+}): Promise<void> {
+    const createdPayloads: ResourcePayload[] = []
+    const deletedPayloads: ResourcePayload[] = []
+    const createPayloads = params.selectedMemberId
+        ? params.targets
+            .filter(target => !target.assignedResources.some((resource, resourceIndex) => (
+                getScreenerResourceMemberId(target, resourceIndex) === params.selectedMemberId
+            )))
+            .map(target => ({
+                challengeId: params.challengeId,
+                memberId: params.selectedMemberId,
+                roleId: target.roleId,
+            }))
+        : []
+    const deletePayloads = params.targets
+        .flatMap(target => target.assignedResources
+            .filter((resource, resourceIndex) => (
+                !params.selectedMemberId
+                || getScreenerResourceMemberId(target, resourceIndex) !== params.selectedMemberId
+            )))
+        .map(getResourceMutationPayload)
+        .filter((payload): payload is ResourcePayload => !!payload)
+
+    try {
+        const createResults = await Promise.allSettled(createPayloads.map(async payload => {
+            await createResource(payload)
+            createdPayloads.push(payload)
+        }))
+        const failedCreate = createResults.find(result => result.status === 'rejected') as PromiseRejectedResult
+            | undefined
+        if (failedCreate) {
+            throw failedCreate.reason
+        }
+
+        const deleteResults = await Promise.allSettled(deletePayloads.map(async payload => {
+            await deleteResource(payload)
+            deletedPayloads.push(payload)
+        }))
+        const failedDelete = deleteResults.find(result => result.status === 'rejected') as PromiseRejectedResult
+            | undefined
+        if (failedDelete) {
+            throw failedDelete.reason
+        }
+    } catch (error) {
+        await Promise.allSettled([
+            ...createdPayloads.map(payload => deleteResource(payload)),
+            ...deletedPayloads.map(payload => createResource(payload)),
+        ])
+
+        throw error
+    }
 }
 
 /**
@@ -666,6 +819,162 @@ function mapDefaultReviewerToReviewer(
     }
 }
 
+/**
+ * Reconciles the hidden reviewer matrix used by the simplified Design Challenge editor.
+ *
+ * @param params current manual reviewer rows, active defaults and scorecards, challenge phases,
+ * and the selected copilot identity.
+ * @returns one valid reviewer row for every configured reviewer phase, preserving screener
+ * assignments and valid custom selections while repairing missing, duplicate, or stale rows.
+ * @remarks Checkpoint Review, Review, and Approval are always private and assigned to the selected
+ * copilot. The helper is used before save validation because those rows are hidden in simplified
+ * mode and cannot be repaired manually by the user.
+ * @throws Does not throw.
+ */
+function reconcileSimplifiedDesignReviewerDefaults(params: {
+    copilot?: string
+    defaultReviewers: DefaultReviewer[]
+    phases: ChallengeEditorFormData['phases']
+    reviewers: Reviewer[]
+    scorecards: Scorecard[]
+}): Reviewer[] {
+    const phaseRows = Array.isArray(params.phases)
+        ? params.phases
+        : []
+    const expectedPhaseIds = phaseRows
+        .filter(phase => isSelectableReviewerPhaseName(phase.name, false))
+        .map(phase => getChallengePhaseId(phase))
+        .filter((phaseId): phaseId is string => !!phaseId)
+    const phaseNameById = new Map(
+        phaseRows
+            .map(phase => {
+                const phaseId = getChallengePhaseId(phase)
+                const phaseName = normalizeText(phase.name)
+
+                return phaseId && phaseName
+                    ? [phaseId, phaseName] as const
+                    : undefined
+            })
+            .filter((entry): entry is readonly [string, string] => !!entry),
+    )
+    const defaultReviewerByPhaseId = new Map<string, Reviewer>()
+
+    params.defaultReviewers
+        .filter(defaultReviewer => isMemberReviewer(defaultReviewer))
+        .forEach(defaultReviewer => {
+            const reviewer = mapDefaultReviewerToReviewer(defaultReviewer, params.phases)
+            const phaseId = normalizeText(reviewer.phaseId)
+            const phaseName = phaseNameById.get(phaseId)
+            const scorecardId = normalizeText(reviewer.scorecardId)
+            const hasValidDefaultScorecard = getPhaseMatchedScorecards(
+                params.scorecards,
+                phaseId,
+                phaseNameById,
+            )
+                .some(scorecard => hasSameNormalizedText(scorecard.id, scorecardId))
+
+            if (
+                !phaseId
+                || !phaseName
+                || !isSelectableReviewerPhaseName(phaseName, false)
+                || !scorecardId
+                || !hasValidDefaultScorecard
+                || defaultReviewerByPhaseId.has(phaseId)
+            ) {
+                return
+            }
+
+            defaultReviewerByPhaseId.set(phaseId, reviewer)
+        })
+
+    if (
+        !expectedPhaseIds.length
+        || expectedPhaseIds.some(phaseId => !defaultReviewerByPhaseId.has(phaseId))
+    ) {
+        return params.reviewers
+    }
+
+    const selectedCopilot = normalizeText(params.copilot)
+    const selectedCopilotIsMemberId = /^\d+$/.test(selectedCopilot)
+    const reconciledReviewers = expectedPhaseIds.map(phaseId => {
+        const defaultReviewer = defaultReviewerByPhaseId.get(phaseId) as Reviewer
+        const phaseScorecardIds = new Set(
+            getPhaseMatchedScorecards(params.scorecards, phaseId, phaseNameById)
+                .map(scorecard => normalizeText(scorecard.id))
+                .filter(Boolean),
+        )
+        const candidates = params.reviewers.filter(reviewer => (
+            normalizeText(reviewer.phaseId) === phaseId
+        ))
+        const candidate = candidates.find(reviewer => (
+            phaseScorecardIds.has(normalizeText(reviewer.scorecardId))
+            && getAssignedMemberIds(reviewer)
+                .some(Boolean)
+        ))
+            || candidates.find(reviewer => (
+                phaseScorecardIds.has(normalizeText(reviewer.scorecardId))
+                && isPublicOpportunityOpen(reviewer)
+            ))
+            || candidates.find(reviewer => (
+                phaseScorecardIds.has(normalizeText(reviewer.scorecardId))
+            ))
+            || candidates.find(reviewer => getAssignedMemberIds(reviewer)
+                .some(Boolean))
+            || candidates[0]
+        const candidateHasValidScorecard = !!candidate
+            && phaseScorecardIds.has(normalizeText(candidate.scorecardId))
+        const nextReviewer: Reviewer = candidateHasValidScorecard
+            ? {
+                ...candidate,
+            }
+            : {
+                ...defaultReviewer,
+                additionalMemberIds: candidate?.additionalMemberIds,
+                handle: candidate?.handle,
+                memberId: candidate?.memberId,
+                resourceId: candidate?.resourceId,
+                roleId: candidate?.roleId || defaultReviewer.roleId,
+            }
+
+        nextReviewer.phaseId = phaseId
+        nextReviewer.scorecardId = candidateHasValidScorecard
+            ? candidate?.scorecardId
+            : defaultReviewer.scorecardId
+        nextReviewer.isMemberReview = true
+        nextReviewer.memberReviewerCount = Math.max(
+            1,
+            getAssignedMemberIds(nextReviewer)
+                .filter(Boolean).length,
+        )
+        nextReviewer.type = normalizeText(nextReviewer.type)
+            || defaultReviewer.type
+            || REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW
+
+        if (DESIGN_COPILOT_REVIEW_PHASE_KEYS.has(normalizeKey(phaseNameById.get(phaseId)))) {
+            nextReviewer.additionalMemberIds = undefined
+            nextReviewer.handle = selectedCopilot && !selectedCopilotIsMemberId
+                ? selectedCopilot
+                : undefined
+            nextReviewer.memberId = selectedCopilotIsMemberId
+                ? selectedCopilot
+                : undefined
+            nextReviewer.memberReviewerCount = 1
+            nextReviewer.shouldOpenOpportunity = false
+        }
+
+        return nextReviewer
+    })
+    const expectedPhaseIdSet = new Set(expectedPhaseIds)
+    const unmatchedReviewers = params.reviewers.filter(reviewer => (
+        !expectedPhaseIdSet.has(normalizeText(reviewer.phaseId))
+    ))
+
+    return [
+        ...reconciledReviewers,
+        ...unmatchedReviewers,
+    ]
+}
+
 /**
  * Selects the default reviewer metadata used when adding the next manual
  * reviewer card.
@@ -817,7 +1126,15 @@ const PublicOpportunityCheckboxField: FC<PublicOpportunityCheckboxFieldProps> =
     )
 }
 
-export const HumanReviewTab: FC = () => {
+interface HumanReviewTabProps {
+    screenerOnly?: boolean
+}
+
+/**
+ * Renders manual reviewer configuration, or a single synchronized screener field
+ * for copilot-only Design Challenge editing.
+ */
+export const HumanReviewTab: FC<HumanReviewTabProps> = (props: HumanReviewTabProps) => {
     const formContext = useFormContext<ChallengeEditorFormData>()
     const reviewersFieldState = useController({
         control: formContext.control,
@@ -828,15 +1145,16 @@ export const HumanReviewTab: FC = () => {
     const challengeTracks = challengeTracksResult.tracks
     const challengeTypes = challengeTypesResult.challengeTypes
 
-    const {
-        resourceRoles,
-    }: UseFetchResourceRolesResult = useFetchResourceRoles()
+    const resourceRolesResult: UseFetchResourceRolesResult = useFetchResourceRoles()
+    const resourceRoles = resourceRolesResult.resourceRoles
 
     const [defaultReviewers, setDefaultReviewers] = useState<DefaultReviewer[]>([])
     const [scorecards, setScorecards] = useState<Scorecard[]>([])
     // Keep existing selections intact until the first scorecard fetch resolves.
     const [isScorecardsLoading, setIsScorecardsLoading] = useState<boolean>(true)
+    const [isScreenerSyncing, setIsScreenerSyncing] = useState<boolean>(false)
     const [loadError, setLoadError] = useState<string | undefined>()
+    const isScreenerSyncingRef = useRef<boolean>(false)
     const autoBackfilledReviewerTypesRef = useRef<Record<string, string>>({})
     const trimmedAdditionalMemberIdsRef = useRef<Record<string, string>>({})
     const reconciledScorecardSelectionsRef = useRef<Record<string, string>>({})
@@ -845,6 +1163,10 @@ export const HumanReviewTab: FC = () => {
         control: formContext.control,
         name: 'id',
     }) as string | undefined
+    const copilot = useWatch({
+        control: formContext.control,
+        name: 'copilot',
+    }) as string | undefined
     const normalizedChallengeId = normalizeText(challengeId)
     const challengeResourcesResult = useFetchResources(normalizedChallengeId || undefined)
     const mutateChallengeResources = challengeResourcesResult.mutate
@@ -912,10 +1234,15 @@ export const HumanReviewTab: FC = () => {
 
             phases.forEach(phase => {
                 const phaseName = normalizeText(phase.name)
-                const phaseId = normalizeText(phase.phaseId) || normalizeText(phase.id)
-
-                if (phaseId && phaseName) {
-                    nextPhaseNameById.set(phaseId, phaseName)
+                const phaseIds = toUniqueValues([
+                    normalizeText(phase.phaseId),
+                    normalizeText(phase.id),
+                ])
+
+                if (phaseName) {
+                    phaseIds.forEach(phaseId => {
+                        nextPhaseNameById.set(phaseId, phaseName)
+                    })
                 }
             })
 
@@ -975,6 +1302,106 @@ export const HumanReviewTab: FC = () => {
         [resolveRoleIdForPhase],
     )
 
+    const screenerReviewerEntries = useMemo<ScreenerReviewerEntry[]>(
+        () => reviewerRows
+            .map((reviewer, reviewerIndex) => {
+                const fieldIndex = getReviewerFieldIndex(reviewerIndex)
+                const phaseName = phaseNameById.get(normalizeText(reviewer.phaseId))
+                const roleName = SCREENER_ROLE_NAME_BY_PHASE_KEY[normalizeKey(phaseName)]
+
+                return fieldIndex !== undefined && roleName
+                    ? {
+                        fieldIndex,
+                        reviewer,
+                        roleName,
+                    }
+                    : undefined
+            })
+            .filter((entry): entry is ScreenerReviewerEntry => !!entry),
+        [
+            getReviewerFieldIndex,
+            phaseNameById,
+            reviewerRows,
+        ],
+    )
+    const screenerRoleNames = useMemo<string[]>(
+        () => toUniqueValues([
+            ...(Array.isArray(phases)
+                ? phases
+                    .map(phase => SCREENER_ROLE_NAME_BY_PHASE_KEY[normalizeKey(phase.name)])
+                    .filter(Boolean)
+                : []),
+            ...screenerReviewerEntries.map(entry => entry.roleName),
+        ]),
+        [
+            phases,
+            screenerReviewerEntries,
+        ],
+    )
+    const screenerResourceTargets = useMemo<ScreenerResourceTarget[]>(
+        () => screenerRoleNames
+            .map(roleName => {
+                const normalizedRoleName = normalizeKey(roleName)
+                const assignedResources = getResourcesForRoleName(
+                    challengeResourcesResult.resources,
+                    resourceRoles,
+                    roleName,
+                )
+                const reviewerRoleId = normalizeText(screenerReviewerEntries
+                    .find(entry => entry.roleName === roleName)
+                    ?.reviewer.roleId)
+                const reviewerRoleMatches = resourceRoles.some(role => (
+                    normalizeText(role.id) === reviewerRoleId
+                    && normalizeKey(role.name) === normalizedRoleName
+                )) || assignedResources.some(resource => (
+                    normalizeText(resource.roleId) === reviewerRoleId
+                ))
+                const roleId = (reviewerRoleMatches ? reviewerRoleId : '')
+                    || normalizeText(assignedResources[0]?.roleId)
+                    || normalizeText(roleIdByName.get(normalizedRoleName))
+
+                return roleId
+                    ? {
+                        assignedMemberIds: getAssignedMemberIds(screenerReviewerEntries
+                            .find(entry => entry.roleName === roleName)
+                            ?.reviewer),
+                        assignedResources,
+                        roleId,
+                        roleName,
+                    }
+                    : undefined
+            })
+            .filter((target): target is ScreenerResourceTarget => !!target),
+        [
+            challengeResourcesResult.resources,
+            resourceRoles,
+            roleIdByName,
+            screenerReviewerEntries,
+            screenerRoleNames,
+        ],
+    )
+    const primaryScreenerReviewerEntry = useMemo<ScreenerReviewerEntry | undefined>(() => {
+        const finalScreenerEntry = screenerReviewerEntries.find(entry => entry.roleName === 'Screener')
+
+        if (finalScreenerEntry && getAssignedMemberIds(finalScreenerEntry.reviewer)
+            .some(Boolean)) {
+            return finalScreenerEntry
+        }
+
+        return screenerReviewerEntries.find(entry => getAssignedMemberIds(entry.reviewer)
+            .some(Boolean))
+            || finalScreenerEntry
+            || screenerReviewerEntries[0]
+    }, [screenerReviewerEntries])
+    const hasMissingScreenerRole = screenerResourceTargets.length < screenerRoleNames.length
+    const hasUnresolvedScreenerAssignment = screenerResourceTargets.some(target => (
+        target.assignedResources.some((resource, resourceIndex) => (
+            !normalizeText(resource.memberId)
+            && !!normalizeText(resource.memberHandle)
+            && !normalizeText(target.assignedMemberIds[resourceIndex])
+        ))
+    ))
+
     const phaseOptions = useMemo<FormSelectOption[]>(
         () => (Array.isArray(phases)
             ? phases
@@ -1332,6 +1759,52 @@ export const HumanReviewTab: FC = () => {
         reviewerRows,
     ])
 
+    useEffect(() => {
+        if (
+            !props.screenerOnly
+            || !isDesignTrackSelected
+            || isScorecardsLoading
+            || loadError
+            || !defaultReviewers.length
+        ) {
+            return
+        }
+
+        const reconciledManualReviewers = reconcileSimplifiedDesignReviewerDefaults({
+            copilot,
+            defaultReviewers,
+            phases,
+            reviewers: reviewerRows,
+            scorecards,
+        })
+        const aiReviewers = allReviewerRows.filter(reviewer => isAiReviewer(reviewer))
+        const nextReviewers = [
+            ...reconciledManualReviewers,
+            ...aiReviewers,
+        ]
+
+        if (JSON.stringify(nextReviewers) === JSON.stringify(allReviewerRows)) {
+            return
+        }
+
+        formContext.setValue('reviewers', nextReviewers, {
+            shouldDirty: false,
+            shouldValidate: true,
+        })
+    }, [
+        allReviewerRows,
+        copilot,
+        defaultReviewers,
+        formContext,
+        isDesignTrackSelected,
+        isScorecardsLoading,
+        loadError,
+        phases,
+        props.screenerOnly,
+        reviewerRows,
+        scorecards,
+    ])
+
     useEffect(() => {
         if (
             !normalizedChallengeId
@@ -1449,12 +1922,12 @@ export const HumanReviewTab: FC = () => {
         },
         [],
     )
-    const refreshChallengeResources = useCallback((): void => {
+    const refreshChallengeResources = useCallback((): Promise<unknown> | undefined => {
         if (!normalizedChallengeId) {
-            return
+            return undefined
         }
 
-        mutateChallengeResources()
+        return mutateChallengeResources()
             .catch(() => undefined)
     }, [
         mutateChallengeResources,
@@ -1682,6 +2155,153 @@ export const HumanReviewTab: FC = () => {
         ],
     )
 
+    /**
+     * Applies one selected user to every configured Design Challenge screening phase.
+     *
+     * @param selectedMemberId selected member user id, or an empty string when clearing the field.
+     * @returns Nothing; resource mutations continue asynchronously and refresh the resource cache.
+     * @remarks The reviewer form rows are kept aligned with the distinct Screener resources.
+     * Resource failures restore the prior form assignments and surface an inline error.
+     * @throws Does not throw to the input component.
+     */
+    const handleScreenerSelectionChange = useCallback(
+        (selectedMemberId: string): void => {
+            if (
+                isScreenerSyncingRef.current
+                || resourceRolesResult.isLoading
+                || challengeResourcesResult.isLoading
+                || challengeResourcesResult.isError
+                || hasMissingScreenerRole
+                || hasUnresolvedScreenerAssignment
+            ) {
+                return
+            }
+
+            const normalizedSelectedMemberId = normalizeText(selectedMemberId)
+            const previousAssignments = screenerReviewerEntries.map(entry => ({
+                additionalMemberIds: entry.reviewer.additionalMemberIds,
+                fieldIndex: entry.fieldIndex,
+                handle: entry.reviewer.handle,
+                memberId: entry.reviewer.memberId,
+                roleId: entry.reviewer.roleId,
+            }))
+
+            screenerReviewerEntries.forEach(entry => {
+                const targetRoleId = screenerResourceTargets
+                    .find(target => target.roleName === entry.roleName)
+                    ?.roleId
+
+                formContext.setValue(
+                    `reviewers.${entry.fieldIndex}.memberId` as any,
+                    normalizedSelectedMemberId || undefined,
+                    {
+                        shouldDirty: true,
+                        shouldValidate: true,
+                    },
+                )
+                formContext.setValue(
+                    `reviewers.${entry.fieldIndex}.additionalMemberIds` as any,
+                    undefined,
+                    {
+                        shouldDirty: true,
+                        shouldValidate: true,
+                    },
+                )
+                formContext.setValue(
+                    `reviewers.${entry.fieldIndex}.handle` as any,
+                    undefined,
+                    {
+                        shouldDirty: true,
+                        shouldValidate: false,
+                    },
+                )
+
+                if (targetRoleId) {
+                    formContext.setValue(
+                        `reviewers.${entry.fieldIndex}.roleId` as any,
+                        targetRoleId,
+                        {
+                            shouldDirty: true,
+                            shouldValidate: false,
+                        },
+                    )
+                }
+            })
+
+            if (
+                !normalizedChallengeId
+                || !screenerResourceTargets.length
+            ) {
+                return
+            }
+
+            isScreenerSyncingRef.current = true
+            setIsScreenerSyncing(true)
+            syncScreenerResourceAssignments({
+                challengeId: normalizedChallengeId,
+                selectedMemberId: normalizedSelectedMemberId,
+                targets: screenerResourceTargets,
+            })
+                .then(() => refreshChallengeResources())
+                .catch(error => {
+                    previousAssignments.forEach(assignment => {
+                        const reviewerPrefix = `reviewers.${assignment.fieldIndex}`
+
+                        formContext.setValue(
+                            `${reviewerPrefix}.memberId` as any,
+                            assignment.memberId,
+                            {
+                                shouldDirty: true,
+                                shouldValidate: true,
+                            },
+                        )
+                        formContext.setValue(
+                            `${reviewerPrefix}.additionalMemberIds` as any,
+                            assignment.additionalMemberIds,
+                            {
+                                shouldDirty: true,
+                                shouldValidate: true,
+                            },
+                        )
+                        formContext.setValue(
+                            `${reviewerPrefix}.handle` as any,
+                            assignment.handle,
+                            {
+                                shouldDirty: true,
+                                shouldValidate: false,
+                            },
+                        )
+                        formContext.setValue(
+                            `${reviewerPrefix}.roleId` as any,
+                            assignment.roleId,
+                            {
+                                shouldDirty: true,
+                                shouldValidate: false,
+                            },
+                        )
+                    })
+                    handleResourceError(error, 'Failed to update screener assignment')
+                })
+                .finally(() => {
+                    isScreenerSyncingRef.current = false
+                    setIsScreenerSyncing(false)
+                })
+        },
+        [
+            challengeResourcesResult.isError,
+            challengeResourcesResult.isLoading,
+            formContext,
+            handleResourceError,
+            hasMissingScreenerRole,
+            hasUnresolvedScreenerAssignment,
+            normalizedChallengeId,
+            refreshChallengeResources,
+            resourceRolesResult.isLoading,
+            screenerResourceTargets,
+            screenerReviewerEntries,
+        ],
+    )
+
     const syncReviewerScorecardForPhase = useCallback(
         (reviewerIndex: number, reviewer: Reviewer, nextPhaseId: string): void => {
             const fieldIndex = getReviewerFieldIndex(reviewerIndex)
@@ -1938,6 +2558,53 @@ export const HumanReviewTab: FC = () => {
         [handleMemberSelectionChange],
     )
 
+    if (props.screenerOnly) {
+        const isScreenerAssignmentRequired = screenerReviewerEntries.some(entry => (
+            !isScreenerAssignmentOptional(entry.reviewer, phases)
+        ))
+        const isScreenerFieldLoading = resourceRolesResult.isLoading
+            || challengeResourcesResult.isLoading
+        const screenerConfigurationError = !isScreenerFieldLoading && (
+            challengeResourcesResult.isError
+                ? 'Unable to load screener assignments.'
+                : hasUnresolvedScreenerAssignment
+                    ? 'Unable to resolve the current screener assignment.'
+                    : !primaryScreenerReviewerEntry
+                        ? 'Screener configuration is unavailable.'
+                        : hasMissingScreenerRole
+                            ? 'Unable to load all screener roles.'
+                            : undefined
+        )
+
+        return (
+            <div className={styles.screenerOnlyContainer}>
+                {loadError
+                    ? <div className={styles.error}>{loadError}</div>
+                    : undefined}
+                {screenerConfigurationError
+                    ? <div className={styles.error}>{screenerConfigurationError}</div>
+                    : undefined}
+                {primaryScreenerReviewerEntry
+                    ? (
+                        <FormUserAutocomplete
+                            disabled={isScreenerFieldLoading
+                                || isScreenerSyncing
+                                || challengeResourcesResult.isError
+                                || hasMissingScreenerRole
+                                || hasUnresolvedScreenerAssignment}
+                            label='Screener'
+                            name={`reviewers.${primaryScreenerReviewerEntry.fieldIndex}.memberId`}
+                            onValueChange={handleScreenerSelectionChange}
+                            placeholder='Select user'
+                            required={isScreenerAssignmentRequired}
+                            valueField='userId'
+                        />
+                    )
+                    : undefined}
+            </div>
+        )
+    }
+
     return (
         <div className={styles.container}>
             <div className={styles.summary}>
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.module.scss b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.module.scss
index 56a7bb83d..e0876150f 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.module.scss
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.module.scss
@@ -51,6 +51,21 @@
     margin-top: 16px;
 }
 
+.reviewContextActions {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    width: 100%;
+    justify-content: center;
+}
+
+@media (min-width: 640px) {
+    .reviewContextActions {
+        flex-direction: row;
+        justify-content: center;
+    }
+}
+
 .regenerateToolbar {
     display: flex;
     justify-content: space-between;
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.spec.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.spec.tsx
index da5873480..15081ed93 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.spec.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.spec.tsx
@@ -148,4 +148,25 @@ describe('ReviewContextTab', () => {
         expect(screen.getByText('This will delete the existing review context and generate a new one.'))
             .toBeInTheDocument()
     })
+
+    it('renders the manual manage button when no context exists', () => {
+        mockUseFetchChallengeReviewContext.mockReturnValue({
+            context: undefined,
+            error: undefined,
+            isError: false,
+            isLoading: false,
+            mutate: jest.fn(),
+        })
+
+        render(
+            <ReviewContextTab
+                challengeId='challenge-1'
+                challengeDescription={'A'.repeat(120)}
+                challengeStatus={undefined}
+            />,
+        )
+
+        expect(screen.getByRole('button', { name: 'Manage Review Context' }))
+            .toBeInTheDocument()
+    })
 })
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.tsx
index 33f8991ed..77a76e053 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewContextTab/ReviewContextTab.tsx
@@ -83,6 +83,16 @@ const ReviewContextTab: FC<ReviewContextTabProps> = props => {
         await refetchContext()
     }, [props.challengeId, refetchContext])
 
+    const createManualReviewContext = useCallback(async (): Promise<void> => {
+        await createChallengeReviewContext({
+            challengeId: props.challengeId || '',
+            context: { requirements: [] },
+            status: 'HUMAN_APPROVED',
+        })
+
+        await refetchContext()
+    }, [props.challengeId, refetchContext])
+
     const handleGenerateClick = useCallback(async (): Promise<void> => {
         if (!props.challengeId) {
             showErrorToast('Please save the challenge before generating review context.')
@@ -107,6 +117,30 @@ const ReviewContextTab: FC<ReviewContextTabProps> = props => {
         }
     }, [createGeneratedReviewContext])
 
+    const handleManageClick = useCallback(async (): Promise<void> => {
+        if (!props.challengeId) {
+            showErrorToast('Please save the challenge before managing review context.')
+            return
+        }
+
+        setIsSaving(true)
+        setSaveError(undefined)
+
+        try {
+            await createManualReviewContext()
+            showSuccessToast('Review context created. You can now edit it manually.')
+        } catch (error) {
+            const message = error instanceof Error
+                ? error.message
+                : 'Failed to create review context.'
+
+            setSaveError(message)
+            showErrorToast(message)
+        } finally {
+            setIsSaving(false)
+        }
+    }, [createManualReviewContext])
+
     const handleConfirmRegenerate = useCallback(async (): Promise<void> => {
         if (!props.challengeId) {
             showErrorToast('Please save the challenge before regenerating review context.')
@@ -159,12 +193,21 @@ const ReviewContextTab: FC<ReviewContextTabProps> = props => {
                         </div>
                     ) : (
                         <>
-                            <Button
-                                disabled={isSaving || blockGenerate}
-                                label={isSaving ? 'Generating context...' : 'Generate Challenge Review Context'}
-                                onClick={handleGenerateClick}
-                                size='lg'
-                            />
+                            <div className={styles.reviewContextActions}>
+                                <Button
+                                    disabled={isSaving || blockGenerate}
+                                    label={isSaving ? 'Generating context...' : 'Generate Challenge Review Context'}
+                                    onClick={handleGenerateClick}
+                                    size='lg'
+                                />
+                                <Button
+                                    disabled={isSaving || blockGenerate}
+                                    label='Manage Review Context'
+                                    onClick={handleManageClick}
+                                    secondary
+                                    size='lg'
+                                />
+                            </div>
                             {saveError && (
                                 <div className={styles.errorText}>
                                     <p>{saveError}</p>
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.module.scss b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.module.scss
index 26f1fc301..e7420b5d4 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.module.scss
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.module.scss
@@ -72,6 +72,16 @@
     gap: 16px;
 }
 
+.screenerOnlyContainer {
+    max-width: 420px;
+}
+
+.fullReviewToggle {
+    display: flex;
+    justify-content: flex-start;
+    margin-bottom: 16px;
+}
+
 .summary {
     color: #555;
     display: flex;
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.spec.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.spec.tsx
index f6593b896..71e9ff3fe 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.spec.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.spec.tsx
@@ -27,9 +27,34 @@ jest.mock('../../../../../lib/services', () => ({
     patchChallenge: jest.fn(),
 }))
 
+jest.mock('~/libs/ui', () => ({
+    Button: (props: {
+        disabled?: boolean
+        label: string
+        onClick?: () => void
+    }) => (
+        <button
+            disabled={props.disabled}
+            onClick={props.onClick}
+            type='button'
+        >
+            {props.label}
+        </button>
+    ),
+}), {
+    virtual: true,
+})
+
 jest.mock('./HumanReviewTab', () => ({
     __esModule: true,
-    default: () => <div data-testid='human-review-tab'>Human review content</div>,
+    default: (props: { screenerOnly?: boolean }) => (
+        <div
+            data-screener-only={props.screenerOnly === true ? 'true' : 'false'}
+            data-testid='human-review-tab'
+        >
+            Human review content
+        </div>
+    ),
 }))
 jest.mock('./AiReviewTab', () => ({
     __esModule: true,
@@ -89,11 +114,14 @@ jest.mock('./ReviewContextTab', () => ({
 
 const mockedPatchChallenge = jest.spyOn(services, 'patchChallenge')
     .mockResolvedValue({} as any)
+const mockedFetchAiReviewConfigByChallenge = services.fetchAiReviewConfigByChallenge as jest.Mock
 
 interface TestHarnessProps {
+    canConfigureFullReview?: boolean
     isReadOnly?: boolean
     numOfSubmissions?: number
     reviewers: Reviewer[]
+    screenerOnly?: boolean
 }
 
 const TestHarness = (props: TestHarnessProps): JSX.Element => {
@@ -107,11 +135,22 @@ const TestHarness = (props: TestHarnessProps): JSX.Element => {
             typeId: 'type-id',
         },
     })
-    const reviewersField = <ReviewersField isReadOnly={props.isReadOnly} />
+    const reviewersField = (
+        <ReviewersField
+            canConfigureFullReview={props.canConfigureFullReview}
+            isReadOnly={props.isReadOnly}
+            screenerOnly={props.screenerOnly}
+        />
+    )
+
+    const reviewersFormError = formMethods.formState.errors.reviewers?.message
 
     return (
         <FormProvider {...formMethods}>
             {reviewersField}
+            {reviewersFormError
+                ? <div data-testid='reviewers-form-error'>{reviewersFormError}</div>
+                : undefined}
         </FormProvider>
     )
 }
@@ -119,9 +158,82 @@ const TestHarness = (props: TestHarnessProps): JSX.Element => {
 describe('ReviewersField', () => {
     beforeEach(() => {
         jest.clearAllMocks()
+        mockedFetchAiReviewConfigByChallenge.mockResolvedValue(undefined)
         mockedPatchChallenge.mockResolvedValue({} as Challenge)
     })
 
+    it('renders only the screener assignment in editable screener-only mode', () => {
+        render(
+            <TestHarness
+                reviewers={[]}
+                screenerOnly
+            />,
+        )
+
+        expect(screen.getByTestId('human-review-tab')
+            .getAttribute('data-screener-only'))
+            .toBe('true')
+        expect(screen.queryByRole('tablist'))
+            .toBeNull()
+        expect(screen.queryByTestId('ai-review-tab'))
+            .toBeNull()
+        expect(screen.queryByTestId('review-context-tab'))
+            .toBeNull()
+        expect(screen.queryByTestId('review-summary'))
+            .toBeNull()
+        expect(screen.queryByText('Manual review configuration is required.'))
+            .toBeNull()
+        expect(screen.queryByRole('button', { name: 'Show advanced review configuration' }))
+            .toBeNull()
+    })
+
+    it('starts collapsed for administrators and reveals the full configuration on demand', async () => {
+        const user = userEvent.setup()
+
+        render(
+            <TestHarness
+                canConfigureFullReview
+                reviewers={[]}
+                screenerOnly
+            />,
+        )
+
+        expect(screen.getByTestId('human-review-tab')
+            .getAttribute('data-screener-only'))
+            .toBe('true')
+        expect(screen.queryByRole('tablist'))
+            .toBeNull()
+
+        await user.click(screen.getByRole('button', { name: 'Show advanced review configuration' }))
+
+        expect(screen.getByRole('tablist')).not.toBeNull()
+        expect(screen.getByTestId('human-review-tab')
+            .getAttribute('data-screener-only'))
+            .toBe('false')
+        expect(screen.getByTestId('ai-review-tab')).not.toBeNull()
+
+        await user.click(screen.getByRole('button', { name: 'Hide advanced review configuration' }))
+
+        expect(screen.queryByRole('tablist'))
+            .toBeNull()
+        expect(screen.getByTestId('human-review-tab')
+            .getAttribute('data-screener-only'))
+            .toBe('true')
+    })
+
+    it('does not offer the advanced toggle outside the simplified review section', () => {
+        render(
+            <TestHarness
+                canConfigureFullReview
+                reviewers={[]}
+            />,
+        )
+
+        expect(screen.queryByRole('button', { name: 'Show advanced review configuration' }))
+            .toBeNull()
+        expect(screen.getByRole('tablist')).not.toBeNull()
+    })
+
     it('uses tab labels with reviewer counts and toggles between human and AI content', async () => {
         const user = userEvent.setup()
 
@@ -281,10 +393,28 @@ describe('ReviewersField', () => {
         await user.click(screen.getByRole('tab', { name: 'AI Review (0)' }))
         await user.click(screen.getByRole('button', { name: 'Persist AI config' }))
 
-        expect(screen.getByText(
-            'Manual review configuration is required.',
-        ))
-            .toBeInTheDocument()
+        expect(screen.getByTestId('reviewers-form-error').textContent)
+            .toBe('Manual review configuration is required.')
+    })
+
+    it('does not require manual reviewer configuration in the simplified screener view', async () => {
+        const user = userEvent.setup()
+
+        render(
+            <TestHarness
+                canConfigureFullReview
+                reviewers={[]}
+                screenerOnly
+            />,
+        )
+
+        await user.click(screen.getByRole('button', { name: 'Show advanced review configuration' }))
+        await user.click(screen.getByRole('tab', { name: 'AI Review (0)' }))
+        await user.click(screen.getByRole('button', { name: 'Persist AI config' }))
+        await user.click(screen.getByRole('button', { name: 'Hide advanced review configuration' }))
+
+        expect(screen.queryByTestId('reviewers-form-error'))
+            .toBeNull()
     })
 
     it('supports keyboard navigation between review tabs', async () => {
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.tsx
index fc65a2805..cf23869d1 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/ReviewersField.tsx
@@ -17,6 +17,7 @@ import {
 import classNames from 'classnames'
 
 import { ChallengeStatus } from '~/apps/admin/src/lib/models'
+import { Button } from '~/libs/ui'
 
 import * as services from '../../../../../lib/services'
 import {
@@ -40,8 +41,10 @@ const REVIEW_TAB = ['ai', 'human', 'context'] as const
 type ReviewTab = typeof REVIEW_TAB[number]
 
 interface ReviewersFieldProps {
+    canConfigureFullReview?: boolean
     isReadOnly?: boolean
     onConfigSaveControllerReady?: (controller: AiReviewConfigSaveController | undefined) => void
+    screenerOnly?: boolean
 }
 
 function hasReviewerChanges(
@@ -58,6 +61,7 @@ function hasReviewerChanges(
 export const ReviewersField: FC<ReviewersFieldProps> = (props: ReviewersFieldProps) => {
     const formContext = useFormContext<ChallengeEditorFormData>()
     const [activeTab, setActiveTab] = useState<ReviewTab>('human')
+    const [isFullReviewExpanded, setIsFullReviewExpanded] = useState<boolean>(false)
     const [aiReviewMode, setAiReviewMode] = useState<AiReviewMode | undefined>()
     const [hasLoadedAiConfig, setHasLoadedAiConfig] = useState<boolean>(false)
     const [reviewContextRequirementCount, setReviewContextRequirementCount] = useState<number | undefined>(undefined)
@@ -159,11 +163,17 @@ export const ReviewersField: FC<ReviewersFieldProps> = (props: ReviewersFieldPro
     const reviewContextLabel = reviewContextRequirementCount
         ? `Review Context (${reviewContextRequirementCount})`
         : 'Review Context'
+    /**
+     * The simplified Design review section exposes the screener assignment only.
+     * Administrators keep access to the complete configuration behind a toggle.
+     */
+    const showScreenerOnlyView = !!props.screenerOnly && !isFullReviewExpanded
+    const showFullReviewToggle = !!props.screenerOnly && !!props.canConfigureFullReview
     const aiGatingManualReviewError = useMemo(
-        () => (aiReviewMode !== 'AI_ONLY' && humanReviewersCount === 0
+        () => (!showScreenerOnlyView && aiReviewMode !== 'AI_ONLY' && humanReviewersCount === 0
             ? 'Manual review configuration is required.'
             : undefined),
-        [aiReviewMode, humanReviewersCount],
+        [aiReviewMode, humanReviewersCount, showScreenerOnlyView],
     )
 
     useEffect(() => {
@@ -188,6 +198,9 @@ export const ReviewersField: FC<ReviewersFieldProps> = (props: ReviewersFieldPro
     const handleTabChange = useCallback((tab: ReviewTab): void => {
         setActiveTab(tab)
     }, [])
+    const handleFullReviewToggle = useCallback((): void => {
+        setIsFullReviewExpanded(previousValue => !previousValue)
+    }, [])
     const focusTab = useCallback((tab: ReviewTab): void => {
         handleTabChange(tab)
 
@@ -324,7 +337,25 @@ export const ReviewersField: FC<ReviewersFieldProps> = (props: ReviewersFieldPro
                 )
                 : undefined}
 
-            {!props.isReadOnly
+            {!props.isReadOnly && showFullReviewToggle
+                ? (
+                    <div className={styles.fullReviewToggle}>
+                        <Button
+                            label={isFullReviewExpanded
+                                ? 'Hide advanced review configuration'
+                                : 'Show advanced review configuration'}
+                            onClick={handleFullReviewToggle}
+                            secondary
+                        />
+                    </div>
+                )
+                : undefined}
+
+            {!props.isReadOnly && showScreenerOnlyView
+                ? <HumanReviewTab screenerOnly />
+                : undefined}
+
+            {!props.isReadOnly && !showScreenerOnlyView
                 ? (
                     <>
                         <div
@@ -395,9 +426,9 @@ export const ReviewersField: FC<ReviewersFieldProps> = (props: ReviewersFieldPro
                         </div>
 
                         <fieldset className={styles.tabPanels}>
-                            {aiGatingManualReviewError && !errors.reviewers && (
-                                <p className={styles.error}>{aiGatingManualReviewError}</p>
-                            )}
+                            {aiGatingManualReviewError && !errors.reviewers
+                                ? <p className={styles.error}>{aiGatingManualReviewError}</p>
+                                : undefined}
                             <div
                                 aria-labelledby='reviewers-human-tab'
                                 className={classNames(
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/reviewerAssignments.utils.spec.ts b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/reviewerAssignments.utils.spec.ts
index fad7ff32c..5fe30605a 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/reviewerAssignments.utils.spec.ts
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ReviewersField/reviewerAssignments.utils.spec.ts
@@ -9,7 +9,7 @@ import {
 } from './reviewerAssignments.utils'
 
 describe('buildAssignedResourcesByReviewer', () => {
-    it('reserves generic reviewer resources for Review rows before Screening fallbacks', () => {
+    it('reserves generic reviewer resources for Review rows before screening phase fallbacks', () => {
         const resourceRoles: ResourceRole[] = [
             {
                 id: 'role-screener',
@@ -19,6 +19,10 @@ describe('buildAssignedResourcesByReviewer', () => {
                 id: 'role-reviewer',
                 name: 'Reviewer',
             },
+            {
+                id: 'role-checkpoint-screener',
+                name: 'Checkpoint Screener',
+            },
         ]
         const resources: Resource[] = [
             {
@@ -33,6 +37,11 @@ describe('buildAssignedResourcesByReviewer', () => {
                 phaseId: 'phase-screening',
                 roleId: 'role-reviewer',
             },
+            {
+                memberReviewerCount: 1,
+                phaseId: 'phase-checkpoint-screening',
+                roleId: 'role-reviewer',
+            },
             {
                 memberReviewerCount: 1,
                 phaseId: 'phase-review',
@@ -45,6 +54,10 @@ describe('buildAssignedResourcesByReviewer', () => {
                     'phase-screening',
                     'Screening',
                 ],
+                [
+                    'phase-checkpoint-screening',
+                    'Checkpoint Screening',
+                ],
                 [
                     'phase-review',
                     'Review',
@@ -58,6 +71,7 @@ describe('buildAssignedResourcesByReviewer', () => {
         expect(assignedResourcesByReviewer.map(assignedResources => assignedResources
             .map(resource => resource.memberHandle)))
             .toEqual([
+                [],
                 [],
                 ['reviewer-one'],
             ])
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.spec.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.spec.tsx
new file mode 100644
index 000000000..f8053a4a1
--- /dev/null
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.spec.tsx
@@ -0,0 +1,179 @@
+/* eslint-disable import/no-extraneous-dependencies, ordered-imports/ordered-imports */
+import { FC } from 'react'
+import {
+    render,
+    screen,
+    waitFor,
+} from '@testing-library/react'
+import '@testing-library/jest-dom'
+import userEvent from '@testing-library/user-event'
+import {
+    FormProvider,
+    useForm,
+    useWatch,
+} from 'react-hook-form'
+
+import {
+    ChallengeEditorFormData,
+    ChallengeMetadata,
+} from '../../../../../lib/models'
+
+import { ShowDashboardField } from './ShowDashboardField'
+
+interface MockFormCheckboxFieldProps {
+    label: string
+    name: string
+    onChange?: (checked: boolean) => void
+}
+
+jest.mock('../../../../../lib/components/form', () => ({
+    FormCheckboxField: function MockFormCheckboxField(props: MockFormCheckboxFieldProps) {
+        const reactHookForm: typeof import('react-hook-form') = jest.requireActual('react-hook-form')
+        const formContext = reactHookForm.useFormContext()
+        const controller = reactHookForm.useController({
+            control: formContext.control,
+            name: props.name,
+        })
+
+        function handleChange(event: { target: { checked: boolean } }): void {
+            controller.field.onChange(event.target.checked)
+            props.onChange?.(event.target.checked)
+        }
+
+        return (
+            <input
+                aria-label={props.label}
+                checked={controller.field.value === true}
+                name={props.name}
+                onChange={handleChange}
+                type='checkbox'
+            />
+        )
+    },
+}))
+
+interface TestHarnessProps {
+    defaultMetadata?: ChallengeMetadata[]
+    funChallenge?: boolean
+}
+
+const MetadataWatcher: FC = () => {
+    const metadata = useWatch<ChallengeEditorFormData>({
+        name: 'metadata',
+    })
+
+    return <output data-testid='metadata-value'>{JSON.stringify(metadata || [])}</output>
+}
+
+const TestHarness: FC<TestHarnessProps> = (props: TestHarnessProps) => {
+    const formMethods = useForm<ChallengeEditorFormData>({
+        defaultValues: {
+            description: 'Public challenge specification',
+            funChallenge: props.funChallenge,
+            metadata: props.defaultMetadata,
+            name: 'Challenge',
+            skills: [],
+            tags: [],
+            trackId: 'track-id',
+            typeId: 'type-id',
+        },
+    })
+
+    return (
+        <FormProvider {...formMethods}>
+            <ShowDashboardField />
+            <MetadataWatcher />
+        </FormProvider>
+    )
+}
+
+const SHOW_DASHBOARD_LABEL = 'Show Dashboard'
+const SHOW_DATA_DASHBOARD_METADATA_FIELD = 'show_data_dashboard'
+
+describe('ShowDashboardField', () => {
+    it('leaves the dashboard disabled for standard marathon matches', async () => {
+        render(<TestHarness funChallenge={false} />)
+
+        await waitFor(() => {
+            expect(screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL }))
+                .not
+                .toBeChecked()
+        })
+        expect(screen.getByTestId('metadata-value').textContent)
+            .toBe('[]')
+    })
+
+    it('defaults fun challenges to an enabled dashboard and persists the metadata', async () => {
+        render(
+            <TestHarness
+                defaultMetadata={[{
+                    name: 'existingMetadata',
+                    value: 'keep-me',
+                }]}
+                funChallenge
+            />,
+        )
+
+        await waitFor(() => {
+            expect(screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL }))
+                .toBeChecked()
+        })
+        expect(screen.getByTestId('metadata-value').textContent)
+            .toBe(JSON.stringify([
+                {
+                    name: 'existingMetadata',
+                    value: 'keep-me',
+                },
+                {
+                    name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+                    value: 'true',
+                },
+            ]))
+    })
+
+    it('restores the saved value instead of the fun-challenge default', async () => {
+        const metadata = [{
+            name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+            value: 'false',
+        }]
+
+        render(<TestHarness defaultMetadata={metadata} funChallenge />)
+
+        await waitFor(() => {
+            expect(screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL }))
+                .not
+                .toBeChecked()
+        })
+        expect(screen.getByTestId('metadata-value').textContent)
+            .toBe(JSON.stringify(metadata))
+    })
+
+    it('persists exact string booleans when the checkbox is toggled', async () => {
+        const user = userEvent.setup()
+
+        render(<TestHarness funChallenge={false} />)
+
+        const showDashboardCheckbox = screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL })
+
+        await user.click(showDashboardCheckbox)
+
+        expect(showDashboardCheckbox)
+            .toBeChecked()
+        expect(screen.getByTestId('metadata-value').textContent)
+            .toBe(JSON.stringify([{
+                name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+                value: 'true',
+            }]))
+
+        await user.click(showDashboardCheckbox)
+
+        expect(showDashboardCheckbox)
+            .not
+            .toBeChecked()
+        expect(screen.getByTestId('metadata-value').textContent)
+            .toBe(JSON.stringify([{
+                name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+                value: 'false',
+            }]))
+    })
+})
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.tsx
new file mode 100644
index 000000000..29ace116a
--- /dev/null
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.tsx
@@ -0,0 +1,144 @@
+import {
+    FC,
+    useCallback,
+    useEffect,
+} from 'react'
+import {
+    useFormContext,
+    useWatch,
+} from 'react-hook-form'
+
+import { FormCheckboxField } from '../../../../../lib/components/form'
+import {
+    ChallengeEditorFormData,
+    ChallengeMetadata,
+} from '../../../../../lib/models'
+import {
+    booleanToMetadata,
+    getMetadataValue,
+    metadataToBoolean,
+} from '../../../../../lib/utils/metadata.utils'
+
+export const SHOW_DATA_DASHBOARD_METADATA_FIELD = 'show_data_dashboard'
+const SHOW_DATA_DASHBOARD_TOGGLE_FIELD = 'showDataDashboardToggle'
+
+interface ShowDashboardFieldProps {
+    disabled?: boolean
+}
+
+/**
+ * Renders the Marathon Match data dashboard toggle in the Advanced Options section.
+ *
+ * Fun challenges default to an enabled dashboard when the challenge has no saved
+ * `show_data_dashboard` metadata, matching how Marathon Matches are normally set up. Saved metadata
+ * always wins so a copilot can turn the dashboard off again.
+ *
+ * @param props field state supplied by the challenge editor, including read-only disablement.
+ * @returns A checkbox that persists the `show_data_dashboard` challenge metadata flag.
+ * @throws Does not throw.
+ */
+export const ShowDashboardField: FC<ShowDashboardFieldProps> = (props: ShowDashboardFieldProps) => {
+    const formContext = useFormContext<ChallengeEditorFormData>()
+    const dynamicFormControl = formContext.control as any
+    const metadata = useWatch({
+        control: dynamicFormControl,
+        name: 'metadata',
+    }) as ChallengeMetadata[] | undefined
+    const funChallenge = useWatch({
+        control: dynamicFormControl,
+        name: 'funChallenge',
+    }) as boolean | undefined
+    const showDataDashboardToggle = useWatch({
+        control: dynamicFormControl,
+        name: SHOW_DATA_DASHBOARD_TOGGLE_FIELD,
+    }) as boolean | undefined
+
+    const hasSavedDashboardFlag = getMetadataValue(
+        metadata,
+        SHOW_DATA_DASHBOARD_METADATA_FIELD,
+    ) !== undefined
+    const isDashboardShown = hasSavedDashboardFlag
+        ? metadataToBoolean(metadata, SHOW_DATA_DASHBOARD_METADATA_FIELD)
+        : funChallenge === true
+
+    // Persist the fun-challenge default so saving the challenge keeps the dashboard enabled.
+    useEffect(() => {
+        if (hasSavedDashboardFlag || !isDashboardShown) {
+            return
+        }
+
+        formContext.setValue(
+            'metadata',
+            booleanToMetadata(
+                metadata,
+                SHOW_DATA_DASHBOARD_METADATA_FIELD,
+                true,
+            ),
+            {
+                shouldDirty: false,
+                shouldValidate: false,
+            },
+        )
+    }, [
+        formContext,
+        hasSavedDashboardFlag,
+        isDashboardShown,
+        metadata,
+    ])
+
+    useEffect(() => {
+        if (showDataDashboardToggle !== undefined) {
+            return
+        }
+
+        formContext.setValue(
+            SHOW_DATA_DASHBOARD_TOGGLE_FIELD as never,
+            isDashboardShown as never,
+            {
+                shouldDirty: false,
+                shouldValidate: false,
+            },
+        )
+    }, [
+        formContext,
+        isDashboardShown,
+        showDataDashboardToggle,
+    ])
+
+    const handleShowDashboardChange = useCallback((checked: boolean): void => {
+        if (hasSavedDashboardFlag && checked === isDashboardShown) {
+            return
+        }
+
+        formContext.setValue(
+            'metadata',
+            booleanToMetadata(
+                metadata,
+                SHOW_DATA_DASHBOARD_METADATA_FIELD,
+                checked,
+            ),
+            {
+                shouldDirty: true,
+                shouldValidate: true,
+            },
+        )
+    }, [
+        formContext,
+        hasSavedDashboardFlag,
+        isDashboardShown,
+        metadata,
+    ])
+
+    return (
+        <FormCheckboxField
+            checkboxOnlyHitArea
+            disabled={props.disabled}
+            hint='Shows the data dashboard graph on the challenge details page.'
+            label='Show Dashboard'
+            name={SHOW_DATA_DASHBOARD_TOGGLE_FIELD}
+            onChange={handleShowDashboardChange}
+        />
+    )
+}
+
+export default ShowDashboardField
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/index.ts b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/index.ts
new file mode 100644
index 000000000..76c760683
--- /dev/null
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/index.ts
@@ -0,0 +1 @@
+export * from './ShowDashboardField'
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts
index 8154d1983..a70e4f2ae 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts
@@ -30,6 +30,7 @@ export * from './ReviewersField'
 export * from './ReviewTypeField'
 export * from './ResourcesSection'
 export * from './RoundTypeField'
+export * from './ShowDashboardField'
 export * from './StockArtsField'
 export * from './SubmissionsSection'
 export * from './SubmissionTypeField'
diff --git a/src/apps/work/src/pages/engagements/EngagementDetailsPage/EngagementDetailsPage.module.scss b/src/apps/work/src/pages/engagements/EngagementDetailsPage/EngagementDetailsPage.module.scss
index ea4ff84e3..4da57dc47 100644
--- a/src/apps/work/src/pages/engagements/EngagementDetailsPage/EngagementDetailsPage.module.scss
+++ b/src/apps/work/src/pages/engagements/EngagementDetailsPage/EngagementDetailsPage.module.scss
@@ -81,13 +81,119 @@
     font-size: 14px;
     line-height: 1.5;
 
-    :global(p) {
-        margin: 0 0 12px;
+    // Element tags are not hashed by CSS Modules; avoid nested :global(...)
+    // which Sass can leave as a literal pseudo that never matches.
+    p {
+        margin: 0 0 15px;
     }
 
-    :global(p:last-child) {
+
+
+    ul,
+    ol {
+        margin: 0 0 20px;
+        padding-left: 24px;
+        list-style-position: outside;
+    }
+
+    ul {
+        list-style-type: disc;
+    }
+
+    ol {
+        list-style-type: decimal;
+    }
+
+    li {
+        margin-bottom: 6px;
+    }
+
+    li:last-child {
         margin-bottom: 0;
     }
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+        font-family: inherit;
+        text-transform: none;
+        letter-spacing: normal;
+        color: #2a2a2a;
+    }
+
+    h1 {
+        margin: 28px 0 14px;
+        font-size: 1.4rem;
+        font-weight: 700;
+        line-height: 1.3;
+    }
+
+    h2 {
+        margin: 24px 0 14px;
+        font-size: 1.25rem;
+        font-weight: 700;
+        line-height: 1.3;
+    }
+
+    h3 {
+        margin: 22px 0 12px;
+        font-size: 1.1rem;
+        font-weight: 600;
+        line-height: 1.35;
+    }
+
+    h4,
+    h5,
+    h6 {
+        margin: 20px 0 12px;
+        font-size: 1rem;
+        font-weight: 600;
+        line-height: 1.4;
+    }
+
+    strong {
+        color: #2a2a2a;
+    }
+
+    a {
+        color: $link-blue-dark;
+        text-decoration: underline;
+    }
+
+    blockquote {
+        margin: 0 0 20px;
+        padding-left: 12px;
+        border-left: 3px solid #d8dee8;
+        color: #5b5b5b;
+    }
+
+    code {
+        font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace;
+        font-size: 0.9em;
+        background: #f5f7fa;
+        border: 1px solid #d8dee8;
+        border-radius: 6px;
+        padding: 1px 4px;
+    }
+
+    pre {
+        margin: 0 0 20px;
+        background: #f5f7fa;
+        border: 1px solid #d8dee8;
+        border-radius: 12px;
+        padding: 12px;
+        overflow-x: auto;
+    }
+
+    pre code {
+        background: transparent;
+        border: none;
+        padding: 0;
+        font-size: 0.9rem;
+    }
 }
 
 .skills {
diff --git a/src/apps/work/src/pages/engagements/EngagementPaymentPage/EngagementPaymentPage.tsx b/src/apps/work/src/pages/engagements/EngagementPaymentPage/EngagementPaymentPage.tsx
index 00310dd07..fc600120c 100644
--- a/src/apps/work/src/pages/engagements/EngagementPaymentPage/EngagementPaymentPage.tsx
+++ b/src/apps/work/src/pages/engagements/EngagementPaymentPage/EngagementPaymentPage.tsx
@@ -1125,7 +1125,11 @@ export const EngagementPaymentPage: FC = () => {
                                                     {formatAssignmentDaysLeftInEngagement(
                                                         assignment.startDate,
                                                         assignment.durationMonths,
-                                                        engagementResult.engagement?.status,
+                                                        String(assignment.status || '')
+                                                            .trim()
+                                                            .toUpperCase() === 'TERMINATED'
+                                                            ? assignment.status
+                                                            : engagementResult.engagement?.status,
                                                     )}
                                                 </span>
                                             </div>