Fixing nav issues