Fixed some problems with scrolling