ImageView to display photo & Dialog popup to enlarge it (2/2) + refactoring, clean up