Move email to settings; add name to email