Header and footer cleaned up