OneCContainerWithGrid has been improved.