added waypoint btn and btns for location select options