Merge new navbar header styles

This is for a flighted header, it doesn't actually ship any site UX changes.