email confirmation design
Merge branch 'email_confirmation_design' into staging