Scrolling works for keyboard input and not buttons now.
Merge branch 'staging' into dat/scrolling