Re-organized main menu to use a single list [Fixes #57933942]