improve grid demo