Remove Scroller
Merge branch 'custom'
Make methods public