Header and Main fixes