updates to templates and to save user