fixes and popup with form