Added more templates and fixing name column in mysql