Fixed scroller
Merge branch 'scroller'