Add image viewer
Merge branch 'tab'