Making the header better