updated UI, added email verification
fixed conflicts