Use a single JSON attribute for options, and structure for state
Minor CSS changes