FIXED: Submenu order