Rework on messages system
Styling issuse resolved