Fixed up form submit and removed email collection modal