Bug Fix to display correct color and message