Fixing nav issue