Little fixes to menu game state