Improve grid module