Updated usercontrol and create dialog