Fixed the scrolling issues