Revamp navigator events