Dynamic grid

merge dynamic grid to master