Changed navigation to automatically highlight the current page