Added image popup screen and map