New Nav Improvements
Merge pull request #1 from tcdmm/nav-improvements

New Nav Improvements