Added email confirmation and edited User views