Bugfix: Scrollbug and more