Some work on re-doing WidgetContainer as BoxContainer