Continue work on image viewer