UI and Validations added