Cleanup.
Initial version of a better scalable canvas.
The canvas now scales more nicely.
Merge branch 'smooth-scaling'