ControlFactory refactoring and GroupBox back