Enhanced Menu control