Improve menu item routing