updates to the grid container system after testing revealed some bugs