Improve prime-nav