changed navigation behaviour