Added scrolling, some bugs left for fixing
Merge branch 'scrolling_witg_bugs'

Added scrolling