user edit section rework