Navigation url fixes