Refactor [1967] Menu Updates

Sorry @macfanatic, I didn't pay close enough attention to #1967 at the time. This is my attempt to make sense of your changes as I rebase by PR (#1488) onto master.

(WIP)