adds scroller 2 and some refactoring