Fix templates and url paths