Revert "Revert "User Control""

This reverts commit 3f5bd9bf35453e6e0e3787caedfeef6be40e15c8.