refactor header designs to design spec