More progress on header and footer