Some UI changes and Validations added