Add email, update site config, and refactoring