Fixing up the navigation links