Inserted handling of OnClick of UIObjects