Add client editing
Fix email templating