Revert "Some bugs in NxUI with a WatchItem"

This reverts commit e455cb7bef080d1999ca98fdfe5c2d8dd360d2f6.