Improved image viewer