storing base revamp of grid and container groups handling