Improve grid component