improved ui of tool, button and canvas
Merge branch 'develop'