Corrected Templates

All the message templates have been corrected and finalised.