DI: improved ContainerPanel, removed factories