[POLISH] Tidy up handlebars templates