Improve image viewer