UI update and add validations