revert grid_layout name and pmax/pmin unit comp