updated form added validation Fixed #13