tweaks to prevent brief flash of extra menu items