Improvements to paragraph tags around handlebars