even less buggy menu