Updated UI and logic for editing of User