Refactor. Added more test controls and configurable options for scrolling behavior