email verification and changes to view based on user type
merge changes dec 14