changes for ui toolkit