Better editing UI with data