Navigation full Update

Works at least for some cases. May need additional testing.