Fix to include links for menu items