Added scrolling for overflow and other things I guess