changes in templates and routing