Fixing nav bugs