Added scrolling view, still buggy