Added scrolling function so that it scrolls from bottom to top
fixed merge
Fix merge conflict with scrolling