CompositeWidget refactor, ActionType OK and CheckBox text property added