better UI update mgmt, but still some issues