continued Nav fixes