Added scrolling [not fully working]