More work on ui-lib conversion