improved form submission & add/edit option modal