Some better re design of headers