Nav fixes