Header Footer rework