Fixed Issue #24 Checkbox and radio button toggles not obvious