Header and upload control changes