fixed bugs with scrolling