some changes
in html +
mail generation in 2 forms