more work on image viewer