Implemented message functionality
Moved modal templates