Partial implementation of the canvas view refactoring