updated usercontrols