Header and footer better formatting