Added a more consistent layout and removed alert from message reception