Polish off ImageViewer