cleaned up the UI for using waypoints