Removed angularjs and jcanvas
Added basic shapehandler
Changed code position in shapehandler