Fix and add message alert