Tidy up the waypoint menu, while adding functionality. Now there are 3 sub-menus...