Added more templates
Fixed formatting