Buggy menu state switching...