Added check box and radio buttons