Sorted out nav menu + waypoints