Moving most panel logic to ControlGroup