Tweaked navigation and page ids