Added better message layout