fix views
Merge branch 'email_confirmation_design' into staging
Merge branch 'staging' of https://github.com/worldintime/IceBreakerTest into staging