still fixing scrolling