Added back edit mode