More navigation tweaks.

Fixes for #150 & 154; will close issues once the navigation gets on
live templates and question(s) get resolved.
Merge branch 'master' into gh-pages