Improve message layout