Bugs fixed
Canvas frontend