Added radio tag, fixed datepicker tag