Update 'Thank You' & other corrections in message templates