Layout for messages and comments & add tests