Update the use of header in layouts