Add layers to canvas, refine canvas objects
Visual tweaks