ui-libification
more ui-lib conversion