redirect to new templates
Fix merge conflicts
Add error messages partial