Refactor Cleanup and Implement the Gesture Scrolling