Change profile logic to displaying everything but the email to the public
Add city and profile to the model and views