Fixes to Canvas sizing and positioning