#694: Custom options editing UI modifications