added Button and Checkbox control. fixed minor issues