routing fixes, sync main menu links with page state
Merge branch 'master' into gh-pages