Header design fixes