Updating the scrolling logic to make scrolling smoother
Merge branch 'master' into gem_refactor