Add new image viewer + bug fixes