Changed end and start tags for messages
main file