Fixed issues with core navigation links