more response modals and form cleanup