Fixed the Scroll bugs that I found