Merge "Normalize and improve menu fiddling."