added radio and buttons checkboxes