some changes in templates and route naming