Rework of Header and Footer