Revert "Nav and links"

This reverts commit 7d739ff3a6317d13f0c63ca5a7f5a13ef9913810.
Revert "Revert "Nav and links""

This reverts commit aa53512a6f2d89009f0c148de5eb291e37b56812.