Revert "Revert "Redesign the navbar to remove unneeded or unused links""

This reverts commit 7a23c16c0b6a191847f52c6674d21ec299df23e2.