More improvements to scrolling down