Clean up menu items and introduce common route menu item