Re-factored email flow, removed UI bug for submission