More scrolling changes