Fix minor issues found when deploying to live site
Made emails thread properly