merged image viewer improvements and bugfixes