grid-group fixes