Align and squish together the gridlayouts

[#78198458] @evanweaver please review for performance impact. I don't
think it should make a big difference, but see if you notice anything.