Lots of edits to context menu re: trajectories