[Dev] Modify radio and checkbox code.