Added almost full toolbar and some changes to paint.toolbar.js