Few fixes to Nav