Fixed view controller naming. Fixed map view annotation display