messed more with teh Message layout