+ swapped waypoint & search tool bar locations