Scroll improvements
Merge branch 'dev' of github.com:LittleEye/DataReporter into dev