Made changes to improve scrolling