editing forms improvment