Add SelectItem to UIControl, some little changes.