updated forms and usercontrol