Small changes in forms and user control