Changes related to edit mode