Rework Main Menu for consistency with other menu structures.