added modal/form separation; added form routing