Fixes to navigation templates