More work on bug #8138.  The first shot at the image viewer.