#351 - Using correct message code
#351 - Fixed missing message, and some css