Made message layout simpler