Changed to have a better layout in popup image viewer.