update enrollment form
update enrollment form and performance
improve performance