better nav?
Merge pull request #3 from meconlin/develop

better nav?