Improve editing/moving/add/delete.