Updated Templates to fix word-wrap issue