Fixed navigation changing