some navigate cleanup

Closed Blodgett, David L. requested to merge (removed):main into main

@abock -- this is kind of a WIP, and you may have all this fixed locally?

Merge request reports