More work on GridContainer.