fix issues with click nav
Merge branch 'fancy' into gh-pages