Fixed up the image widget and the drawing of images.