fix some issues with grid