Attempt 2 at fixing scrolling