Pull in the updated widget factory from UI as the first commit here, or pull it into master and rebase.