Fixed linking issues with new navbars