changed the new SwitchField to InlineSwitchField and revert the old one