added form
added form to form modal
more modal updates