added geolocation marker, colored map markers