Charts: Modularize option form fields