Finished CanvasLayers refactoring