Updated look of figures and removed canvas bug