Rearrange some of the canvas statements to properly resize teardrop shapes. See issue #456