adding pictures to each location
fixing location logic