Canvas now has dimensions which are used throughout.