ui_link conversion + cleanup