Fix (hopefully) the scrolling logic