Removed ContainerWidget (previously only commented out)