Melanie,Dileep | 2689 | Adding error message, styling + tool tip fix