Moved canvas to here