Initial setup for scrolling
Finalized changes for scrolling