Clean
W.I.P.
Implemented canvas move
Merge branch 'feature/canvas_move' into develop