Nav improvements