Main Menu Fixes