fix nav issues