Fix templates and urls