Add new, modular nav include file and syntax
Merge pull request #1 from grulon/nav-improvements

Add new, modular nav include file and syntax