Changed adding markers and tooltips to be more user-friendly