Header design improvements