Rework scrolling a bit