Fixed some scrolling issues