Updated "Edit Mode"