Header and footer fixes