Form Added, Modal functionality updated