#694: Finished loading of custom options when editing option values and options; UI modifications;