Easier way to add Waypoints to tracks
Adding WPs to tracks is rather clunky. A quick way would be:
Add "Add waypoint to track" context menu item to tracks, you get the idea 😊
Or, in the "Waypoint 1234" screen, add the desired opportunity.