added radio and checkbox options