[STYLE]Refactor Messages + Fix XHR error

SJS-25