Even more changes for page scrolling