Prefer overflow auto instead of scroll
Merge branch 'hotfix/0.5.1'