Add collapse support in grid