fixed nav bugs