Improve design, beginning to set canvas