Using ImageEditor with the last ImageViewer commit merged