rework on edit page