Improve canvas display, resolve bugs