Improved image viewer plugin