adjust canvas size
Merge branch 'canvas' into dev