Header and margin tweaks