Added detection for current page in navigation