Fixed weird scrolling issues 1