minor changes on the canvas display
merge fix