updated forms and added validation