diff --git a/packages/react-components/theme-designer/src/components/Demo/Demo.tsx b/packages/react-components/theme-designer/src/components/Demo/Demo.tsx
index ef485f4c16147..61ca57cccdeb6 100644
--- a/packages/react-components/theme-designer/src/components/Demo/Demo.tsx
+++ b/packages/react-components/theme-designer/src/components/Demo/Demo.tsx
@@ -90,34 +90,101 @@ const useStyles = makeStyles({
 		3) Note that the spinner was removed since it was causing confusing with the loading state of the page
 */
 
-export const Column1 = () => {
+const AvatarSection = () => {
   const styles = useStyles();
-  const dropdownId = useId('dropdown-default');
   return (
-    <div className={styles.column}>
-      <div className={styles.avatar}>
-        <Persona
-          name="Cameron Evans"
-          secondaryText="Senior Researcher at Contoso"
-          avatar={{ color: 'brand', badge: { status: 'available' } }}
-        />
-      </div>
+    <div className={styles.avatar}>
+      <Persona
+        name="Cameron Evans"
+        secondaryText="Senior Researcher at Contoso"
+        avatar={{ color: 'brand', badge: { status: 'available' } }}
+      />
+    </div>
+  );
+};
+
+const TabSection = () => {
+  const tabValues = ['Home', 'Pages', 'Documents'];
+    return (
       <TabList defaultSelectedValue="tab1">
-        <Tab value="tab1">Home</Tab>
-        <Tab value="tab2">Pages</Tab>
-        <Tab value="tab3">Documents</Tab>
+      {tabValues.map((tab, index) => (
+        <Tab key={index} value={`tab${index + 1}`}>{tab}</Tab>
+      ))}
       </TabList>
-      <Field>
-        <Input
-          placeholder="Find"
-          contentAfter={<Button aria-label="Find" appearance="transparent" icon={<SearchRegular />} size="small" />}
-        />
+    );
+};
+
+const InputSection = () => {
+  const dropdownId = useId('dropdown-default');
+  const optionValues = ['Option 1', 'Option 2', 'Option 3'];
+  return (
+    <>
+    <Field>
+      <Input
+        placeholder="Find"
+        contentAfter={<Button aria-label="Find" appearance="transparent" icon={<SearchRegular />} size="small" />}
+      />
+    </Field>
+    <Dropdown aria-labelledby={dropdownId} placeholder="Select" inlinePopup>
+        {optionValues.map((option, index) => (
+          <Option key={index} value={option}>
+            {option}
+          </Option>
+        ))}
+    </Dropdown>
+    </>
+  )
+};
+
+const ControlRow = () => {
+  const styles = useStyles();
+  return (
+    <div className={styles.controlRow}>
+      <Button appearance="primary">Text</Button>
+      <div className={styles.controlColumn}>
+        <Switch defaultChecked={true} label="On" />
+        <Switch label="Off" />
+      </div>
+    </div>
+  );
+};
+
+const CheckboxSection = () => {
+  const styles = useStyles();
+  return (
+    <div className={styles.controlRow}>
+      <div className={styles.controlColumn}>
+        <Checkbox defaultChecked={true} label="Option 1" />
+        <Checkbox label="Option 2" />
+      </div>
+      <div className={styles.controlColumn}>
+        <RadioGroup>
+          <Radio defaultChecked={true} label="Option 1" />
+          <Radio label="Option 2" />
+        </RadioGroup>
+      </div>
+    </div>
+  );
+};
+
+const DescriptionSection = () => {
+  const styles = useStyles();
+  return (
+    <div className={styles.inputLabel}>
+      <Field label="Description" required>
+        <Input placeholder="Example Text" appearance="filled-darker" />
       </Field>
-      <Dropdown aria-labelledby={dropdownId} placeholder="Select" inlinePopup>
-        <Option value="Action 1">Action 1</Option>
-        <Option value="Action 2">Action 2 </Option>
-        <Option value="Action 3">Action 3</Option>
-      </Dropdown>
+    </div>
+  );
+};
+
+export const Column1 = () => {
+  const styles = useStyles();
+  return (
+    <div className={styles.column}>
+      <AvatarSection />
+      <TabSection />
+      <InputSection />
     </div>
   );
 };
@@ -126,26 +193,9 @@ export const Column2 = () => {
   const styles = useStyles();
   return (
     <div className={styles.column}>
-      <div className={styles.controlRow}>
-        <Button appearance="primary">Text</Button>
-        <div className={styles.controlColumn}>
-          <Switch defaultChecked={true} label="On" />
-          <Switch label="Off" />
-        </div>
-      </div>
+      <ControlRow />
       <Slider defaultValue={50} />
-      <div className={styles.controlRow}>
-        <div className={styles.controlColumn}>
-          <Checkbox defaultChecked={true} label="Option 1" />
-          <Checkbox label="Option 2" />
-        </div>
-        <div className={styles.controlColumn}>
-          <RadioGroup>
-            <Radio defaultChecked={true} label="Option 1" />
-            <Radio label="Option 2" />
-          </RadioGroup>
-        </div>
-      </div>
+      <CheckboxSection />
     </div>
   );
 };
@@ -170,12 +220,8 @@ export const Column3 = () => {
 
   return (
     <div className={styles.column}>
-      <div className={styles.inputLabel}>
-        <Field label="Description" required>
-          <Input placeholder="Example Text" appearance="filled-darker" />
-        </Field>
-      </div>
-      <Link href="https://www.microsoft.com">Example link - www.microsoft.com</Link>
+     <DescriptionSection />
+     <Link href="https://www.microsoft.com">Example link - www.microsoft.com</Link>
     </div>
   );
 };
diff --git a/packages/react-components/theme-designer/src/components/Export/ExportPanel.tsx b/packages/react-components/theme-designer/src/components/Export/ExportPanel.tsx
index 4cf65bc0bdc2d..a6ff9d63aa03c 100644
--- a/packages/react-components/theme-designer/src/components/Export/ExportPanel.tsx
+++ b/packages/react-components/theme-designer/src/components/Export/ExportPanel.tsx
@@ -46,26 +46,85 @@ const useStyles = makeStyles({
     height: '100%',
     boxSizing: 'border-box',
   },
+  panelContainer: {
+    zIndex: 100,
+    position: 'absolute',
+    top: '0px',
+    right: '0px',
+    width: '400px',
+    border: `1px solid ${tokens.colorNeutralStroke1}`,
+    borderRadius: tokens.borderRadiusXLarge,
+    backgroundColor: tokens.colorNeutralBackground1,
+    boxShadow: tokens.shadow64,
+    padding: '16px',
+  }
 });
 
+const ExportPanelHeader = ({ onClose }: { onClose: () => void }) => {
+  const styles = useStyles();
+  return (
+    <div className={styles.exportHeader}>
+      <Text as="h1" id="headingID" size={500}>
+        Export Theme
+      </Text>
+      <Button size="small" appearance="subtle" icon={<DismissSquare24Regular />} onClick={onClose} />
+    </div>
+  );
+};
+
+const ExportPanelContent = ({
+  selectedValue,
+  onTabSelect,
+  exportedValue,
+  onClickCopyToClipboard,
+}: {
+  selectedValue: TabValue;
+  onTabSelect: (event: SelectTabEvent, data: SelectTabData) => void;
+  exportedValue: string;
+  onClickCopyToClipboard: () => void;
+}) => {
+  const styles = useStyles();
+  return (
+    <>
+      <Body1>
+        Passing this theme to a FluentProvider will automatically apply it to any Fluent components below it. You can
+        also export this to CodeSandbox with a few component examples below.
+      </Body1>
+      <br />
+      <TabList defaultSelectedValue="Code" selectedValue={selectedValue} onTabSelect={onTabSelect}>
+        <Tab value="Code">Code</Tab>
+        <Tab value="JSONLight">JSON (light)</Tab>
+        <Tab value="JSONDark">JSON (dark)</Tab>
+      </TabList>
+      <Textarea className={styles.text} size="small" value={exportedValue} id="textArea" textarea={{ className: styles.textarea }} readOnly />
+      <br />
+      <ExportLink />
+      <br />
+      <Button appearance="primary" onClick={onClickCopyToClipboard}>
+        Copy to clipboard
+      </Button>
+    </>
+  );
+};
+
 export const ExportPanel = () => {
   const {
     dispatch,
     state: { showExportPanel, themeName, brand, lightThemeOverrides, darkThemeOverrides },
   } = useThemeDesigner();
 
+  const [selectedValue, setSelectedValue] = React.useState<TabValue>('Code');
+
   const onCloseExportPanel = () => {
     dispatch({ type: 'showExportPanel', payload: false });
   };
 
-  const styles = useStyles();
-
-  const [selectedValue, setSelectedValue] = React.useState<TabValue>('Code');
-
   const onTabSelect = (event: SelectTabEvent, data: SelectTabData) => {
     setSelectedValue(data.value);
   };
 
+  const styles = useStyles();
+
   const codeValue = dedent`
   const ${themeName}: BrandVariants = { ${objectToString(brand, '\u00A0\u00A0')} };
 
@@ -75,24 +134,31 @@ export const ExportPanel = () => {
   const darkTheme: Theme = {
     ...createDarkTheme(${themeName}), ${getBrandValues(brand, darkThemeOverrides, themeName, '\u00A0\u00A0')} };
 
-
   darkTheme.colorBrandForeground1 = ${themeName}[110];
   darkTheme.colorBrandForeground2 = ${themeName}[120];
   `;
 
   const jsonLightValue = dedent`
-   ${JSON.stringify({ ...createLightTheme(brand), ...lightThemeOverrides }, null, '\t')}`;
+    ${JSON.stringify(
+      {
+        ...createLightTheme(brand),
+        ...lightThemeOverrides
+      },
+      null,
+      '\t'
+    )}
+  `;
 
   const jsonDarkValue = dedent`
-     ${JSON.stringify(
-       {
-         ...createDarkTheme(brand),
-         ...{ colorBrandForeground1: brand[110], colorBrandForeground2: brand[120] },
-         ...darkThemeOverrides,
-       },
-       null,
-       '\t',
-     )}
+    ${JSON.stringify(
+      {
+        ...createDarkTheme(brand),
+        ...{ colorBrandForeground1: brand[110], colorBrandForeground2: brand[120] },
+        ...darkThemeOverrides,
+      },
+      null,
+      '\t',
+    )}
   `;
 
   const exportedValue = React.useMemo(() => {
@@ -116,67 +182,15 @@ export const ExportPanel = () => {
     <>
       {showExportPanel && (
         <FluentProvider theme={webLightTheme}>
-          <div
-            style={{
-              zIndex: 100,
-              position: 'absolute',
-              top: '0px',
-              right: '0px',
-              width: '400px',
-              border: `1px solid ${tokens.colorNeutralStroke1}`,
-              borderRadius: tokens.borderRadiusXLarge,
-              backgroundColor: tokens.colorNeutralBackground1,
-              boxShadow: tokens.shadow64,
-            }}
-          >
-            <div style={{ margin: '16px' }}>
-              <div className={styles.exportHeader}>
-                <Text as="h1" id="headingID" size={500}>
-                  Export Theme
-                </Text>
-                <Button
-                  size="small"
-                  appearance="subtle"
-                  icon={<DismissSquare24Regular />}
-                  // eslint-disable-next-line react/jsx-no-bind
-                  onClick={onCloseExportPanel}
-                />
-              </div>
-
-              <br />
-              <Body1>
-                Passing this theme to a FluentProvider will automatically apply it to any Fluent components below it.
-                You can also export this to CodeSandbox with a few component examples below.
-              </Body1>
-              <br />
-              <TabList
-                defaultSelectedValue="Code"
-                selectedValue={selectedValue}
-                onTabSelect={onTabSelect} // eslint-disable-line react/jsx-no-bind
-              >
-                <Tab value="Code">Code</Tab>
-                <Tab value="JSONLight">JSON (light)</Tab>
-                <Tab value="JSONDark">JSON (dark)</Tab>
-              </TabList>
-              <Textarea
-                className={styles.text}
-                size="small"
-                value={exportedValue}
-                id={'textArea'}
-                textarea={{ className: styles.textarea }}
-                readOnly
-              />
-              <br />
-              <ExportLink />
-              <br />
-              <Button
-                appearance="primary"
-                // eslint-disable-next-line react/jsx-no-bind
-                onClick={onClickCopyToClipboard}
-              >
-                Copy to clipboard
-              </Button>
-            </div>
+          <div className={styles.panelContainer}>
+            <ExportPanelHeader onClose={onCloseExportPanel} />
+            <br />
+            <ExportPanelContent
+              selectedValue={selectedValue}
+              onTabSelect={onTabSelect}
+              exportedValue={exportedValue}
+              onClickCopyToClipboard={onClickCopyToClipboard}
+            />
           </div>
         </FluentProvider>
       )}
diff --git a/packages/react-components/theme-designer/src/components/Sidebar/Form.tsx b/packages/react-components/theme-designer/src/components/Sidebar/Form.tsx
index b6a71e81e2732..79d3fb04f8225 100644
--- a/packages/react-components/theme-designer/src/components/Sidebar/Form.tsx
+++ b/packages/react-components/theme-designer/src/components/Sidebar/Form.tsx
@@ -224,22 +224,6 @@ export const Form: React.FC = () => {
             </div>
           </AccordionPanel>
         </AccordionItem>
-        {/*
-        The accessibility check is not adequate for the theme designer.
-        Removing it for now because we don't want people proceeding with a false sense of security.
-        <AccordionItem value="2">
-          <AccordionHeader>
-            <Caption1Stronger>Step 2 - Accessibility checks</Caption1Stronger>
-          </AccordionHeader>
-          <AccordionPanel className={styles.accordionContainer}>
-            <Switch checked={isDark} onChange={handleIsDarkChange} label={'Dark theme'} />
-            <AccessibilityPanel
-              darkThemeOverrides={darkThemeOverrides}
-              brand={brand}
-              lightThemeOverrides={lightThemeOverrides}
-            />
-          </AccordionPanel>
-        </AccordionItem> */}
         <AccordionItem value="2">
           <AccordionHeader>
             <Caption1Stronger>Step 2 - Export</Caption1Stronger>