diff --git a/components/Window.jsx b/components/Window.jsx
index 773befc..c456aaf 100644
--- a/components/Window.jsx
+++ b/components/Window.jsx
@@ -31,6 +31,7 @@ export default function Window() {
             },
             achievementUnlocker: {
                 idle: true,
+                hidden: false,
                 interval: [30, 130],
             }
         };
diff --git a/components/automation/AchievementUnlocker.jsx b/components/automation/AchievementUnlocker.jsx
index b4fad7e..ff99c18 100644
--- a/components/automation/AchievementUnlocker.jsx
+++ b/components/automation/AchievementUnlocker.jsx
@@ -18,19 +18,22 @@ export default function AchievementUnlocker({ setActivePage }) {
         const startAchievementUnlocker = async () => {
             try {
                 const achievementUnlocker = JSON.parse(localStorage.getItem('achievementUnlocker')) || [];
+                const settings = JSON.parse(localStorage.getItem('settings')) || {};
 
                 if (achievementUnlocker.length < 1) {
                     logEvent('[Achievement Unlocker - Auto] No games left - stopping');
-                    stopIdler(currentGame.appId);
+                    if (currentGame) {
+                        stopIdler(currentGame.appId);
+                    }
                     setGamesWithAchievements(0);
                     setIsComplete(true);
                     return;
                 }
 
-                const { achievements, game } = await fetchAchievements(achievementUnlocker[0]);
+                const { achievements, game } = await fetchAchievements(achievementUnlocker[0], settings);
 
                 if (achievements.length > 0) {
-                    await unlockAchievements(achievements, game);
+                    await unlockAchievements(achievements, settings);
                 }
 
                 removeGameFromUnlockerList(game.game.id);
@@ -54,13 +57,13 @@ export default function AchievementUnlocker({ setActivePage }) {
         };
     }, []);
 
-    const fetchAchievements = async (gameData) => {
+    const fetchAchievements = async (gameData, settings) => {
         const game = JSON.parse(gameData);
         const userSummary = JSON.parse(localStorage.getItem('userSummary')) || {};
 
         setCurrentGame({ appId: game.game.id, name: game.game.name });
 
-        const [userAchievementsResponse, gameAchievementsResponse] = await Promise.all([
+        const [userAchievementsResponse, gameAchievementsResponse, gameSchemaResponse] = await Promise.all([
             fetch('https://apibase.vercel.app/api/route', {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
@@ -70,6 +73,11 @@ export default function AchievementUnlocker({ setActivePage }) {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({ route: 'game-achievement-percentage', appId: game.game.id }),
+            }),
+            fetch('https://apibase.vercel.app/api/route', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ route: 'game-schema', appId: game.game.id }),
             })
         ]);
 
@@ -80,9 +88,19 @@ export default function AchievementUnlocker({ setActivePage }) {
 
         const userAchievements = await userAchievementsResponse.json();
         const gameAchievements = await gameAchievementsResponse.json();
+        const gameSchema = await gameSchemaResponse.json();
 
         const achievements = userAchievements.achievements
-            .filter(achievement => !achievement.unlocked)
+            .filter(achievement => {
+                const schemaAchievement = gameSchema.availableGameStats.achievements.find(
+                    a => a.name === achievement.name
+                );
+                if (settings.achievementUnlocker.hidden) {
+                    return !achievement.unlocked && schemaAchievement.hidden === 0;
+                } else {
+                    return !achievement.unlocked;
+                }
+            })
             .map(achievement => {
                 const percentageData = gameAchievements.find(a => a.name === achievement.name);
                 return {
@@ -100,8 +118,7 @@ export default function AchievementUnlocker({ setActivePage }) {
         return { achievements, game };
     };
 
-    const unlockAchievements = async (achievements) => {
-        const settings = JSON.parse(localStorage.getItem('settings')) || {};
+    const unlockAchievements = async (achievements, settings) => {
         const { interval, idle } = settings.achievementUnlocker;
 
         if (idle) {
diff --git a/components/gameslist/Automate.jsx b/components/gameslist/Automate.jsx
index 360e66d..30d75a1 100644
--- a/components/gameslist/Automate.jsx
+++ b/components/gameslist/Automate.jsx
@@ -72,6 +72,7 @@ export default function Automate({ setActivePage }) {
                         key='idle'
                         startContent={<IoGameController />}
                         onClick={startCardFarming}
+                        textValue='Start achievement unlocker'
                     >
                         <p className='text-xs'>Start card farming</p>
                     </DropdownItem>
@@ -80,6 +81,7 @@ export default function Automate({ setActivePage }) {
                         key='achiements'
                         startContent={<FaAward />}
                         onClick={startAchievementUnlocker}
+                        textValue='Start achievement unlocker'
                     >
                         <p className='text-xs'>Start achievement unlocker</p>
                     </DropdownItem>
@@ -88,6 +90,7 @@ export default function Automate({ setActivePage }) {
                         key='settings'
                         startContent={<IoSettings />}
                         onClick={() => setActivePage('settings')}
+                        textValue='Change settings'
                     >
                         <p className='text-xs'>Change settings</p>
                     </DropdownItem>
diff --git a/components/gameslist/CardMenu.jsx b/components/gameslist/CardMenu.jsx
index 1bd05ec..aa64459 100644
--- a/components/gameslist/CardMenu.jsx
+++ b/components/gameslist/CardMenu.jsx
@@ -20,6 +20,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                         key='idle'
                         startContent={<IoPlay />}
                         onClick={() => handleIdle(item.game.id, item.game.name)}
+                        textValue='Idle game'
                     >
                         <p className='text-xs'>Idle game</p>
                     </DropdownItem>
@@ -28,6 +29,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                         key='achievements'
                         startContent={<FaAward />}
                         onClick={() => viewAchievments(item)}
+                        textValue='View achievements'
                     >
                         <p className='text-xs'>View achievements</p>
                     </DropdownItem>
@@ -37,6 +39,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                             key='fav-rem'
                             startContent={<TiHeartFullOutline />}
                             onClick={(e) => removeFromFavorites(e, item)}
+                            textValue='Remove from favorites'
                         >
                             <p className='text-xs'>Remove from favorites</p>
                         </DropdownItem>
@@ -46,6 +49,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                             key='fav-add'
                             startContent={<TiHeartFullOutline />}
                             onClick={(e) => addToFavorites(e, item)}
+                            textValue='Add to favorites'
                         >
                             <p className='text-xs'>Add to favorites</p>
                         </DropdownItem>
@@ -56,6 +60,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                             key='cf-rem'
                             startContent={<TiMinus />}
                             onClick={(e) => removeFromCardFarming(e, item)}
+                            textValue='Remove from card farming'
                         >
                             <p className='text-xs'>Remove from card farming</p>
                         </DropdownItem>
@@ -65,6 +70,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                             key='cf-add'
                             startContent={<TiPlus />}
                             onClick={(e) => addToCardFarming(e, item)}
+                            textValue='Add to card farming'
                         >
                             <p className='text-xs'>Add to card farming</p>
                         </DropdownItem>
@@ -75,6 +81,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                             key='au-rem'
                             startContent={<TiMinus />}
                             onClick={(e) => removeFromAchievementUnlocker(e, item)}
+                            textValue='Remove from achievement unlocker'
                         >
                             <p className='text-xs'>Remove from achievement unlocker</p>
                         </DropdownItem>
@@ -84,6 +91,7 @@ export default function CardMenu({ item, favorites, cardFarming, achievementUnlo
                             key='au-add'
                             startContent={<TiPlus />}
                             onClick={(e) => addToAchievementUnlocker(e, item)}
+                            textValue='Add to achievement unlocker'
                         >
                             <p className='text-xs'>Add to achievement unlocker</p>
                         </DropdownItem>
diff --git a/components/gameslist/GameAchievementList.jsx b/components/gameslist/GameAchievementList.jsx
index 959461f..7563939 100644
--- a/components/gameslist/GameAchievementList.jsx
+++ b/components/gameslist/GameAchievementList.jsx
@@ -115,8 +115,8 @@ export default function GameAchievementList({ gameList, favorites, cardFarming,
                         >
                             <Image
                                 src={`https://cdn.cloudflare.steamstatic.com/steam/apps/${item.game.id}/header.jpg`}
-                                layout='fill'
-                                objectFit='cover'
+                                width={460}
+                                height={215}
                                 alt={`${item.game.name} image`}
                                 priority={true}
                             />
diff --git a/components/gameslist/GameIdleList.jsx b/components/gameslist/GameIdleList.jsx
index 2d53cda..80040d8 100644
--- a/components/gameslist/GameIdleList.jsx
+++ b/components/gameslist/GameIdleList.jsx
@@ -115,8 +115,8 @@ export default function GameIdleList({ gameList, favorites, cardFarming, achieve
                         >
                             <Image
                                 src={`https://cdn.cloudflare.steamstatic.com/steam/apps/${item.game.id}/header.jpg`}
-                                layout='fill'
-                                objectFit='cover'
+                                width={460}
+                                height={215}
                                 alt={`${item.game.name} image`}
                                 priority={true}
                             />
diff --git a/components/settings/AchievementSettings.jsx b/components/settings/AchievementSettings.jsx
index 8152961..0fe7973 100644
--- a/components/settings/AchievementSettings.jsx
+++ b/components/settings/AchievementSettings.jsx
@@ -77,6 +77,18 @@ export default function AchievementSettings({ settings, setSettings }) {
                             </div>
                         </Checkbox>
 
+                        <Checkbox
+                            name='hidden'
+                            isSelected={localSettings.achievementUnlocker.hidden}
+                            onChange={handleCheckboxChange}
+                        >
+                            <div className='flex items-center gap-1'>
+                                <p className='text-xs'>
+                                    Skip hidden achievements
+                                </p>
+                            </div>
+                        </Checkbox>
+
                         <Slider
                             label={
                                 <div className='flex justify-between items-center gap-1 min-w-[350px]'>
diff --git a/components/settings/Settings.jsx b/components/settings/Settings.jsx
index 6cd280d..786217a 100644
--- a/components/settings/Settings.jsx
+++ b/components/settings/Settings.jsx
@@ -28,6 +28,7 @@ export default function Settings() {
             },
             achievementUnlocker: {
                 idle: true,
+                hidden: false,
                 interval: [30, 130],
             }
         };
diff --git a/components/settings/SettingsMenu.jsx b/components/settings/SettingsMenu.jsx
index 48df8eb..eabe554 100644
--- a/components/settings/SettingsMenu.jsx
+++ b/components/settings/SettingsMenu.jsx
@@ -17,22 +17,22 @@ export default function SettingsMenu() {
                     </Button>
                 </DropdownTrigger>
                 <DropdownMenu aria-label='Settings actions'>
-                    <DropdownItem key='help' className='rounded p-0 m-0'>
+                    <DropdownItem key='help' className='rounded p-0 m-0' textValue='Help'>
                         <ExtLink href={'https://github.com/probablyraging/steam-game-idler/wiki'} className={'flex text-xs w-full px-2 py-1'}>
                             Help
                         </ExtLink>
                     </DropdownItem>
-                    <DropdownItem key='changelog' className='rounded p-0 m-0'>
+                    <DropdownItem key='changelog' className='rounded p-0 m-0' textValue='Changelog'>
                         <ExtLink href={'https://github.com/probablyraging/steam-game-idler/releases'} className={'flex text-xs w-full px-2 py-1'}>
                             Changelog
                         </ExtLink>
                     </DropdownItem>
-                    <DropdownItem key='report' className='rounded p-0 m-0'>
+                    <DropdownItem key='report' className='rounded p-0 m-0' textValue='Report an issue'>
                         <ExtLink href={'https://github.com/probablyraging/steam-game-idler/issues/new?assignees=ProbablyRaging&labels=bug%2Cinvestigating&projects=&template=issue_report.yml&title=Title'} className={'flex text-xs w-full px-2 py-1'}>
                             Report an issue
                         </ExtLink>
                     </DropdownItem>
-                    <DropdownItem key='coffee' className='rounded p-0 m-0'>
+                    <DropdownItem key='coffee' className='rounded p-0 m-0' textValue='Buy me a coffee'>
                         <ExtLink href={'https://buymeacoffee.com/probablyraging'} className={'flex text-xs w-full px-2 py-1'}>
                             Buy me a coffee
                         </ExtLink>