Tweak navigation behavior