Overwrite Container widget.
Add Container code from alternate branch to master.