Edit modes simplified