Changed use ->set_data( ,  ) to set data atts on
Added popup field.