UI changes and Validation messages updated