Added message controller and templates