Fixed issues with active navigation links