A few navigation tweaks.

Fixes #106 (just need to copy/paste the new code to the various
templates).