Improve grid system