added proper scrolling