simplified layouts
Merge pull request #1260 from mcginty/message-layout-lint

Conversation item tweaks