Improved how we get the page