upgraded to current ui toolkit