layout and header updated