Cleanup, split into functions
Add Resend email button