Correct nav issues