Fixed some buggs in form 1 & 2
Fixed some buggs in fomr1 & 2