Better grid alignment on index