restyle new form
merge from vaince