Updated Header and footer