Moved user control to a separate object