clean up navigation code
Merge pull request #151 from clovis/master

clean up navigation code