Work on scrollBar, and a few changes