diff --git a/packages/web/components/Setup/SetupPersonalityType.tsx b/packages/web/components/Setup/SetupPersonalityType.tsx
index 108f3b1a..8ae8187f 100644
--- a/packages/web/components/Setup/SetupPersonalityType.tsx
+++ b/packages/web/components/Setup/SetupPersonalityType.tsx
@@ -107,7 +107,7 @@ export const SetupPersonalityType: React.FC<SetupPersonalityTypeProps> = ({
   };
 
   return (
-    <FlexContainer maxW="100%">
+    <FlexContainer>
       <Flex direction="column">
         {isWizard && (
           <MetaHeading mb={5} textAlign="center">
@@ -155,9 +155,11 @@ export const SetupPersonalityType: React.FC<SetupPersonalityTypeProps> = ({
                   key={mask}
                   display="flex"
                   direction="row"
+                  justifyContent="start"
                   p={6}
                   m={2}
                   h="auto"
+                  w={{ base: '100%', md: 'auto' }}
                   spacing={4}
                   borderRadius={8}
                   cursor="pointer"
@@ -195,6 +197,7 @@ export const SetupPersonalityType: React.FC<SetupPersonalityTypeProps> = ({
                     w="100%"
                     maxW={16}
                     h={16}
+                    mr={2}
                     src={image}
                     alt={option.name}
                     filter="drop-shadow(0px 0px 3px black)"
@@ -217,7 +220,7 @@ export const SetupPersonalityType: React.FC<SetupPersonalityTypeProps> = ({
             })}
       </FlexContainer>
 
-      <ColorBar mask={colorMask} mt={8} w="min(100vw, 30rem)" />
+      <ColorBar mask={colorMask} mt={8} w="min(90vw, 30rem)" />
 
       {isEdit && onClose && (
         <ModalFooter mt={6}>
diff --git a/packages/web/components/Setup/SetupRoles.tsx b/packages/web/components/Setup/SetupRoles.tsx
index cc5e1797..cb768e12 100644
--- a/packages/web/components/Setup/SetupRoles.tsx
+++ b/packages/web/components/Setup/SetupRoles.tsx
@@ -113,11 +113,7 @@ export const SetupRoles: React.FC<SetupRolesProps> = ({
 
   return (
     <FlexContainer align="center" mx={{ base: 0, md: 8, lg: 16 }}>
-      <MetaHeading
-        mb={{ base: 6, sm: 16 }}
-        alignSelf="center"
-        fontSize={{ base: 'md', md: 'lg' }}
-      >
+      <MetaHeading mb={{ base: 6, sm: 16 }} alignSelf="center">
         Select your role(s)
       </MetaHeading>
       {fetchingExistingRoles && <LoadingState />}
diff --git a/packages/web/pages/profile/setup/personalityType.tsx b/packages/web/pages/profile/setup/personalityType.tsx
index a8dbca3a..4658f0d3 100644
--- a/packages/web/pages/profile/setup/personalityType.tsx
+++ b/packages/web/pages/profile/setup/personalityType.tsx
@@ -1,9 +1,18 @@
 import { SetupPersonalityType } from 'components/Setup/SetupPersonalityType';
 import { SetupProfile } from 'components/Setup/SetupProfile';
 import { SetupContextProvider } from 'contexts/SetupContext';
+import { InferGetStaticPropsType } from 'next';
 import React from 'react';
 
-const PersonalityTypeSetup: React.FC = () => (
+export const getStaticProps = async () => ({
+  props: {
+    hideTopMenu: true,
+  },
+});
+
+export type DefaultSetupProps = InferGetStaticPropsType<typeof getStaticProps>;
+
+const PersonalityTypeSetup: React.FC<DefaultSetupProps> = () => (
   <SetupContextProvider>
     <SetupProfile>
       <SetupPersonalityType />
diff --git a/packages/web/pages/profile/setup/playerType.tsx b/packages/web/pages/profile/setup/playerType.tsx
index 3e6c1740..1ffcbce1 100644
--- a/packages/web/pages/profile/setup/playerType.tsx
+++ b/packages/web/pages/profile/setup/playerType.tsx
@@ -1,9 +1,18 @@
 import { SetupPlayerType } from 'components/Setup/SetupPlayerType';
 import { SetupProfile } from 'components/Setup/SetupProfile';
 import { SetupContextProvider } from 'contexts/SetupContext';
+import { InferGetStaticPropsType } from 'next';
 import React from 'react';
 
-const PlayerTypeSetup: React.FC = () => (
+export const getStaticProps = async () => ({
+  props: {
+    hideTopMenu: true,
+  },
+});
+
+export type DefaultSetupProps = InferGetStaticPropsType<typeof getStaticProps>;
+
+const PlayerTypeSetup: React.FC<DefaultSetupProps> = () => (
   <SetupContextProvider>
     <SetupProfile>
       <SetupPlayerType />
diff --git a/packages/web/pages/profile/setup/pronouns.tsx b/packages/web/pages/profile/setup/pronouns.tsx
index 72dae9ec..9939b1ea 100644
--- a/packages/web/pages/profile/setup/pronouns.tsx
+++ b/packages/web/pages/profile/setup/pronouns.tsx
@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 
 export const getStaticProps = async () => ({
   props: {
-    hideAppDrawer: true,
+    hideTopMenu: true,
   },
 });
 
diff --git a/packages/web/pages/profile/setup/skills.tsx b/packages/web/pages/profile/setup/skills.tsx
index 80c2134b..2935741f 100644
--- a/packages/web/pages/profile/setup/skills.tsx
+++ b/packages/web/pages/profile/setup/skills.tsx
@@ -1,9 +1,18 @@
 import { SetupProfile } from 'components/Setup/SetupProfile';
 import { SetupSkills } from 'components/Setup/SetupSkills';
 import { SetupContextProvider } from 'contexts/SetupContext';
+import { InferGetStaticPropsType } from 'next';
 import React from 'react';
 
-const SkillsSetup: React.FC = () => (
+export const getStaticProps = async () => ({
+  props: {
+    hideTopMenu: true,
+  },
+});
+
+export type DefaultSetupProps = InferGetStaticPropsType<typeof getStaticProps>;
+
+const SkillsSetup: React.FC<DefaultSetupProps> = () => (
   <SetupContextProvider>
     <SetupProfile>
       <SetupSkills />