Fixed header links

Allows zero, one, or two links to be provided.
If no link text is provided the uri hostname is used.
Merge branch 'Fix-links' into nps-identity