Refactor nav helper and specs