Restore navigation links.

To be merged when everything else is merged.