changed layout a bit in messages