Worked on the user controls