Updated baseline grid and related tweaks.