Added more features to the grid component