#83 Added options editing into form fields