more nav changes
Merge pull request #36 from kraftery/NewNewDavid

more nav changes