Fixing menu selection