Updates for edit mode and delete management