New Image Viewer (fix commit)