Improved bumping and scrolling behaviour