- Added colspan/rowspan to GridContainer
- Allow non-default grid/row configurations for ColorSwatches