Sync up with latest horizon nav changes
Merge pull request #19 from ekarlso/nav-updates

Sync up with latest horizon nav changes