Fixes to Nav

Fixes to nav based on 1x1 with Jane