Adding all the scrolling changes