Header and footer improvements