Added tooltips and highlighting to map