Refactor Header & Top Navigation

**In Progress**