Change the ComponentContainer to make removeComponent() works