Final changes to templates and email confirmation