Improve grid example