Issue #21628: Added new menu and organized list