Working on editing of form