Refactor Navigation

- DRY up via a withPage helper
- Pull maybeField from pending PR
- Documentation changes