Added fix to show error messages and success messages in the correct colour