changes in edit and normal form.
compatible for edit form now.