fixed nav bugs
fixed nav bug issues