Implemented correct scrolling