Widget Factory: update to lastest from ui