Few more tweaks to pages.Next up clean up URLS