Fix formatting issues within handlebars templates