fix nav bugs