Add viewer and a rework on imageview