Fixed scrolling bugs