Modified edit mode functionality