Several improvement. Form must be edited