Header nav cleanup WIP