Merged Container and ContainerWidget (removed multiple inheritance)