map markers labeled by distance, reorganized controllers