Fixes message formatting
Styling, more badges