Refactor navigation templates.
Update CHANGES.