Fixing nav lag