Refs #4202 Menu refactor GO. This one is tricky...
Menu refactor