Some fixes and messages styling