Bugfix/scroll fix