finished the form improvements