Fixed some scrolling bugs