Fixed the scrolling issue and such