refactored and added new form controls