fixed form validation issues