Fix grid alignment that was incorrect for some aspect ratios
Increase length of grid blend-in phase