Fixes #510

Introduce a better scrolling mechanism... one that works :)