minor refactoring | improved scrolling