Retore format to navigation links.
Merge branch 'hotfix' into develop