refactored navigator
Merge pull request #38 from pfraze/38-imprv-navigator

refactor and improve navigator