Refactoring

Canvas transformations + all