Improve option editing