Improvements to submenu and admin URL support