Add Email and Phone

* Adds email and phone fields to relevant forms