Restructure as a user control