diff --git a/apps/frontend/src/app/Components/Character/CharacterCard.tsx b/apps/frontend/src/app/Components/Character/CharacterCard.tsx
index 4cbe3405..96490858 100644
--- a/apps/frontend/src/app/Components/Character/CharacterCard.tsx
+++ b/apps/frontend/src/app/Components/Character/CharacterCard.tsx
@@ -57,6 +57,7 @@ type CharacterCardProps = {
   characterChildren?: Displayable
   footer?: Displayable
   hideStats?: boolean
+  hideArtifacts?: boolean
   isTeammateCard?: boolean
 }
 export default function CharacterCard({
@@ -69,6 +70,7 @@ export default function CharacterCard({
   onClickTeammate,
   footer,
   hideStats,
+  hideArtifacts,
   isTeammateCard,
 }: CharacterCardProps) {
   const { database } = useContext(DatabaseContext)
@@ -157,6 +159,7 @@ export default function CharacterCard({
               character={character}
               onClickTeammate={onClickTeammate}
               hideStats={hideStats}
+              hideArtifacts={hideArtifacts}
               weaponChildren={weaponChildren}
               artifactChildren={artifactChildren}
               characterChildren={characterChildren}
@@ -181,6 +184,7 @@ type ExistingCharacterCardContentProps = {
   character: ICachedCharacter
   onClickTeammate?: (characterKey: CharacterKey) => void
   hideStats?: boolean
+  hideArtifacts?: boolean
   weaponChildren?: Displayable
   artifactChildren?: Displayable
   characterChildren?: Displayable
@@ -195,6 +199,7 @@ function ExistingCharacterCardContent({
   character,
   onClickTeammate,
   hideStats,
+  hideArtifacts,
   weaponChildren,
   artifactChildren,
   characterChildren,
@@ -218,7 +223,7 @@ function ExistingCharacterCardContent({
             padding: hideStats ? `${theme.spacing(1)}!important` : undefined,
           })}
         >
-          <Artifacts />
+          {!hideArtifacts && <Artifacts />}
           {!isTeammateCard && (
             <Grid container columns={4} spacing={0.75}>
               <Grid item xs={1} height="100%">
diff --git a/apps/frontend/src/app/PageCharacter/CharacterDisplay/Tabs/TabOptimize/index.tsx b/apps/frontend/src/app/PageCharacter/CharacterDisplay/Tabs/TabOptimize/index.tsx
index d8aacddf..7c3e50e8 100644
--- a/apps/frontend/src/app/PageCharacter/CharacterDisplay/Tabs/TabOptimize/index.tsx
+++ b/apps/frontend/src/app/PageCharacter/CharacterDisplay/Tabs/TabOptimize/index.tsx
@@ -530,21 +530,11 @@ export default function TabBuild() {
                 <CharacterCard
                   characterKey={characterKey}
                   onClickTeammate={onClickTeammate}
+                  hideStats={true}
+                  hideArtifacts={true}
                 />
               </Box>
               <BonusStatsCard />
-            </Grid>
-
-            {/* 2 */}
-            <Grid
-              item
-              xs={12}
-              sm={6}
-              lg={4}
-              display="flex"
-              flexDirection="column"
-              gap={1}
-            >
               {/* Level Filter */}
               <CardLight>
                 <CardContent sx={{ display: 'flex', gap: 1 }}>
@@ -567,7 +557,37 @@ export default function TabBuild() {
                   />
                 </CardContent>
               </CardLight>
+              <CardContent>
+                <Box display="flex" alignItems="center" gap={1}>
+                  <AssumeFullLevelToggle
+                    mainStatAssumptionLevel={mainStatAssumptionLevel}
+                    setmainStatAssumptionLevel={(
+                      mainStatAssumptionLevel: number
+                    ) => buildSettingDispatch({ mainStatAssumptionLevel })}
+                    disabled={generatingBuilds}
+                  />
+                  <InfoTooltip
+                    title={
+                      <Box>
+                        <Typography variant="h6">{t`mainStat.levelAssTooltip.title`}</Typography>
+                        <Typography>{t`mainStat.levelAssTooltip.desc`}</Typography>
+                      </Box>
+                    }
+                  />
+                </Box>
+              </CardContent>
+            </Grid>
 
+            {/* 2 */}
+            <Grid
+              item
+              xs={12}
+              sm={6}
+              lg={4}
+              display="flex"
+              flexDirection="column"
+              gap={1}
+            >
               {/* Main Stat Filters */}
               <CardLight>
                 <CardContent>
@@ -576,25 +596,6 @@ export default function TabBuild() {
                   >{t`mainStat.title`}</Typography>
                 </CardContent>
                 <Divider />
-                <CardContent>
-                  <Box display="flex" alignItems="center" gap={1}>
-                    <AssumeFullLevelToggle
-                      mainStatAssumptionLevel={mainStatAssumptionLevel}
-                      setmainStatAssumptionLevel={(
-                        mainStatAssumptionLevel: number
-                      ) => buildSettingDispatch({ mainStatAssumptionLevel })}
-                      disabled={generatingBuilds}
-                    />
-                    <InfoTooltip
-                      title={
-                        <Box>
-                          <Typography variant="h6">{t`mainStat.levelAssTooltip.title`}</Typography>
-                          <Typography>{t`mainStat.levelAssTooltip.desc`}</Typography>
-                        </Box>
-                      }
-                    />
-                  </Box>
-                </CardContent>
                 {/* main stat selector */}
                 <MainStatSelectionCard
                   disabled={generatingBuilds}
@@ -645,6 +646,7 @@ export default function TabBuild() {
               <StatFilterCard disabled={generatingBuilds} />
             </Grid>
           </Grid>
+          <br />
           {/* Footer */}
           {isSM && targetSelector}
           <ButtonGroup>