Updated templates to fix issue with word-wrap on label