Project: Fixed issues with page links